diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-13 17:14:56 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-13 17:14:56 (GMT) |
| commit | 9988c5af44003ec49a2a0747ae8f1b3a565642ac (patch) | |
| tree | 5cb03adf0c5e6aae5229938e122bf515d945cf99 /src/gui | |
| parent | d7abb14d1f4b8d5cca31ff9ec004eef7bf4cb9a1 (diff) | |
| parent | 379cea3cfdccf5a880241ca707ffc37170cb3736 (diff) | |
| download | Qt-9988c5af44003ec49a2a0747ae8f1b3a565642ac.zip Qt-9988c5af44003ec49a2a0747ae8f1b3a565642ac.tar.gz Qt-9988c5af44003ec49a2a0747ae8f1b3a565642ac.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui')
| -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)); |