From 065ce8db6ff006c465bc6909c99836f5349d6a5d Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Wed, 20 Oct 2010 13:33:15 +0200
Subject: Fix the #ifdef position.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Tor Arne Vestbø
---
 src/gui/painting/qunifiedtoolbarsurface_mac.cpp | 4 ++--
 src/gui/painting/qunifiedtoolbarsurface_mac_p.h | 4 ++--
 src/gui/widgets/qmainwindowlayout_p.h           | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
index b90b061..ab05dbd 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#ifdef QT_MAC_USE_COCOA
-
 #include "qunifiedtoolbarsurface_mac_p.h"
 #include <private/qt_cocoa_helpers_mac_p.h>
 #include <private/qbackingstore_p.h>
 
 #include <QDebug>
 
+#ifdef QT_MAC_USE_COCOA
+
 QT_BEGIN_NAMESPACE
 
 QUnifiedToolbarSurface::QUnifiedToolbarSurface(QWidget *widget)
diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
index c2ec854..4d72ff9 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
@@ -53,13 +53,13 @@
 // We mean it.
 //
 
-#ifdef QT_MAC_USE_COCOA
-
 #include <private/qwindowsurface_raster_p.h>
 #include <QWidget>
 #include <private/qwidget_p.h>
 #include <private/qnativeimage_p.h>
 
+#ifdef QT_MAC_USE_COCOA
+
 QT_BEGIN_NAMESPACE
 
 class QNativeImage;
diff --git a/src/gui/widgets/qmainwindowlayout_p.h b/src/gui/widgets/qmainwindowlayout_p.h
index 3eb2545..e882d11 100644
--- a/src/gui/widgets/qmainwindowlayout_p.h
+++ b/src/gui/widgets/qmainwindowlayout_p.h
@@ -342,7 +342,10 @@ public:
     void syncUnifiedToolbarVisibility();
     bool blockVisiblityCheck;
 
+#ifdef QT_MAC_USE_COCOA
     QUnifiedToolbarSurface *unifiedSurface;
+#endif // QT_MAC_USE_COCOA
+
 #endif // Q_WS_MAC
 };
 QT_END_NAMESPACE
-- 
cgit v0.12