diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-04-20 12:21:57 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-04-20 12:21:57 +0200 |
| commit | cf204590ea94bb3a191b5e783471bd6f5a04ab8e (patch) | |
| tree | f96b4dc4c3995b0a3a2d1b8291144846c30baa64 /src/corelib/kernel/qcore_mac_objc.mm | |
| parent | c579a77f841ed44df25553972f8807110c55808d (diff) | |
| parent | 941db4e0bb3170b6bc3cf775f150a226754e6285 (diff) | |
Merge 5.11 into 5.11.0
Change-Id: I11c61dc1259ed66d871ecab2666085ccf37a9342
Diffstat (limited to 'src/corelib/kernel/qcore_mac_objc.mm')
| -rw-r--r-- | src/corelib/kernel/qcore_mac_objc.mm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/kernel/qcore_mac_objc.mm b/src/corelib/kernel/qcore_mac_objc.mm index 24d73fa8be..5ecd86a30e 100644 --- a/src/corelib/kernel/qcore_mac_objc.mm +++ b/src/corelib/kernel/qcore_mac_objc.mm @@ -346,15 +346,15 @@ Qt::Key qt_mac_cocoaKey2QtKey(QChar keyCode) void qt_apple_check_os_version() { -#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) - const char *os = "iOS"; - const int version = __IPHONE_OS_VERSION_MIN_REQUIRED; +#if defined(__WATCH_OS_VERSION_MIN_REQUIRED) + const char *os = "watchOS"; + const int version = __WATCH_OS_VERSION_MIN_REQUIRED; #elif defined(__TV_OS_VERSION_MIN_REQUIRED) const char *os = "tvOS"; const int version = __TV_OS_VERSION_MIN_REQUIRED; -#elif defined(__WATCH_OS_VERSION_MIN_REQUIRED) - const char *os = "watchOS"; - const int version = __WATCH_OS_VERSION_MIN_REQUIRED; +#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED) + const char *os = "iOS"; + const int version = __IPHONE_OS_VERSION_MIN_REQUIRED; #elif defined(__MAC_OS_X_VERSION_MIN_REQUIRED) const char *os = "macOS"; const int version = __MAC_OS_X_VERSION_MIN_REQUIRED; |