diff options
Diffstat (limited to 'scroller')
-rw-r--r-- | scroller/qkineticscroller_mac.mm | 11 | ||||
-rw-r--r-- | scroller/scroller.pro | 2 |
2 files changed, 7 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 |