diff options
| author | kh1 <karsten.heimrich@digia.com> | 2012-11-19 16:44:52 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2012-11-20 10:40:47 +0100 |
| commit | 311045065e4080ed24ef3c3811da9c9ea4711845 (patch) | |
| tree | 129b63f878e32b71b0089f2b16b4b81165ff3c52 /src/libs/installer/settings.cpp | |
| parent | c7d5718a6dedaa4bf97fe42f2e190dd9c7d6afb2 (diff) | |
Some changes to start compile with Qt5.
Change-Id: Ie6a3ba7b3c0b24fc292d0d7444ae920dfa866a54
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/libs/installer/settings.cpp')
| -rw-r--r-- | src/libs/installer/settings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index e222c06f0..368b73701 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -38,7 +38,7 @@ #include <QtCore/QFileInfo> #include <QtCore/QStringList> -#include <QtXml/QXmlStreamReader> +#include <QXmlStreamReader> using namespace QInstaller; @@ -289,9 +289,9 @@ QString Settings::background() const QString Settings::icon() const { const QString icon = d->makeAbsolutePath(d->m_data.value(scIcon).toString()); -#if defined(Q_WS_MAC) +#if defined(Q_OS_MAC) return icon + QLatin1String(".icns"); -#elif defined(Q_WS_WIN) +#elif defined(Q_OS_WIN) return icon + QLatin1String(".ico"); #endif return icon + QLatin1String(".png"); |