summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qmainwindowlayout.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-17 14:27:48 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-17 14:27:48 (GMT)
commit62e641691b9a3eadc8b9fb2e31150cdf5b66115d (patch)
tree9033ae42f5b599e564421db69737ca0c70a85f53 /src/gui/widgets/qmainwindowlayout.cpp
parente76c4c03c98091ee3e509a0f9b64daba472567ff (diff)
parente02859c3c7910ab3de0ec594fd493df946a5102d (diff)
downloadQt-62e641691b9a3eadc8b9fb2e31150cdf5b66115d.zip
Qt-62e641691b9a3eadc8b9fb2e31150cdf5b66115d.tar.gz
Qt-62e641691b9a3eadc8b9fb2e31150cdf5b66115d.tar.bz2
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'src/gui/widgets/qmainwindowlayout.cpp')
-rw-r--r--src/gui/widgets/qmainwindowlayout.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/widgets/qmainwindowlayout.cpp b/src/gui/widgets/qmainwindowlayout.cpp
index 027a5d6..fa6f7a1 100644
--- a/src/gui/widgets/qmainwindowlayout.cpp
+++ b/src/gui/widgets/qmainwindowlayout.cpp
@@ -1641,6 +1641,9 @@ void QMainWindowLayout::animationFinished(QWidget *widget)
savedState.clear();
currentGapPos.clear();
pluggingWidget = 0;
+ //applying the state will make sure that the currentGap is updated correctly
+ //and all the geometries (especially the one from the central widget) is correct
+ layoutState.apply(false);
}
if (!widgetAnimator.animating()) {