diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-23 17:36:41 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-04-27 15:16:00 +0200 |
| commit | c9728926a878a0e2301ee9d2bfb0ab23862d810b (patch) | |
| tree | 4124d54365035011a7b46f80b45282a33099be7f /src/qml/qtqmlglobal_p.h | |
| parent | 93bc4113f06dce4c942374d765bef20054cd1f94 (diff) | |
| parent | 8d0d1b11e381130dec12f46b959c3107c3f47160 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/qtqmlglobal.h
src/qtqmlglobal_p.h
src/jsruntime/qv4global_p.h
src/qml/compiler/compiler.pri
src/qml/compiler/qv4ssa.cpp
src/qmldevtools/qtqmldevtoolsglobal_p.h
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Change-Id: I55c5d015b2cb1053b83b9c61caaf004fb49ee486
Diffstat (limited to 'src/qml/qtqmlglobal_p.h')
| -rw-r--r-- | src/qml/qtqmlglobal_p.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/qml/qtqmlglobal_p.h b/src/qml/qtqmlglobal_p.h index 026be5a703..6547274d09 100644 --- a/src/qml/qtqmlglobal_p.h +++ b/src/qml/qtqmlglobal_p.h @@ -63,7 +63,7 @@ Q_ALLOCA_DECLARE(type, name); \ Q_ALLOCA_ASSIGN(type, name, size) -#if QT_CONFIG(alloca) +#if defined(QT_BOOTSTRAPPED) || QT_CONFIG(alloca) #define Q_ALLOCA_DECLARE(type, name) \ type *name = 0 @@ -95,10 +95,6 @@ QT_END_NAMESPACE #endif -#if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) -# define Q_QML_PRIVATE_EXPORT -#else -# define Q_QML_PRIVATE_EXPORT Q_QML_EXPORT -#endif +#define Q_QML_PRIVATE_EXPORT Q_QML_EXPORT #endif // QTQMLGLOBAL_P_H |