diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-04 13:02:41 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-04 13:02:41 (GMT) |
| commit | 94b595f37b3a49d44d1a795e5f2b003ac921d4b7 (patch) | |
| tree | 74009d7bd395e7bd39076875914c5f1353a30902 /tools/assistant | |
| parent | 3c3db55c205012de15bab758b3bb4857d132cb98 (diff) | |
| parent | 51c9b68425c1d3fe64a08e6ef0357fbd6bdd8f8a (diff) | |
| download | Qt-94b595f37b3a49d44d1a795e5f2b003ac921d4b7.zip Qt-94b595f37b3a49d44d1a795e5f2b003ac921d4b7.tar.gz Qt-94b595f37b3a49d44d1a795e5f2b003ac921d4b7.tar.bz2 | |
Merge commit '51c9b68' into 4.6
Conflicts:
dist/changes-4.6.0
src/gui/kernel/qevent.h
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")); |