diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-01 15:53:59 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-01 16:09:41 (GMT) |
| commit | fa74b4a710618f2c738030550ff7c6b668980324 (patch) | |
| tree | 99f23a9280509bcd2f49b3c697b73dc4d7a0e8b4 /src/gui/widgets/qtoolbarlayout.cpp | |
| parent | aa108fba41055d04ccbb0b0e304e8685e9f90d8c (diff) | |
| download | Qt-fa74b4a710618f2c738030550ff7c6b668980324.zip Qt-fa74b4a710618f2c738030550ff7c6b668980324.tar.gz Qt-fa74b4a710618f2c738030550ff7c6b668980324.tar.bz2 | |
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
Diffstat (limited to 'src/gui/widgets/qtoolbarlayout.cpp')
| -rw-r--r-- | src/gui/widgets/qtoolbarlayout.cpp | 8 |
1 files 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; |