From a06a0e0ae6f967be0da5171285fda475261d21f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Fri, 8 Mar 2013 11:24:10 +0100 Subject: Use [NSScreen backingScaleFactor] on 10.7+ userSpaceScaleFactor is deprecated. Change-Id: I892cb579e4b3ef9226495759c884d0e74c85a1d6 Reviewed-by: Gabriel de Dietrich --- src/gui/kernel/qt_cocoa_helpers_mac.mm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index f6c7be4..1f2fbb9 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -1559,9 +1559,14 @@ CGFloat qt_mac_get_scalefactor() { #ifndef QT_MAC_USE_COCOA return HIGetScaleFactor(); -#else - return [[NSScreen mainScreen] userSpaceScaleFactor]; #endif + +#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7) + NSScreen *mainScreen = [NSScreen mainScreen]; + if ([mainScreen respondsToSelector:@selector(backingScaleFactor)]) + return [mainScreen backingScaleFactor]; +#endif + return 1.0; } QString qt_mac_get_pasteboardString(OSPasteboardRef paste) -- cgit v0.12