diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-27 12:22:57 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-27 12:01:07 +0000 |
| commit | b7cf8ee98cdabd0ff518c9ed4ff993d7c556c19b (patch) | |
| tree | 793485a44bf66be59453a010c503b2d25b4cab66 | |
| parent | 9372b73c7f55471dbc0346ada2253c5b4cebd58b (diff) | |
| download | qbs-b7cf8ee98cdabd0ff518c9ed4ff993d7c556c19b.tar.gz | |
Fix Windows build.
Due to an MSVC bug, you cannot use string concatenation
inside a QStringLiteral.
Change-Id: I956e9d4c54437c53edeb378150ba11f89e07fd99
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | src/app/qbs-setup-toolchains/probe.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp index 68d63d229..b20ab7229 100644 --- a/src/app/qbs-setup-toolchains/probe.cpp +++ b/src/app/qbs-setup-toolchains/probe.cpp @@ -133,10 +133,10 @@ static void setCommonProperties(Profile &profile, const QString &compilerFilePat const QString compilerName = QFileInfo(compilerFilePath).fileName(); if (!standardCompilerFileNames().contains(compilerName)) qWarning("%s", qPrintable( - QString(QStringLiteral("'%1' is not a standard compiler file name; " + QString::fromLatin1("'%1' is not a standard compiler file name; " "you must set the cpp.cCompilerName and " "cpp.cxxCompilerName properties of this profile " - "manually")).arg(compilerName))); + "manually").arg(compilerName))); if (toolchainTypes.contains(QStringLiteral("mingw"))) |