diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-27 20:16:05 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-02 12:20:37 +0200 |
| commit | c61210089fa3da9e4b40a2dbcb33e0ed814edd89 (patch) | |
| tree | b74e666852d4ae0cd810853c527cacda50b4294e /src/libs/languageutils | |
| parent | 629e05ea1b9548367b64e7649f8ae501d2ce24d3 (diff) | |
| download | qt-creator-c61210089fa3da9e4b40a2dbcb33e0ed814edd89.tar.gz | |
define QT_CREATOR centrally
numerous "3rdparty" libraries have respective #ifdefs, and consequently
the define is added in several places. it's quite a mess with the .pr?
and .qbs files, though. solve the problem by sidestepping it.
Change-Id: I5a6b1ba7cfe96b44f0a4f4ef9738900906a44316
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/libs/languageutils')
| -rw-r--r-- | src/libs/languageutils/languageutils.pri | 1 | ||||
| -rw-r--r-- | src/libs/languageutils/languageutils.pro | 1 | ||||
| -rw-r--r-- | src/libs/languageutils/languageutils.qbs | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/src/libs/languageutils/languageutils.pri b/src/libs/languageutils/languageutils.pri index 776658faf1..9709183d85 100644 --- a/src/libs/languageutils/languageutils.pri +++ b/src/libs/languageutils/languageutils.pri @@ -1,2 +1 @@ LIBS *= -l$$qtLibraryName(LanguageUtils) -DEFINES *= QT_CREATOR diff --git a/src/libs/languageutils/languageutils.pro b/src/libs/languageutils/languageutils.pro index 8cc7fff372..b1d7649aaa 100644 --- a/src/libs/languageutils/languageutils.pro +++ b/src/libs/languageutils/languageutils.pro @@ -1,6 +1,5 @@ TEMPLATE = lib TARGET = LanguageUtils -DEFINES += QT_CREATOR unix:QMAKE_CXXFLAGS_DEBUG += -O3 diff --git a/src/libs/languageutils/languageutils.qbs b/src/libs/languageutils/languageutils.qbs index 811c4a9609..51926067c2 100644 --- a/src/libs/languageutils/languageutils.qbs +++ b/src/libs/languageutils/languageutils.qbs @@ -6,7 +6,6 @@ QtcLibrary { cpp.includePaths: base.concat("../3rdparty/cplusplus") cpp.defines: base.concat([ - "QT_CREATOR", "LANGUAGEUTILS_BUILD_DIR" ]) cpp.optimization: "fast" |