From be74da81df236e5de9ec0566c431fb368bfae89b Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 27 Feb 2017 11:26:21 -0800 Subject: [PATCH] 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 --- src/corelib/global/qglobal.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 9ac29acd160..0e374931820 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 /*