diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-27 14:01:43 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-04-27 14:01:43 +0000 |
| commit | b7a7ed7c31db1557b0d67a0d39f9261be6a5d51b (patch) | |
| tree | 67e77fee8343b8456a07d7158aaebd1441b10d59 /src/qml/jsruntime | |
| parent | 0757777f196647e04c6813f0347179437fdc4812 (diff) | |
| parent | c9728926a878a0e2301ee9d2bfb0ab23862d810b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4global_p.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h index c2a5e75a1f..3abda68ae6 100644 --- a/src/qml/jsruntime/qv4global_p.h +++ b/src/qml/jsruntime/qv4global_p.h @@ -51,10 +51,6 @@ // We mean it. // -#if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) -#define V4_BOOTSTRAP -#endif - #include <QtCore/qglobal.h> #include <QString> @@ -64,11 +60,11 @@ #define QML_NEARLY_ALWAYS_INLINE inline #endif -#ifdef V4_BOOTSTRAP -#include <private/qtqmldevtoolsglobal_p.h> -#else #include <qtqmlglobal.h> #include <private/qtqmlglobal_p.h> + +#ifdef QT_QML_BOOTSTRAPPED +#define V4_BOOTSTRAP #endif #if defined(Q_CC_MSVC) |