diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-03-18 14:02:59 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-03-18 14:13:19 +0100 |
commit | 95d944fbfaca83986135dac04dec6fa7b7794053 (patch) | |
tree | 481d7c8a5719093bb969625f3fe5734164040227 /share | |
parent | 1ad6016e54fd529988da6ad2eedc3ec81e54b9aa (diff) |
move cpp.compilerName to the module's base item
Otherwise we get an error if we set cpp.compilerName and the inheriting
module does not know about it.
Change-Id: I328cb48ac002ec20cc6996ab5b99fed6215c5b49
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'share')
-rw-r--r-- | share/qbs/modules/cpp/CppModule.qbs | 1 | ||||
-rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs index 69c7950bd..8906ab777 100644 --- a/share/qbs/modules/cpp/CppModule.qbs +++ b/share/qbs/modules/cpp/CppModule.qbs @@ -24,6 +24,7 @@ Module { property pathList libraryPaths property pathList frameworkPaths property pathList systemFrameworkPaths + property string compilerName property string compilerPath property string staticLibraryPrefix property string dynamicLibraryPrefix diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index 61ecca573..130ca7a0a 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -9,7 +9,7 @@ CppModule { property var transitiveSOs property string toolchainPrefix property string toolchainInstallPath - property string compilerName: 'g++' + compilerName: 'g++' property string archiverName: 'ar' property string sysroot: qbs.sysroot |