diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:44:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:44:51 +0200 |
| commit | b78372c4ba31da2d941d70ba23a927deae7d830c (patch) | |
| tree | 25d9eeefbbb4c6ace084c56e58ac7bd1927217b5 /src/qml/jsruntime/qv4global_p.h | |
| parent | 9990c0f577f6a6a67ccebffb56ad1afc7a98ed1d (diff) | |
| parent | 7ea1f75fd877f312d70a90ab0405f3ca03914171 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I996a85744753598bb48c7e0d7954049202f4f037
Diffstat (limited to 'src/qml/jsruntime/qv4global_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4global_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h index 91c5d03f18..a00231c3a1 100644 --- a/src/qml/jsruntime/qv4global_p.h +++ b/src/qml/jsruntime/qv4global_p.h @@ -45,6 +45,7 @@ #include <QtCore/qglobal.h> #include <QString> #include <qtqmlglobal.h> +#include <private/qtqmlglobal_p.h> #if defined(Q_CC_MSVC) #include <float.h> @@ -66,6 +67,10 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } #define qOffsetOf(s, m) ((size_t)((((char *)&(((s *)64)->m)) - 64))) +#if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) +#define V4_BOOTSTRAP +#endif + // Decide whether to enable or disable the JIT // White list architectures |