summaryrefslogtreecommitdiffstats
path: root/tools/assistant
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-11-29 22:58:27 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-11-29 22:58:27 (GMT)
commit1fe08312164a8eef87b3efe9b77452b86224999f (patch)
tree65d3147ae69860d9031ffaa86dcdd28f5d5fca21 /tools/assistant
parent10b5653ad4f25c6f37d640facf4a5ef01fe25926 (diff)
parentc2c31f30830a4e1e455a13321dd7bae6ac8b360f (diff)
downloadQt-1fe08312164a8eef87b3efe9b77452b86224999f.zip
Qt-1fe08312164a8eef87b3efe9b77452b86224999f.tar.gz
Qt-1fe08312164a8eef87b3efe9b77452b86224999f.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools/assistant')
-rw-r--r--tools/assistant/tools/assistant/centralwidget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp
index 6f6875f..7488662 100644
--- a/tools/assistant/tools/assistant/centralwidget.cpp
+++ b/tools/assistant/tools/assistant/centralwidget.cpp
@@ -223,6 +223,7 @@ CentralWidget::CentralWidget(QHelpEngine *engine, MainWindow *parent)
QString resourcePath = QLatin1String(":/trolltech/assistant/images/");
vboxLayout->setMargin(0);
+ tabWidget = new QTabWidget(this);
#ifndef Q_OS_MAC
resourcePath.append(QLatin1String("win"));
#else
@@ -230,7 +231,6 @@ CentralWidget::CentralWidget(QHelpEngine *engine, MainWindow *parent)
tabWidget->setDocumentMode(true);
#endif
- tabWidget = new QTabWidget(this);
connect(tabWidget, SIGNAL(currentChanged(int)), this,
SLOT(currentPageChanged(int)));