Add the ability to remove a toolbar from the unified toolbar.

This allows to toggle the unified look of the
toolbar. This is useful for apps going fullscreen
since we have to turn the unified look off when
entering fullscreen mode.

Reviewed-by: Samuel Rødal

1 files changed, 4 insertions, 1 deletions

diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
index f7ad02e..99839fa 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
@@ -55,6 +55,7 @@
 
 #include <private/qwindowsurface_raster_p.h>
 #include <QWidget>
+#include <QToolBar>
 #include <private/qwidget_p.h>
 #include <private/qnativeimage_p.h>
 
@@ -82,15 +83,17 @@ public:
     void setGeometry(const QRect &rect);
     void beginPaint(const QRegion &rgn);
     void insertToolbar(QWidget *toolbar, const QPoint &offset);
+    void removeToolbar(QToolBar *toolbar);
     void updateToolbarOffset(QWidget *widget);
+    void renderToolbar(QWidget *widget, bool forceFlush = false);
 
     QPaintDevice *paintDevice();
     CGContextRef imageContext();
-    void renderToolbar(QWidget *widget, bool forceFlush = false);
 
 private:
     void prepareBuffer(QImage::Format format, QWidget *widget);
     void recursiveRedirect(QObject *widget, QWidget *parent_toolbar, const QPoint &offset);
+    void recursiveRemoval(QObject *object);
 
     Q_DECLARE_PRIVATE(QUnifiedToolbarSurface)
     QScopedPointer<QUnifiedToolbarSurfacePrivate> d_ptr;