summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/kernel.pri
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2014-06-13 18:59:30 -0400
committerJake Petroules <jake.petroules@petroules.com>2014-09-12 22:01:58 +0200
commit4e8720d413ceca288408ae34bc726f768ca467c6 (patch)
treea3386a6e1d2df84434d02d07d14f4a8bd2037251 /src/corelib/kernel/kernel.pri
parentfac71528cce279282d66b0a96ddd8570d567955f (diff)
Use new, supported APIs in OS X 10.10 and iOS 8.0 to get the OS version.
Gestalt is deprecated so we can't use it long term. At the same time, the new API is cross platform, so we'll no longer have to parse strings in -[UIDevice systemVersion] either. Change-Id: Ic81797174c1a3d50b47b9b209205a6a506cc75ef Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Diffstat (limited to 'src/corelib/kernel/kernel.pri')
-rw-r--r--src/corelib/kernel/kernel.pri24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
index 819c10e99f..3324d20dae 100644
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@@ -99,20 +99,22 @@ winrt {
}
mac {
+ HEADERS += \
+ kernel/qcore_mac_p.h
+
SOURCES += \
- kernel/qcoreapplication_mac.cpp
-}
+ kernel/qcoreapplication_mac.cpp \
+ kernel/qcore_mac.cpp
+
+ OBJECTIVE_SOURCES += \
+ kernel/qcore_mac_objc.mm
+
+ LIBS_PRIVATE += -framework Foundation
-mac:!nacl {
- HEADERS += \
- kernel/qcore_mac_p.h
- SOURCES += \
- kernel/qcore_mac.cpp
- OBJECTIVE_SOURCES += \
- kernel/qcore_mac_objc.mm
+ osx: LIBS_PRIVATE += -framework CoreServices
- # We need UIKit for UIDevice
- ios: LIBS_PRIVATE += -framework UIKit
+ # We need UIKit for UIDevice
+ ios: LIBS_PRIVATE += -framework UIKit
}
nacl {