Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Experimental support of the unified toolbar with

1 files changed, 8 insertions, 3 deletions

diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp
index 4ca11b0..861cfaa 100644
--- a/src/gui/widgets/qmainwindow.cpp
+++ b/src/gui/widgets/qmainwindow.cpp
@@ -1516,14 +1516,19 @@ void QMainWindow::setUnifiedTitleAndToolBarOnMac(bool set)
     if (!isWindow() || d->useHIToolBar == set || QSysInfo::MacintoshVersion < QSysInfo::MV_10_3)
         return;
 
-    // ### Disable the unified toolbar when using anything but the native graphics system.
-    // ### Disable when using alien widgets as well
-    if (windowSurface() || testAttribute(Qt::WA_NativeWindow) == false)
+    // ### Disable when using alien widgets
+    if (testAttribute(Qt::WA_NativeWindow) == false) {
         return;
+    }
 
     d->useHIToolBar = set;
     createWinId(); // We need the hiview for down below.
 
+    // Activate the unified toolbar with the raster engine.
+    if (windowSurface()) {
+        d->layout->unifiedSurface = new QUnifiedToolbarSurface(this);
+    }
+
     d->layout->updateHIToolBarStatus();
     // Enabling the unified toolbar clears the opaque size grip setting, update it.
     d->macUpdateOpaqueSizeGrip();