diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-04-01 09:37:08 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-04-01 21:46:08 +0200 |
| commit | 95288a6a7ba9c359bde8df986eb829080756ac9a (patch) | |
| tree | 0183510484f2a80218349618c673d0f7a3711d00 /src/qml/parser | |
| parent | eb5aa8d9c18535ecd0aacc42fe3af954faf01c04 (diff) | |
Remove QT_CREATOR special cases
Always parse typeinfo entries from qmldir files, and export QQmlJS the
Qt way.
Change-Id: I3a87a8d0a9ed1014628df6eb906bde5ea23e5d9f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/parser')
| -rw-r--r-- | src/qml/parser/qqmljsglobal_p.h | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/src/qml/parser/qqmljsglobal_p.h b/src/qml/parser/qqmljsglobal_p.h index bf8155c6ec..e7937ebc3b 100644 --- a/src/qml/parser/qqmljsglobal_p.h +++ b/src/qml/parser/qqmljsglobal_p.h @@ -52,29 +52,17 @@ #include <QtCore/qglobal.h> -#ifdef QT_CREATOR - -# ifdef QDECLARATIVEJS_BUILD_DIR -# define QML_PARSER_EXPORT Q_DECL_EXPORT -# elif QML_BUILD_STATIC_LIB +#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 // QQMLJS_BUILD_DIR - -#else // !QT_CREATOR -# 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 # endif -#endif // QT_CREATOR +#else +# define QML_PARSER_EXPORT +#endif #endif // QQMLJSGLOBAL_P_H |