From fa74b4a710618f2c738030550ff7c6b668980324 Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Wed, 1 Dec 2010 16:53:59 +0100
Subject: Fixed a problem with toolbars not relayouting

This could happen when dragging an extended toolbar from a mainwindow
PAtch was provided on IRC by ravek (#dev)

Task-number: QTBUG-10920
Reviewed-by: Trust-Me
---
 src/gui/widgets/qtoolbarlayout.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gui/widgets/qtoolbarlayout.cpp b/src/gui/widgets/qtoolbarlayout.cpp
index 59b027e..f25d97d 100644
--- a/src/gui/widgets/qtoolbarlayout.cpp
+++ b/src/gui/widgets/qtoolbarlayout.cpp
@@ -647,15 +647,15 @@ QSize QToolBarLayout::expandedSize(const QSize &size) const
 
 void QToolBarLayout::setExpanded(bool exp)
 {
-    if (exp == expanded)
+    QWidget *tb = qobject_cast<QToolBar*>(parentWidget());
+    if (!tb)
+        return;
+    if (exp == expanded && !tb->isWindow())
         return;
 
     expanded = exp;
     extension->setChecked(expanded);
 
-    QToolBar *tb = qobject_cast<QToolBar*>(parentWidget());
-    if (!tb)
-        return;
     if (QMainWindow *win = qobject_cast<QMainWindow*>(tb->parentWidget())) {
 #ifdef QT_NO_DOCKWIDGET
         animating = false;
-- 
cgit v0.12