From b7cf8ee98cdabd0ff518c9ed4ff993d7c556c19b Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 27 Jul 2015 12:22:57 +0200 Subject: Fix Windows build. Due to an MSVC bug, you cannot use string concatenation inside a QStringLiteral. Change-Id: I956e9d4c54437c53edeb378150ba11f89e07fd99 Reviewed-by: Joerg Bornemann --- src/app/qbs-setup-toolchains/probe.cpp | 4 ++-- 1 file 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"))) -- cgit v1.2.1