diff options
| author | David Schulz <david.schulz@qt.io> | 2019-10-23 12:01:47 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2019-10-23 11:01:52 +0000 |
| commit | 608bbccc63169a698616057de2673d37d44dc866 (patch) | |
| tree | 7cfd56a2492b82a0abbec29fa32962d27f39796f /src/shared | |
| parent | 313d16bba4d56b257b14ac48aa4a5edb26b78636 (diff) | |
| download | qt-creator-608bbccc63169a698616057de2673d37d44dc866.tar.gz | |
Revert "Enable visibility settings for binaries" and fixup
Since we are currently not able to fix the build with all build system
and platform combinations
this partially reverts commit b128d498b2da55a9f87cd2eabb802acc0c48e7d4
and 6463a686f6b6530c005fe6b340152b331bca9600
Change-Id: Icfb9ab6096ad1204e595522be12146b91d570f49
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/qtcreator_gui_pch.h | 13 | ||||
| -rw-r--r-- | src/shared/qtcreator_pch.h | 50 |
2 files changed, 30 insertions, 33 deletions
diff --git a/src/shared/qtcreator_gui_pch.h b/src/shared/qtcreator_gui_pch.h index 9ac491898b..b25dbf67b7 100644 --- a/src/shared/qtcreator_gui_pch.h +++ b/src/shared/qtcreator_gui_pch.h @@ -32,7 +32,16 @@ #if defined __cplusplus -#include <QtGui> -#include <QtWidgets> +#include <QEvent> +#include <QTimer> +#include <QApplication> +#include <QBitmap> +#include <QCursor> +#include <QImage> +#include <QLayout> +#include <QPainter> +#include <QPixmap> +#include <QStyle> +#include <QWidget> #endif diff --git a/src/shared/qtcreator_pch.h b/src/shared/qtcreator_pch.h index a80eb42e7a..4988f3d939 100644 --- a/src/shared/qtcreator_pch.h +++ b/src/shared/qtcreator_pch.h @@ -29,38 +29,26 @@ */ #if defined __cplusplus -#include <QtCore/qsystemdetection.h> +#include <QtGlobal> -#ifdef Q_OS_WIN -#define WIN32_LEAN_AND_MEAN - -// lib/Utils needs defines for Windows 8 -#ifdef Q_CC_MINGW -#define WINVER _WIN32_WINNT_WIN8 -#define _WIN32_WINNT _WIN32_WINNT_WIN8 -#endif // Q_CC_MINGW -#define NOHELP -#include <qt_windows.h> - -#undef DELETE -#undef IN -#undef OUT -#undef ERROR -#undef ABSOLUTE - -//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 +#ifdef Q_WS_WIN +# define _POSIX_ +# include <limits.h> +# undef _POSIX_ #endif -#define _POSIX_ -#include <limits.h> -#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> @@ -71,7 +59,7 @@ using Qt::dec; using Qt::showbase; using Qt::hex; using Qt::noforcesign; -#endif //QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#endif #include <stdlib.h> -#endif //defined __cplusplus +#endif |