From da8b7c8587a6d3c3214355f3d85a09c8693ceeee Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Thu, 4 Nov 2010 15:19:03 +0100
Subject: Fix compilation issue for the Carbon build.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The unified toolbar with the raster engine is
Cocoa specific.

Reviewed-by: Samuel Rødal
---
 src/gui/widgets/qmainwindowlayout_mac.mm | 3 +++
 src/gui/widgets/qmainwindowlayout_p.h    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gui/widgets/qmainwindowlayout_mac.mm b/src/gui/widgets/qmainwindowlayout_mac.mm
index dfde799..9e26423 100644
--- a/src/gui/widgets/qmainwindowlayout_mac.mm
+++ b/src/gui/widgets/qmainwindowlayout_mac.mm
@@ -474,6 +474,7 @@ void QMainWindowLayout::insertIntoMacToolbar(QToolBar *before, QToolBar *toolbar
 #endif
 }
 
+#ifdef QT_MAC_USE_COCOA
 void QMainWindowLayout::updateUnifiedToolbarOffset()
 {
     QPoint offset(0, 0);
@@ -483,6 +484,8 @@ void QMainWindowLayout::updateUnifiedToolbarOffset()
         qtoolbarsInUnifiedToolbarList.at(i)->d_func()->toolbar_offset = offset;
     }
 }
+#endif // QT_MAC_USE_COCOA
+
 
 void QMainWindowLayout::removeFromMacToolbar(QToolBar *toolbar)
 {
diff --git a/src/gui/widgets/qmainwindowlayout_p.h b/src/gui/widgets/qmainwindowlayout_p.h
index e457cbc..661d49d 100644
--- a/src/gui/widgets/qmainwindowlayout_p.h
+++ b/src/gui/widgets/qmainwindowlayout_p.h
@@ -335,7 +335,6 @@ public:
     QHash<QToolBar *, ToolBarSaveState> toolbarSaveState;
     QHash<QString, QToolBar *> cocoaItemIDToToolbarHash;
     void insertIntoMacToolbar(QToolBar *before, QToolBar *after);
-    void updateUnifiedToolbarOffset();
     void removeFromMacToolbar(QToolBar *toolbar);
     void cleanUpMacToolbarItems();
     void fixSizeInUnifiedToolbar(QToolBar *tb) const;
@@ -346,6 +345,7 @@ public:
 
 #ifdef QT_MAC_USE_COCOA
     QUnifiedToolbarSurface *unifiedSurface;
+    void updateUnifiedToolbarOffset();
 #endif // QT_MAC_USE_COCOA
 
 #endif // Q_WS_MAC
-- 
cgit v0.12