summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-02-26 12:43:04 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-02-26 12:45:35 (GMT)
commitd04107dd30c4af09eb879113f2a48839f8938bcf (patch)
treea381996a6d78f1fe27e8557c5df9c12af7f503de
parent724fccdb1480e51df62ce7c810ec369608cc4803 (diff)
downloadQt-d04107dd30c4af09eb879113f2a48839f8938bcf.zip
Qt-d04107dd30c4af09eb879113f2a48839f8938bcf.tar.gz
Qt-d04107dd30c4af09eb879113f2a48839f8938bcf.tar.bz2
QMainWindow would show hidden QDockwidget when calling rstoreDockWidget
Task-number: QTBUG-7785 Reviewed-by: ogoffart
-rw-r--r--src/gui/widgets/qdockarealayout.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/widgets/qdockarealayout.cpp b/src/gui/widgets/qdockarealayout.cpp
index 2b8cf59..c1b1ea3 100644
--- a/src/gui/widgets/qdockarealayout.cpp
+++ b/src/gui/widgets/qdockarealayout.cpp
@@ -2993,8 +2993,7 @@ bool QDockAreaLayout::restoreDockWidget(QDockWidget *dockWidget)
QRect r = constrainedRect(placeHolder->topLevelRect, desktop.screenGeometry(dockWidget));
dockWidget->d_func()->setWindowState(true, true, r);
}
- dockWidget->show();
-// dockWidget->setVisible(!placeHolder->hidden);
+ dockWidget->setVisible(!placeHolder->hidden);
#ifdef Q_WS_X11
if (placeHolder->window) // gets rid of the X11BypassWindowManager window flag
dockWidget->d_func()->setWindowState(true);