diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-09 16:39:32 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-16 10:27:07 +0000 |
| commit | 6767fcfaf234bc3e0f92f156fa68266d0aac7d4a (patch) | |
| tree | 760b539969d20ba53210ec592946756d5c5a5f17 /src/qml/jsruntime/qv4global_p.h | |
| parent | 20927cbc98cf6bda8dab9ab5f3753f59855752bc (diff) | |
Fix usage of QtQmlDevTools private headers on OSX with framework builds
Previously this module borrowed its private headers from QtQml, so that
when writing QT += qmldevtools-private, you'd get the private headers from
QtQml. This doesn't work when QtQml is built as a framework.
A cleaner solution is to give this module its headers proper by letting
syncqt create the forwarding headers correctly (and consequently also
include them in make install). In order for this to work, the included
headers themselves cannot include any headers from QtQml, which this
patch also takes care of, through a centralized inclusion of qv4global_p.h.
Change-Id: I9bb8337956a2774cfaca6b338369face6c6ee785
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'src/qml/jsruntime/qv4global_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4global_p.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h index 9769940a77..a79f71ff64 100644 --- a/src/qml/jsruntime/qv4global_p.h +++ b/src/qml/jsruntime/qv4global_p.h @@ -34,10 +34,19 @@ #ifndef QV4GLOBAL_H #define QV4GLOBAL_H +#if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) +#define V4_BOOTSTRAP +#endif + #include <QtCore/qglobal.h> #include <QString> + +#ifdef V4_BOOTSTRAP +#include <private/qtqmldevtoolsglobal_p.h> +#else #include <qtqmlglobal.h> #include <private/qtqmlglobal_p.h> +#endif #if defined(Q_CC_MSVC) #include <float.h> @@ -59,10 +68,6 @@ 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 |