diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-03-24 05:05:43 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-03-24 05:06:59 (GMT) |
| commit | 24bfb5cfc80966b15a58be6ef8dc5514d3318af1 (patch) | |
| tree | 153879a8a41148a45c0f66ee74acd4b972bbca50 /src/gui/util/qscroller_mac.mm | |
| parent | 774a3536b00c4d6e4c4c10b708e31b4373a338e3 (diff) | |
| parent | f5812ae1b669daa921eeabc903ec0eafcfe0c030 (diff) | |
| download | Qt-24bfb5cfc80966b15a58be6ef8dc5514d3318af1.zip Qt-24bfb5cfc80966b15a58be6ef8dc5514d3318af1.tar.gz Qt-24bfb5cfc80966b15a58be6ef8dc5514d3318af1.tar.bz2 | |
Merge qt/qt.git master into qa-team-master
Diffstat (limited to 'src/gui/util/qscroller_mac.mm')
| -rw-r--r-- | src/gui/util/qscroller_mac.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/util/qscroller_mac.mm b/src/gui/util/qscroller_mac.mm index f544788..4bf69c1 100644 --- a/src/gui/util/qscroller_mac.mm +++ b/src/gui/util/qscroller_mac.mm @@ -39,12 +39,14 @@ ** ****************************************************************************/ +#include <QtCore/qglobal.h> + +#ifdef Q_WS_MAC + #import <Cocoa/Cocoa.h> #include "qscroller_p.h" -#ifdef Q_WS_MAC - QPointF QScrollerPrivate::realDpi(int screen) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |