From ecb6835a9fa0501cefcb1ab7f02e5bb7736afcd4 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Thu, 19 Nov 2015 10:36:34 +0100 Subject: [PATCH] OSX: fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move the QT_USE_NAMESPACE up, so any use of Q* classes won't result in compilation errors when Qt is configured to be in a namespace. Change-Id: Id559c86798529f6cad43a75fce303c108ce820bc Reviewed-by: Jake Petroules Reviewed-by: Morten Johan Sørvig Reviewed-by: Timur Pocheptsov --- src/corelib/kernel/qeventdispatcher_cf.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/corelib/kernel/qeventdispatcher_cf.mm b/src/corelib/kernel/qeventdispatcher_cf.mm index 240dfed79f..8422345968 100644 --- a/src/corelib/kernel/qeventdispatcher_cf.mm +++ b/src/corelib/kernel/qeventdispatcher_cf.mm @@ -49,6 +49,8 @@ # include #endif +QT_USE_NAMESPACE + @interface RunLoopModeTracker : NSObject { QStack m_runLoopModes; } @@ -119,7 +121,6 @@ static CFStringRef runLoopMode(NSDictionary *dictionary) @end QT_BEGIN_NAMESPACE -QT_USE_NAMESPACE class RunLoopDebugger : public QObject {