diff options
| author | con <qtc-committer@nokia.com> | 2011-03-04 16:10:47 (GMT) |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2011-03-07 09:02:49 (GMT) |
| commit | cf264556fdea0d434e329e36c07a0ae6fa974f8b (patch) | |
| tree | 342a8c115c9443fc8dae4ff0994aa363f4788cee /src | |
| parent | 8238ca7f3d89d409221c96706eeae196199109c6 (diff) | |
| download | Qt-cf264556fdea0d434e329e36c07a0ae6fa974f8b.zip Qt-cf264556fdea0d434e329e36c07a0ae6fa974f8b.tar.gz Qt-cf264556fdea0d434e329e36c07a0ae6fa974f8b.tar.bz2 | |
Fix 7ea1dd46966ae7cfa07fa18c001704e3c981b669 for Mac desktop builds.
Cocoa.h can't be included after qscroller_p.h, but we need to have
Q_WS_MAC defined before the ifdef.
Reviewed-by: Morten Johan Sørvig
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/util/qscroller_mac.mm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/util/qscroller_mac.mm b/src/gui/util/qscroller_mac.mm index d85a51b..37756d7 100644 --- a/src/gui/util/qscroller_mac.mm +++ b/src/gui/util/qscroller_mac.mm @@ -39,13 +39,14 @@ ** ****************************************************************************/ - -#include "qscroller_p.h" +#include <QtCore/qglobal.h> #ifdef Q_WS_MAC #import <Cocoa/Cocoa.h> +#include "qscroller_p.h" + QPointF QScrollerPrivate::realDpi(int screen) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |