diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-11 11:12:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-11 11:12:18 +0200 |
| commit | 3480c2e0565eeb938fb6fb8ba1dad640fb0a0d12 (patch) | |
| tree | 47c6963467a3c20326adfebd3cc0c15063ef04ba /src/qml/parser | |
| parent | 90e7521313fc9e89d492d65f9ad0dca3c38e7225 (diff) | |
| parent | d438be92dd7068fef94ce98e1ec039fe0ef4f3b3 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Ib3d81ad33a6ba28d891da91271a64d5fcc4874e6
Diffstat (limited to 'src/qml/parser')
| -rw-r--r-- | src/qml/parser/qqmljsglobal_p.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/qml/parser/qqmljsglobal_p.h b/src/qml/parser/qqmljsglobal_p.h index 933c8f5202..0e195994b4 100644 --- a/src/qml/parser/qqmljsglobal_p.h +++ b/src/qml/parser/qqmljsglobal_p.h @@ -67,13 +67,17 @@ #else // !QT_CREATOR # define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE # define QT_QML_END_NAMESPACE QT_END_NAMESPACE -# if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) - // QmlDevTools is a static library -# define QML_PARSER_EXPORT -# elif defined(QT_BUILD_QML_LIB) -# define QML_PARSER_EXPORT Q_DECL_EXPORT +# ifndef QT_STATIC +# if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) + // QmlDevTools is a static library +# define QML_PARSER_EXPORT +# elif defined(QT_BUILD_QML_LIB) +# define QML_PARSER_EXPORT Q_DECL_EXPORT +# else +# define QML_PARSER_EXPORT Q_DECL_IMPORT +# endif # else -# define QML_PARSER_EXPORT Q_DECL_IMPORT +# define QML_PARSER_EXPORT # endif #endif // QT_CREATOR |