diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-17 10:19:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-17 10:34:24 +0200 |
| commit | d0a0a3c0418a0fdd2ed84b2a5f7e6565537715c6 (patch) | |
| tree | d6aeb4d51caf30ccf23eadb806a09295cbf679cd /src/plugins/platforms/cocoa/qnswindow.mm | |
| parent | 9f405f98a4247cd263b9c5d35659a4ba89e282de (diff) | |
| parent | ac35f9c44c0fb3b2f40ae5585c497200b2ba743d (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
examples/network/fortuneclient/client.cpp
examples/network/fortuneserver/server.cpp
src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h
src/plugins/platforms/cocoa/qcocoabackingstore.h
src/plugins/platforms/cocoa/qcocoaintegration.h
src/plugins/platforms/cocoa/qcocoascreen.h
src/plugins/platforms/ios/qiosbackingstore.h
src/plugins/sqldrivers/oci/qsql_oci.cpp
src/widgets/kernel/qwidgetwindow.cpp
Change-Id: Ia6dd2c52d4a691b671cf9a2ffca70deccece8f10
Diffstat (limited to 'src/plugins/platforms/cocoa/qnswindow.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnswindow.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm index 513c7f22b5..799704a407 100644 --- a/src/plugins/platforms/cocoa/qnswindow.mm +++ b/src/plugins/platforms/cocoa/qnswindow.mm @@ -232,7 +232,7 @@ static bool isMouseEvent(NSEvent *ev) NSApplication *application = [NSApplication sharedApplication]; #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12) - if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSSierra) { + if (__builtin_available(macOS 10.12, *)) { // Unfortunately there's no NSWindowListOrderedBackToFront, // so we have to manually reverse the order using an array. NSMutableArray *windows = [[[NSMutableArray alloc] init] autorelease]; |