diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 09:01:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 09:01:51 +0100 |
| commit | c7934f2489e2eb9a539206bab35f335b1943c5bd (patch) | |
| tree | a27d0ed6c001fe9432e2a0f28fb935acf9e4c65f /src/corelib/kernel | |
| parent | f40593b11199fbef886bfcb6b210a214d8c3adf3 (diff) | |
| parent | 08f9a1bd6ab9b1777ee5ba163d75e5c848c39eb4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/qprocess.cpp
src/corelib/io/qprocess_unix.cpp
src/network/kernel/qnetworkinterface_winrt.cpp
tools/configure/configureapp.cpp
Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/kernel.pri | 13 | ||||
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_cf.mm | 10 | ||||
| -rw-r--r-- | src/corelib/kernel/qfunctions_wince.h | 2 |
3 files changed, 15 insertions, 10 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; diff --git a/src/corelib/kernel/qfunctions_wince.h b/src/corelib/kernel/qfunctions_wince.h index d172acceec..4273070c11 100644 --- a/src/corelib/kernel/qfunctions_wince.h +++ b/src/corelib/kernel/qfunctions_wince.h @@ -103,7 +103,7 @@ struct tm { int tm_year; /* years since 1900 */ int tm_wday; /* days since Sunday - [0,6] */ int tm_yday; /* days since January 1 - [0,365] */ - int tm_isdst; /* daylight savings time flag */ + int tm_isdst; /* daylight-saving time flag */ }; #endif // _TM_DEFINED |