diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-11-22 12:40:15 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-11-22 12:40:15 +0100 |
| commit | d888dc98db2d3dd92f2decd1193cd15628ed1816 (patch) | |
| tree | 87479cd355d36f434eada69c4feb39667befaec3 /share/qbs | |
| parent | 146a9377c2cfb1ba26f6243509a4db40342be927 (diff) | |
| parent | e81fda6169fae5b4949e7f4ee75d1528b016d5e7 (diff) | |
| download | qbs-d888dc98db2d3dd92f2decd1193cd15628ed1816.tar.gz | |
Merge remote-tracking branch 'origin/1.1'
Conflicts:
src/lib/language/moduleloader.cpp
src/lib/language/tst_language.cpp
src/lib/language/tst_language.h
Change-Id: Iaaf4e015a234cdd9f51630ad218daec1b83b2a84
Diffstat (limited to 'share/qbs')
| -rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index 9bbb152c5..a1165f9ac 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -13,7 +13,7 @@ CppModule { property string toolchainPrefix property path toolchainInstallPath compilerName: 'g++' - linkerName: "g++" + linkerName: compilerName property string archiverName: 'ar' property path sysroot: qbs.sysroot property path platformPath |