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/packagemanagercore_p.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/packagemanagercore_p.cpp')
| -rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 561553fb4..4c12a3721 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -51,7 +51,7 @@ #include "kdupdaterupdateoperationfactory.h" #include "kdupdaterupdatefinder.h" -#include <QtCore/QtConcurrentRun> +#include <QtConcurrentRun> #include <QtCore/QCoreApplication> #include <QtCore/QDir> #include <QtCore/QDirIterator> @@ -59,8 +59,8 @@ #include <QtCore/QFutureWatcher> #include <QtCore/QTemporaryFile> -#include <QtXml/QXmlStreamReader> -#include <QtXml/QXmlStreamWriter> +#include <QXmlStreamReader> +#include <QXmlStreamWriter> #include <errno.h> @@ -966,7 +966,7 @@ void PackageManagerCorePrivate::writeUninstallerBinary(QFile *const input, qint6 appendData(&out, input, size); if (writeBinaryLayout) { -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC QDir resourcePath(QFileInfo(uninstallerRenamedName).dir()); if (!resourcePath.path().endsWith(QLatin1String("Contents/MacOS"))) throw Error(tr("Uninstaller is not a bundle")); |