summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2009-11-10 16:55:14 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2009-11-10 16:56:42 (GMT)
commit2321e8636d7436b70a8afcde16828f00c4b8590e (patch)
tree21c8748f2e03bf88b56838e96d38b46e5743b0c3 /src
parent6e6803540d50f14a2c4a6e1ee551310fa96d0cb6 (diff)
downloadQt-2321e8636d7436b70a8afcde16828f00c4b8590e.zip
Qt-2321e8636d7436b70a8afcde16828f00c4b8590e.tar.gz
Qt-2321e8636d7436b70a8afcde16828f00c4b8590e.tar.bz2
Make it possible for QMainWindow to restore the geom of undocked widget
Task-number: QTBUG-5663 Reviewed-by: ogoffart
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/qdockarealayout.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/qdockarealayout.cpp b/src/gui/widgets/qdockarealayout.cpp
index dffec11..27e145f 100644
--- a/src/gui/widgets/qdockarealayout.cpp
+++ b/src/gui/widgets/qdockarealayout.cpp
@@ -1933,6 +1933,9 @@ bool QDockAreaLayoutInfo::restoreState(QDataStream &stream, QList<QDockWidget*>
item_list.append(item);
} else {
QDockAreaLayoutItem item(new QDockWidgetItem(widget));
+ if (!testing) {
+ item_list.append(item);
+ }
if (flags & StateFlagFloating) {
bool drawer = false;
#ifdef Q_WS_MAC // drawer support
@@ -1980,9 +1983,6 @@ bool QDockAreaLayoutInfo::restoreState(QDataStream &stream, QList<QDockWidget*>
}
}
- if (!testing) {
- item_list.append(item);
- }
}
} else if (nextMarker == SequenceMarker) {
int dummy;