From cf264556fdea0d434e329e36c07a0ae6fa974f8b Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Fri, 4 Mar 2011 17:10:47 +0100
Subject: Fix 7ea1dd46966ae7cfa07fa18c001704e3c981b669 for Mac desktop builds.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 src/gui/util/qscroller_mac.mm | 5 +++--
 1 file 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];
-- 
cgit v0.12