diff options
| author | Robert Griebl <rgriebl@trolltech.com> | 2010-04-20 19:42:04 +0200 |
|---|---|---|
| committer | Robert Griebl <rgriebl@trolltech.com> | 2010-04-20 19:42:04 +0200 |
| commit | 12c24346cee853394625eb02277830c081a6a3c5 (patch) | |
| tree | 9d2f6880f1c51a8db4eb75ab853609bb7eccd4ef | |
| parent | a9fd40affd5aeedaf9224cb3583126308b078fa0 (diff) | |
fix realDpi for the Mac
| -rw-r--r-- | scroller/qkineticscroller_mac.mm | 11 | ||||
| -rw-r--r-- | scroller/scroller.pro | 2 | ||||
| -rw-r--r-- | testapp/testapp.pro | 1 | ||||
| -rw-r--r-- | touchy/touchy.pro | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/scroller/qkineticscroller_mac.mm b/scroller/qkineticscroller_mac.mm index 50f76d0..b358063 100644 --- a/scroller/qkineticscroller_mac.mm +++ b/scroller/qkineticscroller_mac.mm @@ -41,22 +41,20 @@ #import <Cocoa/Cocoa.h> -#include <QMacCocoaAutoReleasePool> - #include "qkineticscroller_p.h" #ifdef Q_WS_MAC QPointF QKineticScrollerPrivate::realDpi(int screen) { - QMacCocoaAutoReleasePool pool; + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSArray *nsscreens = [NSScreen screens]; - if (screen < 0 || screen >= [nsscreens count]) + if (screen < 0 || screen >= int([nsscreens count])) screen = 0; - NSScreen *nsscreen = [displays objectAtIndex:screen]; - CGDirectDisplayID display = [[[nsscreen deviceDescription] objectForKey:@"NSScreenNumber"] pointerValue]; + NSScreen *nsscreen = [nsscreens objectAtIndex:screen]; + CGDirectDisplayID display = [[[nsscreen deviceDescription] objectForKey:@"NSScreenNumber"] intValue]; CGSize mmsize = CGDisplayScreenSize(display); if (mmsize.width > 0 && mmsize.height > 0) { @@ -65,6 +63,7 @@ QPointF QKineticScrollerPrivate::realDpi(int screen) } else { return QPointF(); } + [pool release]; } #endif diff --git a/scroller/scroller.pro b/scroller/scroller.pro index a88d171..fa44fbe 100644 --- a/scroller/scroller.pro +++ b/scroller/scroller.pro @@ -14,3 +14,5 @@ SOURCES += qkineticscroller.cpp macx:SOURCES += qkineticscroller_mac.mm maemo5:SOURCES += qkineticscroller_maemo5.cpp + +macx:LIBS += -framework Cocoa diff --git a/testapp/testapp.pro b/testapp/testapp.pro index 03da8ec..a9546ff 100644 --- a/testapp/testapp.pro +++ b/testapp/testapp.pro @@ -14,3 +14,4 @@ SOURCES += main.cpp \ plotwidget.cpp \ qscrollareakineticscroller.cpp \ settingswidget.cpp +macx:LIBS += -frameworks Cocoa diff --git a/touchy/touchy.pro b/touchy/touchy.pro index 03da8ec..7ce28b0 100644 --- a/touchy/touchy.pro +++ b/touchy/touchy.pro @@ -14,3 +14,5 @@ SOURCES += main.cpp \ plotwidget.cpp \ qscrollareakineticscroller.cpp \ settingswidget.cpp + +macx:LIBS += -frameworks Cocoa |