diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-04 15:45:57 (GMT) |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-04 15:45:57 (GMT) |
commit | 56b8d24c337d30c6bcdda101fbc664c4fd6d642d (patch) | |
tree | ae1d621e9933d88e22f03e28dfea671a3a272ab1 /tools/assistant | |
parent | 4e5a1a77677540422cc69ec5c2b1341ca4b318f9 (diff) | |
parent | 05eeb454e0fcc83db330ee7df33a800a6998fc30 (diff) | |
download | Qt-56b8d24c337d30c6bcdda101fbc664c4fd6d642d.zip Qt-56b8d24c337d30c6bcdda101fbc664c4fd6d642d.tar.gz Qt-56b8d24c337d30c6bcdda101fbc664c4fd6d642d.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.cpp | 2 |
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")); |