diff options
-rw-r--r-- | src/corelib/kernel/kernel.pri | 13 | ||||
-rw-r--r-- | src/corelib/kernel/qeventdispatcher_cf.mm | 10 |
2 files changed, 14 insertions, 9 deletions
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index 600c28b5d7..f09fa4debc 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -101,7 +101,8 @@ winrt { mac { HEADERS += \ kernel/qcfsocketnotifier_p.h \ - kernel/qcore_mac_p.h + kernel/qcore_mac_p.h \ + kernel/qeventdispatcher_cf_p.h SOURCES += \ kernel/qcfsocketnotifier.cpp \ @@ -109,18 +110,14 @@ mac { kernel/qcore_mac.cpp OBJECTIVE_SOURCES += \ - kernel/qcore_mac_objc.mm + kernel/qcore_mac_objc.mm \ + kernel/qeventdispatcher_cf.mm LIBS_PRIVATE += -framework Foundation - osx: LIBS_PRIVATE += -framework CoreServices + osx: LIBS_PRIVATE += -framework CoreServices -framework AppKit ios { - OBJECTIVE_SOURCES += \ - kernel/qeventdispatcher_cf.mm - HEADERS += \ - kernel/qeventdispatcher_cf_p.h - # We need UIKit for UIDevice LIBS_PRIVATE += -framework UIKit } diff --git a/src/corelib/kernel/qeventdispatcher_cf.mm b/src/corelib/kernel/qeventdispatcher_cf.mm index 5b9ad38b28..240dfed79f 100644 --- a/src/corelib/kernel/qeventdispatcher_cf.mm +++ b/src/corelib/kernel/qeventdispatcher_cf.mm @@ -43,7 +43,11 @@ #include <limits> -#include <UIKit/UIApplication.h> +#ifdef Q_OS_OSX +# include <AppKit/NSApplication.h> +#else +# include <UIKit/UIApplication.h> +#endif @interface RunLoopModeTracker : NSObject { QStack<CFStringRef> m_runLoopModes; @@ -61,7 +65,11 @@ addObserver:self selector:@selector(receivedNotification:) name:nil +#ifdef Q_OS_OSX + object:[NSApplication sharedApplication]]; +#else object:[UIApplication sharedApplication]]; +#endif } return self; |