summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2017-02-27 11:26:21 -0800
committerJake Petroules <jake.petroules@qt.io>2017-02-27 22:23:55 +0000
commitbe74da81df236e5de9ec0566c431fb368bfae89b (patch)
treeda708f78cdeff0e48232dbccee35c2105759d8fa /src/corelib
parent2c9acfbec667878ce913fecda6361e7150b3a778 (diff)
Define QT_*_PLATFORM_SDK_EQUAL_OR_ABOVE macros on all platforms
Use of these macros implies defined(Q_OS_DARWIN) so don't complicate the usage point (since the preprocessor cannot handle, for example defined(Q_OS_DARWIN) && QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE when the latter macro is not defined). Change-Id: I47995351f0e46d8a1d07708117f8eed63d87ba0f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/qglobal.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 9ac29acd16..0e37493182 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -612,6 +612,18 @@ private:
void *pool;
};
+#else
+
+#define QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(macos, ios, tvos, watchos) (0)
+#define QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(macos, ios) (0)
+#define QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(macos) (0)
+#define QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(ios) (0)
+#define QT_TVOS_PLATFORM_SDK_EQUAL_OR_ABOVE(tvos) (0)
+#define QT_WATCHOS_PLATFORM_SDK_EQUAL_OR_ABOVE(watchos) (0)
+
+#define QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(osx, ios) (0)
+#define QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(osx) (0)
+
#endif // Q_OS_DARWIN
/*