diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-11 13:36:42 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-11 13:37:52 +0200 |
commit | 4c6032ea69a607f1126e9746f9b16b4bd01b852f (patch) | |
tree | 2084987690561a4238f968465b8c21d85881d9c9 /src/qml/parser | |
parent | 37da30b83021869b2fd069ea49d72d89b16c2046 (diff) | |
parent | 3480c2e0565eeb938fb6fb8ba1dad640fb0a0d12 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I95914046889022e0ef9bdc17338dc5895c5223fe
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 |