diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-11-13 16:44:03 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-11-13 16:45:12 (GMT) |
| commit | 379cea3cfdccf5a880241ca707ffc37170cb3736 (patch) | |
| tree | 59c819ba483442154532515a4199103ae47de26a | |
| parent | 099d6efe275511f18b0bc0002ac8cedd193139cd (diff) | |
| download | Qt-379cea3cfdccf5a880241ca707ffc37170cb3736.zip Qt-379cea3cfdccf5a880241ca707ffc37170cb3736.tar.gz Qt-379cea3cfdccf5a880241ca707ffc37170cb3736.tar.bz2 | |
Fixed a regression in mainwindow that would not restore correctly
The size of the dockwidgets would be ignored.
Reviewed-by: ogoffart
| -rw-r--r-- | src/gui/widgets/qdockarealayout.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/widgets/qdockarealayout.cpp b/src/gui/widgets/qdockarealayout.cpp index 953edab..07914b2 100644 --- a/src/gui/widgets/qdockarealayout.cpp +++ b/src/gui/widgets/qdockarealayout.cpp @@ -1931,9 +1931,6 @@ 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 @@ -1971,11 +1968,13 @@ bool QDockAreaLayoutInfo::restoreState(QDataStream &stream, QList<QDockWidget*> if (!testing) { widget->setVisible(flags & StateFlagVisible); + item_list.append(item); } } else { int dummy; stream >> item.pos >> item.size >> dummy >> dummy; if (!testing) { + item_list.append(item); widget->setFloating(false); widget->setVisible(flags & StateFlagVisible); emit widget->dockLocationChanged(toDockWidgetArea(dockPos)); |