summaryrefslogtreecommitdiffstats
path: root/tools/assistant
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-04 16:37:58 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-04 16:37:58 (GMT)
commitbc5ff9a1fc9982d8669324fde2103dd447486860 (patch)
treec6d2dec1e4a083e7128a3e6bd4fdb5be28290da6 /tools/assistant
parent9a88c8808f8e084e77ee22f907366250f3a0ad2a (diff)
parent56b8d24c337d30c6bcdda101fbc664c4fd6d642d (diff)
downloadQt-bc5ff9a1fc9982d8669324fde2103dd447486860.zip
Qt-bc5ff9a1fc9982d8669324fde2103dd447486860.tar.gz
Qt-bc5ff9a1fc9982d8669324fde2103dd447486860.tar.bz2
Merge remote branch 'mainline/4.6' 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 2722b2f..62b4736 100644
--- a/tools/assistant/tools/assistant/centralwidget.cpp
+++ b/tools/assistant/tools/assistant/centralwidget.cpp
@@ -222,8 +222,8 @@ CentralWidget::CentralWidget(QHelpEngine *engine, MainWindow *parent)
QVBoxLayout *vboxLayout = new QVBoxLayout(this);
QString resourcePath = QLatin1String(":/trolltech/assistant/images/");
-#ifndef Q_OS_MAC
vboxLayout->setMargin(0);
+#ifndef Q_OS_MAC
resourcePath.append(QLatin1String("win"));
#else
resourcePath.append(QLatin1String("mac"));