diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2019-11-01 09:35:22 +0000 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2019-11-01 12:38:46 +0000 |
| commit | c92c255d1043f11478a61c1caae4069e7ef47114 (patch) | |
| tree | bf5e1d725bdcee7da9b4b3957754399f0f5c9ae3 /src | |
| parent | 6908ecc0842a34e243052d957cf98ab3861353aa (diff) | |
| download | qt-creator-c92c255d1043f11478a61c1caae4069e7ef47114.tar.gz | |
Revert "Build fix: Visual Studio 2017 (and earlier)"
This reverts commit 953b01846224625cda38b01527a1e54760a189bd.
Reason for revert: breaks CI
Change-Id: Ia06a1475f31a0aa9bddb24e85d5144f6ffe6c633
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/shared/qtcreator_pch.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/shared/qtcreator_pch.h b/src/shared/qtcreator_pch.h index a55a38365f..bd6ba76506 100644 --- a/src/shared/qtcreator_pch.h +++ b/src/shared/qtcreator_pch.h @@ -35,17 +35,6 @@ #undef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN -//QT_NO_FLOAT16_OPERATORS is used on Visual Studio 2017 (and earlier): -//when including <QFloat16> and <bitset> in the same translation unit, -//it would cause a compilation error due to a toolchain bug (see [QTBUG-72073]) -#if _MSC_VER <= 1920 -#define QT_NO_FLOAT16_OPERATORS -#if QT_VERSION < QT_VERSION_CHECK(5, 12, 4) -//https://doc.qt.io/qt-5/qfloat16.html#QT_NO_FLOAT16_OPERATORS -#error QT_NO_FLOAT16_OPERATORS requires Qt 5.12.4 -#endif -#endif - // lib/Utils needs defines for Windows 8 #undef WINVER #define WINVER 0x0602 @@ -66,7 +55,18 @@ #undef _POSIX_ #endif // Q_OS_WIN -#include <QtCore> +#include <QCoreApplication> +#include <QList> +#include <QVariant> +#include <QObject> +#include <QRegExp> +#include <QString> +#include <QStringList> +#include <QTextCodec> +#include <QPointer> +#include <QScopedPointer> +#include <QSharedPointer> +#include <QDebug> #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #include <QTextStream> |