summaryrefslogtreecommitdiffstats
path: root/tools/assistant
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@nokia.com>2011-01-07 10:56:33 (GMT)
committerChristian Kandeler <christian.kandeler@nokia.com>2011-01-07 13:04:53 (GMT)
commitdc11a951d30ce1c668550ab5e7b487f00cca7f1a (patch)
tree12a2c68b49a8d76db226174cd42b8a614443ceb7 /tools/assistant
parent606294044df3cf318bd6bb6f2e73389d84e3a032 (diff)
downloadQt-dc11a951d30ce1c668550ab5e7b487f00cca7f1a.zip
Qt-dc11a951d30ce1c668550ab5e7b487f00cca7f1a.tar.gz
Qt-dc11a951d30ce1c668550ab5e7b487f00cca7f1a.tar.bz2
Assistant: Don't tabify "Open Pages" dock widget by default.
The user is likely to always want to see it plus one of the others.
Diffstat (limited to 'tools/assistant')
-rw-r--r--tools/assistant/tools/assistant/mainwindow.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp
index d7d01da..d6b9e24 100644
--- a/tools/assistant/tools/assistant/mainwindow.cpp
+++ b/tools/assistant/tools/assistant/mainwindow.cpp
@@ -106,7 +106,7 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent)
TRACE_OBJ
setToolButtonStyle(Qt::ToolButtonFollowStyle);
- setDockOptions(ForceTabbedDocks); // Has no effect; Qt bug?
+ setDockOptions(dockOptions() | AllowNestedDocks);
QString collectionFile;
if (usesDefaultCollection()) {
@@ -218,8 +218,7 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent)
} else {
tabifyDockWidget(contentDock, indexDock);
tabifyDockWidget(indexDock, bookmarkDock);
- tabifyDockWidget(bookmarkDock, openPagesDock);
- tabifyDockWidget(openPagesDock, searchDock);
+ tabifyDockWidget(bookmarkDock, searchDock);
contentDock->raise();
const QRect screen = QApplication::desktop()->screenGeometry();
resize(4*screen.width()/5, 4*screen.height()/5);