diff options
-rw-r--r-- | src/lib/corelib/corelib.pro | 1 | ||||
-rw-r--r-- | src/lib/corelib/corelib.qbs | 1 | ||||
-rw-r--r-- | src/lib/corelib/parser/qmljsglobal_p.h | 9 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/corelib/corelib.pro b/src/lib/corelib/corelib.pro index 8e53891fd..c0026f14b 100644 --- a/src/lib/corelib/corelib.pro +++ b/src/lib/corelib/corelib.pro @@ -13,7 +13,6 @@ qbs_enable_project_file_updates: QT += gui INCLUDEPATH += $$PWD CONFIG += depend_includepath -DEFINES += QT_CREATOR QML_BUILD_STATIC_LIB # needed for QmlJS DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index 8de80c8f4..439365d33 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -18,7 +18,6 @@ QbsLibrary { cpp.defines: base.concat([ 'QBS_RELATIVE_LIBEXEC_PATH="' + qbsbuildconfig.relativeLibexecPath + '"', "QBS_VERSION=\"" + version + "\"", - "QT_CREATOR", "QML_BUILD_STATIC_LIB", // needed for QmlJS ]).concat(projectFileUpdateDefines).concat(enableUnitTestsDefines) Properties { diff --git a/src/lib/corelib/parser/qmljsglobal_p.h b/src/lib/corelib/parser/qmljsglobal_p.h index 5a875c01a..c3d198ea5 100644 --- a/src/lib/corelib/parser/qmljsglobal_p.h +++ b/src/lib/corelib/parser/qmljsglobal_p.h @@ -41,6 +41,15 @@ #include <QtCore/qglobal.h> +// Force QML_PARSER_EXPORT to be always empty. +#ifndef QT_CREATOR +# define QT_CREATOR +#endif +#ifdef QML_BUILD_STATIC_LIB +# undef QML_BUILD_STATIC_LIB +#endif +#define QML_BUILD_STATIC_LIB 1 + #ifdef QT_CREATOR # ifdef QMLJS_BUILD_DIR # define QML_PARSER_EXPORT Q_DECL_EXPORT |