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/qmldebug | |
| parent | 1ff8b46d0aaaa6c07c30027153b4d180c8b5498f (diff) | |
make library defines more consistency
Change-Id: I211d511667d5b9c8f518bfbe750aca4483baff62
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/libs/qmldebug')
| -rw-r--r-- | src/libs/qmldebug/qmldebug-lib.pri | 2 | ||||
| -rw-r--r-- | src/libs/qmldebug/qmldebug.qbs | 2 | ||||
| -rw-r--r-- | src/libs/qmldebug/qmldebug_global.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/qmldebug/qmldebug-lib.pri b/src/libs/qmldebug/qmldebug-lib.pri index e9630852ba..6c1e77451a 100644 --- a/src/libs/qmldebug/qmldebug-lib.pri +++ b/src/libs/qmldebug/qmldebug-lib.pri @@ -1,5 +1,5 @@ contains(CONFIG, dll) { - DEFINES += QMLDEBUG_LIB + DEFINES += QMLDEBUG_LIBRARY } else { DEFINES += QMLDEBUG_STATIC_LIB } diff --git a/src/libs/qmldebug/qmldebug.qbs b/src/libs/qmldebug/qmldebug.qbs index f47d2c66b2..b681e54579 100644 --- a/src/libs/qmldebug/qmldebug.qbs +++ b/src/libs/qmldebug/qmldebug.qbs @@ -6,7 +6,7 @@ Project { QtcDevHeaders { } QtcLibrary { - cpp.defines: base.concat("QMLDEBUG_LIB") + cpp.defines: base.concat("QMLDEBUG_LIBRARY") Depends { name: "Qt"; submodules: ["gui", "network"] } Depends { name: "Utils" } diff --git a/src/libs/qmldebug/qmldebug_global.h b/src/libs/qmldebug/qmldebug_global.h index 3f6bc8ee30..16199d9f68 100644 --- a/src/libs/qmldebug/qmldebug_global.h +++ b/src/libs/qmldebug/qmldebug_global.h @@ -25,7 +25,7 @@ #pragma once -#if defined(QMLDEBUG_LIB) +#if defined(QMLDEBUG_LIBRARY) # define QMLDEBUG_EXPORT Q_DECL_EXPORT #elif defined(QMLDEBUG_STATIC_LIB) # define QMLDEBUG_EXPORT |