summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2009-07-10 12:30:05 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2009-07-10 13:30:55 (GMT)
commitbc747a81f4f6f0978f71cd8d19f69060fc8a8041 (patch)
tree9cb02d4c6b583b9aa3c4a46317c24104690f6fd5
parentb420385f15f109765fc31c5bcc5b4ea9498b82d4 (diff)
downloadQt-bc747a81f4f6f0978f71cd8d19f69060fc8a8041.zip
Qt-bc747a81f4f6f0978f71cd8d19f69060fc8a8041.tar.gz
Qt-bc747a81f4f6f0978f71cd8d19f69060fc8a8041.tar.bz2
QMainWindow: it is useless to apply the stte after a call to plug
The layoutState is already current (ie. already applied).
-rw-r--r--src/gui/widgets/qmainwindowlayout.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/widgets/qmainwindowlayout.cpp b/src/gui/widgets/qmainwindowlayout.cpp
index 541907e..3936a67 100644
--- a/src/gui/widgets/qmainwindowlayout.cpp
+++ b/src/gui/widgets/qmainwindowlayout.cpp
@@ -1629,9 +1629,6 @@ void QMainWindowLayout::animationFinished(QWidget *widget)
#ifndef QT_NO_DOCKWIDGET
#ifndef QT_NO_TABBAR
- //it is important to set the current tab before applying the layout
- //so that applyState will not try to counter the result of the animation
- //by putting the item in negative space
if (qobject_cast<QDockWidget*>(widget) != 0) {
// info() might return null if the widget is destroyed while
// animating but before the animationFinished signal is received.
@@ -1641,8 +1638,6 @@ void QMainWindowLayout::animationFinished(QWidget *widget)
#endif
#endif
- applyState(layoutState, false);
-
savedState.clear();
currentGapPos.clear();
pluggingWidget = 0;