diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2019-10-23 09:26:31 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2019-10-31 11:45:20 +0000 |
| commit | 6c25049019a4c83713621e91f6f175b03f32c369 (patch) | |
| tree | 9eeb9d3eb2cd8910884c0fd28c6629e3f374eafe /src/shared | |
| parent | 479def8190b51025f7788da1dd8e6ec60df2e975 (diff) | |
| download | qt-creator-6c25049019a4c83713621e91f6f175b03f32c369.tar.gz | |
Windows: Remove explicit usage of _WIN32_WINNT and WINVER macros
The are set in a central place, in the precompile header file.
Or as DEFAULT_DEFINES when the precompile header file is not used.
Change-Id: Ie020f916b64eabcd5a8153f4be5474986f5afed5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/qtcreator_pch.h | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/src/shared/qtcreator_pch.h b/src/shared/qtcreator_pch.h index 4988f3d939..a7e1493b4d 100644 --- a/src/shared/qtcreator_pch.h +++ b/src/shared/qtcreator_pch.h @@ -31,24 +31,31 @@ #if defined __cplusplus #include <QtGlobal> -#ifdef Q_WS_WIN -# define _POSIX_ -# include <limits.h> -# undef _POSIX_ -#endif +#ifdef Q_OS_WIN +#undef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN + +// lib/Utils needs defines for Windows 8 +#undef WINVER +#define WINVER 0x0602 +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0602 + +#define NOHELP +#include <qt_windows.h> + +#undef DELETE +#undef IN +#undef OUT +#undef ERROR +#undef ABSOLUTE + +#define _POSIX_ +#include <limits.h> +#undef _POSIX_ +#endif // Q_OS_WIN -#include <QCoreApplication> -#include <QList> -#include <QVariant> -#include <QObject> -#include <QRegExp> -#include <QString> -#include <QStringList> -#include <QTextCodec> -#include <QPointer> -#include <QScopedPointer> -#include <QSharedPointer> -#include <QDebug> +#include <QtCore> #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #include <QTextStream> |