Created
September 26, 2019 08:37
-
-
Save torarnv/b5ad4d90f2aa438ceca7b0ca9c5fea9e to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 43a4f4c62af377280b7d5abbc1c8175fc2cfece1 | |
Author: Tor Arne Vestbø <tor.arne.vestbo@qt.io> | |
Date: Tue Sep 24 17:25:57 2019 +0200 | |
Export lcEventDispatcher in private namespace | |
Change-Id: I9bba477d37b823146eaec4e1e53197651f09c013 | |
diff --git a/src/corelib/kernel/qeventdispatcher_cf.mm b/src/corelib/kernel/qeventdispatcher_cf.mm | |
index 33c231987f..56903bfb8a 100644 | |
--- a/src/corelib/kernel/qeventdispatcher_cf.mm | |
+++ b/src/corelib/kernel/qeventdispatcher_cf.mm | |
@@ -56,6 +56,14 @@ | |
# include <UIKit/UIApplication.h> | |
#endif | |
+QT_BEGIN_NAMESPACE | |
+namespace QtPrivate { | |
+Q_LOGGING_CATEGORY(lcEventDispatcher, "qt.eventdispatcher"); | |
+Q_LOGGING_CATEGORY(lcEventDispatcherTimers, "qt.eventdispatcher.timers"); | |
+} | |
+using namespace QtPrivate; | |
+QT_END_NAMESPACE | |
+ | |
QT_USE_NAMESPACE | |
/* | |
@@ -148,9 +156,6 @@ static CFStringRef runLoopMode(NSDictionary *dictionary) | |
QT_BEGIN_NAMESPACE | |
-Q_LOGGING_CATEGORY(lcEventDispatcher, "qt.eventdispatcher"); | |
-Q_LOGGING_CATEGORY(lcEventDispatcherTimers, "qt.eventdispatcher.timers"); | |
- | |
class RunLoopDebugger : public QObject | |
{ | |
Q_OBJECT | |
diff --git a/src/corelib/kernel/qeventdispatcher_cf_p.h b/src/corelib/kernel/qeventdispatcher_cf_p.h | |
index 26191d520c..a2cecd9a93 100644 | |
--- a/src/corelib/kernel/qeventdispatcher_cf_p.h | |
+++ b/src/corelib/kernel/qeventdispatcher_cf_p.h | |
@@ -98,8 +98,10 @@ Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(RunLoopModeTracker)); | |
QT_BEGIN_NAMESPACE | |
-Q_DECLARE_LOGGING_CATEGORY(lcEventDispatcher); | |
-Q_DECLARE_LOGGING_CATEGORY(lcEventDispatcherTimers) | |
+namespace QtPrivate { | |
+Q_CORE_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcEventDispatcher); | |
+Q_CORE_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcEventDispatcherTimers) | |
+} | |
class QEventDispatcherCoreFoundation; | |
diff --git a/src/plugins/platforms/ios/qioseventdispatcher.mm b/src/plugins/platforms/ios/qioseventdispatcher.mm | |
index 776343c5aa..c5856051de 100644 | |
--- a/src/plugins/platforms/ios/qioseventdispatcher.mm | |
+++ b/src/plugins/platforms/ios/qioseventdispatcher.mm | |
@@ -211,6 +211,8 @@ namespace | |
} logActivity; | |
} | |
+using namespace QT_PREPEND_NAMESPACE(QtPrivate); | |
+ | |
extern "C" int qt_main_wrapper(int argc, char *argv[]) | |
{ | |
@autoreleasepool { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment