diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-05-09 09:47:53 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-05-16 14:03:27 +0000 |
| commit | 025bdeb66284c1016fb79c8ec230890542408320 (patch) | |
| tree | 2e1d8b7f5332c6d107b178019367ebe495d5c618 /src/qml | |
| parent | 01ca4aa2d0de2f519ba7f1753894903dd1a3a712 (diff) | |
qmlcachegen: Fix MinGW developer build
MinGW was unable to link qmlcachegen due to missing symbols from the
autotest-exported class QV4::ExecutableAllocator.
Introduce a separate Q_QML_AUTOTEST_EXPORT macro that is defined
to empty when used by qmldevtools.
Change-Id: Ib7f8984dd7617fae05bb4e1e6cc1fae0745ac3bc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/jsruntime/qv4executableallocator_p.h | 2 | ||||
| -rw-r--r-- | src/qml/qtqmlglobal_p.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4executableallocator_p.h b/src/qml/jsruntime/qv4executableallocator_p.h index f13f70e01a..353a6eacff 100644 --- a/src/qml/jsruntime/qv4executableallocator_p.h +++ b/src/qml/jsruntime/qv4executableallocator_p.h @@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE namespace QV4 { -class Q_AUTOTEST_EXPORT ExecutableAllocator +class Q_QML_AUTOTEST_EXPORT ExecutableAllocator { public: struct ChunkOfPages; diff --git a/src/qml/qtqmlglobal_p.h b/src/qml/qtqmlglobal_p.h index e9834ffc4c..3314e73d19 100644 --- a/src/qml/qtqmlglobal_p.h +++ b/src/qml/qtqmlglobal_p.h @@ -57,4 +57,10 @@ #define Q_QML_PRIVATE_EXPORT Q_QML_EXPORT +#if !defined(QT_QMLDEVTOOLS_LIB) && !defined(QT_BUILD_QMLDEVTOOLS_LIB) +# define Q_QML_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT +#else +# define Q_QML_AUTOTEST_EXPORT +#endif + #endif // QTQMLGLOBAL_P_H |