diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2014-06-13 18:59:30 -0400 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2014-09-12 22:01:58 +0200 |
| commit | 4e8720d413ceca288408ae34bc726f768ca467c6 (patch) | |
| tree | a3386a6e1d2df84434d02d07d14f4a8bd2037251 /qmake/qmake.pri | |
| parent | fac71528cce279282d66b0a96ddd8570d567955f (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 'qmake/qmake.pri')
| -rw-r--r-- | qmake/qmake.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 4de41d63e6..57dcbb0586 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -138,8 +138,8 @@ bootstrap { #Qt code SOURCES += qfilesystemengine_unix.cpp qfilesystemiterator_unix.cpp qfsfileengine_unix.cpp mac { SOURCES += qcore_mac.cpp qsettings_mac.cpp - OBJECTIVE_SOURCES += qlocale_mac.mm - LIBS += -framework ApplicationServices + OBJECTIVE_SOURCES += qcore_mac_objc.mm qlocale_mac.mm + LIBS += -framework ApplicationServices -framework CoreServices -framework Foundation } else { SOURCES += qlocale_unix.cpp } |