feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "Enable visibility settings for binaries" and fixup

Browse Source 
Since we are currently not able to fix the build with all build system
and platform combinations
this partially reverts commit b128d498b2
and 6463a686f6

Change-Id: Icfb9ab6096ad1204e595522be12146b91d570f49
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2019-10-23 12:01:47 +02:00
parent 313d16bba4
commit 608bbccc63
2 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/shared/qtcreator_gui_pch.h
View File

@@ -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

50
src/shared/qtcreator_pch.h
View File

@@ -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