diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-01 16:12:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-01 16:12:14 (GMT) |
| commit | b934b56faaa474b2ed96368f47beb098ec0bf208 (patch) | |
| tree | 99f23a9280509bcd2f49b3c697b73dc4d7a0e8b4 | |
| parent | de56873bff7e9bb2739fe8a4ed4bceb418c8f3c3 (diff) | |
| parent | fa74b4a710618f2c738030550ff7c6b668980324 (diff) | |
| download | Qt-b934b56faaa474b2ed96368f47beb098ec0bf208.zip Qt-b934b56faaa474b2ed96368f47beb098ec0bf208.tar.gz Qt-b934b56faaa474b2ed96368f47beb098ec0bf208.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-team
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-team:
Fixed a problem with toolbars not relayouting
| -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; |