@@ -1,118 +0,0 @@
1−From a9ba67d3db7390d9ddc46751346e70b0a522711a Mon Sep 17 00:00:00 2001
2−From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
3−Date: Fri, 3 Apr 2020 21:15:27 +0200
4−Subject: [PATCH 02/11] qtbase-mac
5−
6−---
7− src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++--
8− src/testlib/qappletestlogger.cpp | 2 +-
9− src/testlib/qappletestlogger_p.h | 2 +-
10− src/testlib/qtestcase.cpp | 2 +-
11− src/testlib/qtestlog.cpp | 2 +-
12− src/testlib/qtestlog_p.h | 4 ++--
13− 6 files changed, 20 insertions(+), 8 deletions(-)
14−
15−diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
16−index 535d3579b2..3d70bf39c1 100644
17−--- a/src/corelib/kernel/qcore_mac_p.h
18−+++ b/src/corelib/kernel/qcore_mac_p.h
19−@@ -225,7 +225,7 @@ private:
20−
21− // --------------------------------------------------------------------------
22−
23−-#if !defined(QT_BOOTSTRAPPED)
24−+#if 0
25−
26− QT_END_NAMESPACE
27− #include <os/activity.h>
28−@@ -303,7 +303,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current);
29−
30− #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter();
31−
32−-#endif // !defined(QT_BOOTSTRAPPED)
33−+#else // !defined(QT_BOOTSTRAPPED)
34−+
35−+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...)
36−+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...)
37−+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...)
38−+
39−+#define QT_APPLE_LOG_ACTIVITY2(...)
40−+#define QT_APPLE_LOG_ACTIVITY1(...)
41−+#define QT_APPLE_LOG_ACTIVITY(...)
42−+
43−+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...)
44−+
45−+#endif
46−
47− // -------------------------------------------------------------------------
48−
49−diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp
50−index dfeadebdef..2a74330c1d 100644
51−--- a/src/testlib/qappletestlogger.cpp
52−+++ b/src/testlib/qappletestlogger.cpp
53−@@ -43,7 +43,7 @@
54−
55− QT_BEGIN_NAMESPACE
56−
57−-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
58−+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
59−
60− using namespace QTestPrivate;
61−
62−diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h
63−index 62c6d95c5a..f8e0a3b767 100644
64−--- a/src/testlib/qappletestlogger_p.h
65−+++ b/src/testlib/qappletestlogger_p.h
66−@@ -57,7 +57,7 @@
67−
68− QT_BEGIN_NAMESPACE
69−
70−-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
71−+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
72− class QAppleTestLogger : public QAbstractTestLogger
73− {
74− public:
75−diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
76−index f45999c7fa..d5b525dc12 100644
77−--- a/src/testlib/qtestcase.cpp
78−+++ b/src/testlib/qtestcase.cpp
79−@@ -849,7 +849,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool
80−
81− bool addFallbackLogger = !explicitLoggerRequested;
82−
83−-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
84−+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
85− // Any explicitly requested loggers will be added by now, so we can check if they use stdout
86− const bool safeToAddAppleLogger = !AppleUnifiedLogger::willMirrorToStderr() || !QTestLog::loggerUsingStdout();
87− if (safeToAddAppleLogger && QAppleTestLogger::debugLoggingEnabled()) {
88−diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
89−index a388780532..63ab965101 100644
90−--- a/src/testlib/qtestlog.cpp
91−+++ b/src/testlib/qtestlog.cpp
92−@@ -465,7 +465,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename)
93− case QTestLog::TAP:
94− logger = new QTapTestLogger(filename);
95− break;
96−-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
97−+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
98− case QTestLog::Apple:
99− logger = new QAppleTestLogger;
100− break;
101−diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h
102−index ddaf14ed9b..0c49c93a88 100644
103−--- a/src/testlib/qtestlog_p.h
104−+++ b/src/testlib/qtestlog_p.h
105−@@ -74,8 +74,8 @@ public:
106− Q_DISABLE_COPY_MOVE(QTestLog)
107−
108− enum LogMode {
109−- Plain = 0, XML, LightXML, JUnitXML, CSV, TeamCity, TAP
110−-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
111−+ Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP
112−+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
113− , Apple
114− #endif
115− #if defined(HAVE_XCTEST)
116−--
117−2.25.4
118−