diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-22 10:18:16 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-22 10:18:16 (GMT) |
| commit | 88ebb57019913958771416261206d9daa77fc4aa (patch) | |
| tree | 44950a191d27dd51881088737cf19154a774f8bb /src/gui/util | |
| parent | 84a342eea111f0a1da8fd0c417362aae2b851e56 (diff) | |
| parent | 9e85af3454bd0a2d962523d52e688f9bc7259528 (diff) | |
| download | Qt-88ebb57019913958771416261206d9daa77fc4aa.zip Qt-88ebb57019913958771416261206d9daa77fc4aa.tar.gz Qt-88ebb57019913958771416261206d9daa77fc4aa.tar.bz2 | |
Merge remote-tracking branch 'mainline/master'
Conflicts:
src/gui/image/qpnghandler.cpp
Diffstat (limited to 'src/gui/util')
| -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]; |