diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-05-27 14:10:31 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-05-27 14:27:45 +0200 |
| commit | 07691857cd7607e3f71eaa11c036172a8771584f (patch) | |
| tree | 3ad3b5a70120f48361a5709736f2e3a7756f2371 /src/app | |
| parent | 8819fab638f8b41a92f425088228d583a3f6d4df (diff) | |
| parent | 1cfa5ed52c2cdfaf0a0a6b12a1f41bce0a9a67e1 (diff) | |
Merge 1.5 into master.
Change-Id: I85f81532d88798d71cb88552dd150189d72829bd
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/qbs-setup-toolchains/probe.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp index e21d7148f..ce3e25d07 100644 --- a/src/app/qbs-setup-toolchains/probe.cpp +++ b/src/app/qbs-setup-toolchains/probe.cpp @@ -106,6 +106,8 @@ static QStringList toolchainTypeFromCompilerName(const QString &compilerName) << QLatin1String("mingw") << QLatin1String("gcc"))) if (compilerName.contains(type)) return canonicalToolchain(type); + if (compilerName == QLatin1String("g++")) + return canonicalToolchain(QLatin1String("gcc")); return QStringList(); } |