diff options
| author | kh1 <karsten.heimrich@digia.com> | 2014-01-07 13:27:38 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2014-01-07 14:19:30 +0100 |
| commit | b111112b372008a5370b2fd0361fbbc55df31b09 (patch) | |
| tree | ea00ff93cc1ba74bd3db00406f3964cc17d40391 /src/libs/installer/utils.cpp | |
| parent | 08701a6962aec6385daf6e00408ee877913e02c4 (diff) | |
Use qt_windows.h.
Fixes NOMINMAX and mingw missing _WIN32_WINNT define.
Change-Id: I28ea6f328b495033d484fa07181062dc92f0855f
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'src/libs/installer/utils.cpp')
| -rw-r--r-- | src/libs/installer/utils.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libs/installer/utils.cpp b/src/libs/installer/utils.cpp index 2b5491f62..469ba5980 100644 --- a/src/libs/installer/utils.cpp +++ b/src/libs/installer/utils.cpp @@ -47,7 +47,7 @@ #include <QtCore/QVector> #include <QCoreApplication> -#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) +#if defined(Q_OS_WIN) || defined(Q_OS_WINCE) # include "qt_windows.h" #endif @@ -55,10 +55,6 @@ #include <iostream> #include <sstream> - -#ifdef Q_OS_WIN -#include <windows.h> // for Sleep -#endif #ifdef Q_OS_UNIX #include <errno.h> #include <signal.h> |