diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-27 00:54:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-27 00:54:17 (GMT) |
| commit | 055fe95fedfe37df8a44291ac362afec9779dd95 (patch) | |
| tree | ac48d4b0bc8f8290765e8d17513f3fc9f4b38ae5 /src/gui | |
| parent | ca82ee4ee55e52c75326949148455af1095df014 (diff) | |
| parent | d04107dd30c4af09eb879113f2a48839f8938bcf (diff) | |
| download | Qt-055fe95fedfe37df8a44291ac362afec9779dd95.zip Qt-055fe95fedfe37df8a44291ac362afec9779dd95.tar.gz Qt-055fe95fedfe37df8a44291ac362afec9779dd95.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QMainWindow would show hidden QDockwidget when calling rstoreDockWidget
Compile on WinCE
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/qdockarealayout.cpp | 3 |
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); |