diff options
| author | Ian Dean <ian@mediator-software.com> | 2012-07-19 06:02:56 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-18 09:09:00 (GMT) |
| commit | b3c21d93f66617b87b341911d329c0b1ad6af485 (patch) | |
| tree | aee75fa9e661cc33916b3ef6c01de7217a8b4676 /src/corelib/global | |
| parent | c14694621aab2e7df13830f80621fb5680b432e4 (diff) | |
| download | Qt-b3c21d93f66617b87b341911d329c0b1ad6af485.zip Qt-b3c21d93f66617b87b341911d329c0b1ad6af485.tar.gz Qt-b3c21d93f66617b87b341911d329c0b1ad6af485.tar.bz2 | |
Refactor coreservices -> ios & QT_NO_CORESERVICES -> Q_OS_IOS
Similar work was done in Qt5 in Change Id3b02316
Change-Id: I392d2a5bfffb9a335f28d5dbc5ea27b800fc4487
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index f119f2b..71fc6c9 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -74,7 +74,7 @@ # include <envLib.h> #endif -#if defined(Q_OS_MACX) && !defined(QT_NO_CORESERVICES) +#if defined(Q_OS_MACX) && !defined(Q_OS_IOS) #include <CoreServices/CoreServices.h> #endif @@ -1661,7 +1661,7 @@ QT_END_INCLUDE_NAMESPACE static QSysInfo::MacVersion macVersion() { -#ifndef QT_NO_CORESERVICES +#if !defined(Q_OS_IOS) SInt32 gestalt_version; if (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) { return QSysInfo::MacVersion(((gestalt_version & 0x00F0) >> 4) + 2); |