diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 10:53:27 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 10:53:27 (GMT) |
| commit | becf7dc2b4b7c2609350eb3236f854c1a4a344f5 (patch) | |
| tree | 9cdc7101f704a7c6b6544c3aa74f79e5f2fdd1dc /src/gui/widgets/qtoolbarlayout.cpp | |
| parent | 3794e55c2c8427dd8bd4f86af5e894cc80267881 (diff) | |
| parent | 60d2ab05c350f866f942a35f341f455015fdb800 (diff) | |
| download | Qt-becf7dc2b4b7c2609350eb3236f854c1a4a344f5.zip Qt-becf7dc2b4b7c2609350eb3236f854c1a4a344f5.tar.gz Qt-becf7dc2b4b7c2609350eb3236f854c1a4a344f5.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/widgets/qtoolbarlayout.cpp')
| -rw-r--r-- | src/gui/widgets/qtoolbarlayout.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/widgets/qtoolbarlayout.cpp b/src/gui/widgets/qtoolbarlayout.cpp index 7dc1e01..0afe5d8 100644 --- a/src/gui/widgets/qtoolbarlayout.cpp +++ b/src/gui/widgets/qtoolbarlayout.cpp @@ -642,7 +642,7 @@ QSize QToolBarLayout::expandedSize(const QSize &size) const return result; } -void QToolBarLayout::setExpanded(bool exp, bool animated) +void QToolBarLayout::setExpanded(bool exp) { if (exp == expanded) return; @@ -654,7 +654,6 @@ void QToolBarLayout::setExpanded(bool exp, bool animated) if (!tb) return; if (QMainWindow *win = qobject_cast<QMainWindow*>(tb->parentWidget())) { - animating = true; QMainWindowLayout *layout = qobject_cast<QMainWindowLayout*>(win->layout()); if (expanded) { tb->raise(); @@ -665,7 +664,7 @@ void QToolBarLayout::setExpanded(bool exp, bool animated) layoutActions(rect.size()); } } - layout->layoutState.toolBarAreaLayout.apply(animated); + layout->layoutState.toolBarAreaLayout.apply(win->isAnimated()); } } |