diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2016-12-12 14:23:52 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2016-12-12 14:48:34 +0000 |
| commit | 1898ba5ad3eaddfa4a6f3a8fd0bf0966a6c7a90f (patch) | |
| tree | 4ca2fc77d44e5b61bfa1e3eb99825da956be732a /src/libs/languageutils | |
| parent | 1ff8b46d0aaaa6c07c30027153b4d180c8b5498f (diff) | |
| download | qt-creator-1898ba5ad3eaddfa4a6f3a8fd0bf0966a6c7a90f.tar.gz | |
make library defines more consistency
Change-Id: I211d511667d5b9c8f518bfbe750aca4483baff62
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/libs/languageutils')
| -rw-r--r-- | src/libs/languageutils/languageutils-lib.pri | 2 | ||||
| -rw-r--r-- | src/libs/languageutils/languageutils.qbs | 2 | ||||
| -rw-r--r-- | src/libs/languageutils/languageutils_global.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/languageutils/languageutils-lib.pri b/src/libs/languageutils/languageutils-lib.pri index aab3ac1bb4..de62667c5d 100644 --- a/src/libs/languageutils/languageutils-lib.pri +++ b/src/libs/languageutils/languageutils-lib.pri @@ -1,5 +1,5 @@ contains(CONFIG, dll) { - DEFINES += LANGUAGEUTILS_BUILD_DIR + DEFINES += LANGUAGEUTILS_LIBRARY } else { DEFINES += LANGUAGEUTILS_BUILD_STATIC_LIB } diff --git a/src/libs/languageutils/languageutils.qbs b/src/libs/languageutils/languageutils.qbs index e91491c17b..337547c58e 100644 --- a/src/libs/languageutils/languageutils.qbs +++ b/src/libs/languageutils/languageutils.qbs @@ -6,7 +6,7 @@ Project { QtcDevHeaders { } QtcLibrary { - cpp.defines: base.concat(["LANGUAGEUTILS_BUILD_DIR"]) + cpp.defines: base.concat(["LANGUAGEUTILS_LIBRARY"]) cpp.optimization: "fast" Depends { name: "Qt.core" } diff --git a/src/libs/languageutils/languageutils_global.h b/src/libs/languageutils/languageutils_global.h index 9de119ef98..ddcf53d494 100644 --- a/src/libs/languageutils/languageutils_global.h +++ b/src/libs/languageutils/languageutils_global.h @@ -27,7 +27,7 @@ #include <qglobal.h> -#if defined(LANGUAGEUTILS_BUILD_DIR) +#if defined(LANGUAGEUTILS_LIBRARY) # define LANGUAGEUTILS_EXPORT Q_DECL_EXPORT #elif defined(LANGUAGEUTILS_BUILD_STATIC_LIB) # define LANGUAGEUTILS_EXPORT |