diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-03-08 10:24:10 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-20 16:32:30 (GMT) |
| commit | a06a0e0ae6f967be0da5171285fda475261d21f1 (patch) | |
| tree | 4237908edbe96c29f0f8ea1283b2e5b7f7b21120 | |
| parent | 56e4daccf9b1b9c2b3d7103cabc40fb406a23df3 (diff) | |
| download | Qt-a06a0e0ae6f967be0da5171285fda475261d21f1.zip Qt-a06a0e0ae6f967be0da5171285fda475261d21f1.tar.gz Qt-a06a0e0ae6f967be0da5171285fda475261d21f1.tar.bz2 | |
Use [NSScreen backingScaleFactor] on 10.7+
userSpaceScaleFactor is deprecated.
Change-Id: I892cb579e4b3ef9226495759c884d0e74c85a1d6
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| -rw-r--r-- | src/gui/kernel/qt_cocoa_helpers_mac.mm | 9 |
1 files 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) |