feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

make library defines more consistency

Browse Source 
Change-Id: I211d511667d5b9c8f518bfbe750aca4483baff62
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tim Jenssen
2016-12-12 14:23:52 +01:00
parent 1ff8b46d0a
commit 1898ba5ad3
29 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/qmljs/parser/qmljsglobal_p.h
View File

@@ -42,13 +42,13 @@
# define QT_QML_BEGIN_NAMESPACE
# define QT_QML_END_NAMESPACE
# ifdef QMLJS_BUILD_DIR
# ifdef QMLJS_LIBRARY
# define QML_PARSER_EXPORT Q_DECL_EXPORT
# elif QML_BUILD_STATIC_LIB
# define QML_PARSER_EXPORT
# else
# define QML_PARSER_EXPORT Q_DECL_IMPORT
# endif // QMLJS_BUILD_DIR
# endif // QMLJS_LIBRARY
#else // !QT_CREATOR
# define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/libs/qmljs/qmljs-lib.pri
View File

@@ -1,5 +1,5 @@
contains(CONFIG, dll) {
DEFINES += QMLJS_BUILD_DIR
DEFINES += QMLJS_LIBRARY
} else {
DEFINES += QML_BUILD_STATIC_LIB
}

2
src/libs/qmljs/qmljs.pro
View File

@@ -1,4 +1,4 @@
DEFINES += QMLJS_BUILD_DIR
DEFINES += QMLJS_LIBRARY
include(../../qtcreatorlibrary.pri)
include(qmljs-lib.pri)

2
src/libs/qmljs/qmljs.qbs
View File

@@ -6,7 +6,7 @@ Project {
QtcDevHeaders { }
QtcLibrary {
cpp.defines: base.concat(["QMLJS_BUILD_DIR"])
cpp.defines: base.concat(["QMLJS_LIBRARY"])
cpp.optimization: "fast"
Depends { name: "ExtensionSystem" }

2
src/libs/qmljs/qmljs_global.h
View File

@@ -27,7 +27,7 @@
#include <qglobal.h>
#if defined(QMLJS_BUILD_DIR)
#if defined(QMLJS_LIBRARY)
# define QMLJS_EXPORT Q_DECL_EXPORT
#elif defined(QML_BUILD_STATIC_LIB)
# define QMLJS_EXPORT