1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Export lcEventDispatcher in private namespace

Browse Source 
The category is used outside of QtCore, and needs to be exported
for shared library builds.

Change-Id: I9bba477d37b823146eaec4e1e53197651f09c013
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Tor Arne Vestbø 2019-09-24 17:25:57 +02:00
parent b4efdd3769
commit c9478e90ff
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/kernel/qeventdispatcher_cf.mm
View File

@ -56,6 +56,14 @@
# include <UIKit/UIApplication.h> # include <UIKit/UIApplication.h>
#endif #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 QT_USE_NAMESPACE
/* /*
@ -148,9 +156,6 @@ static CFStringRef runLoopMode(NSDictionary *dictionary)
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcEventDispatcher, "qt.eventdispatcher");
Q_LOGGING_CATEGORY(lcEventDispatcherTimers, "qt.eventdispatcher.timers");
class RunLoopDebugger : public QObject class RunLoopDebugger : public QObject
{ {
Q_OBJECT Q_OBJECT

6
src/corelib/kernel/qeventdispatcher_cf_p.h
View File

@ -98,8 +98,10 @@ Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(RunLoopModeTracker));
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
Q_DECLARE_LOGGING_CATEGORY(lcEventDispatcher); namespace QtPrivate {
Q_DECLARE_LOGGING_CATEGORY(lcEventDispatcherTimers) Q_CORE_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcEventDispatcher);
Q_CORE_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcEventDispatcherTimers)
}
class QEventDispatcherCoreFoundation; class QEventDispatcherCoreFoundation;

2
src/plugins/platforms/ios/qioseventdispatcher.mm
View File

@ -211,6 +211,8 @@ namespace
} logActivity; } logActivity;
} }
using namespace QT_PREPEND_NAMESPACE(QtPrivate);
extern "C" int qt_main_wrapper(int argc, char *argv[]) extern "C" int qt_main_wrapper(int argc, char *argv[])
{ {
@autoreleasepool { @autoreleasepool {