diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-04-30 10:44:29 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-05-02 08:40:48 +0200 |
| commit | c3e1e6390edbc28e6e528f401eb4f3639661302b (patch) | |
| tree | 5c882bfe7fced9b357e80a6b56ccdc88de8a41c3 /src/qml/jsruntime/qv4global_p.h | |
| parent | 9709d04ba7787c853a1ddbeed0347eab27c0924f (diff) | |
| parent | 6a2febc680e163e56eb61d322d156dbf6fb07e0e (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I71275a2076c3d32ee2896571be882067320a2e9e
Diffstat (limited to 'src/qml/jsruntime/qv4global_p.h')
| -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 0665295287..8769519a59 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) |