aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakumi Asaki <asaki@sra.co.jp>2014-04-10 09:36:53 +0900
committerJoerg Bornemann <joerg.bornemann@digia.com>2014-06-02 15:36:01 +0200
commitb81bfaea5fff453955bed795e6786f91198c2bbb (patch)
tree67346e933498e41b34462079d0f7fd79214f3288
parentb300372f7e6bb106e8b77adebaa40bfbfebebd3a (diff)
Fix messages.
Change-Id: Ie06e48637ea0bb10e2383f75c6a33488c275a29a Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--src/app/qbs-setup-toolchains/probe.cpp4
-rw-r--r--src/lib/qtprofilesetup/qtprofilesetup.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp
index 63793dc63..185e0201a 100644
--- a/src/app/qbs-setup-toolchains/probe.cpp
+++ b/src/app/qbs-setup-toolchains/probe.cpp
@@ -163,8 +163,8 @@ static Profile createGccProfile(const QString &_compilerFilePath, Settings *sett
throw qbs::ErrorInfo(Tr::tr("Detected gcc platform '%1' is not supported.")
.arg(machineName));
} else if (compilerTriplet.count() < 2) {
- throw qbs::ErrorInfo(Tr::tr("Architecture '%1' of compiler at '%1' not understood.")
- .arg(compilerFilePath, machineName));
+ throw qbs::ErrorInfo(Tr::tr("Architecture of compiler for platform '%1' at '%2' not understood.")
+ .arg(machineName, compilerFilePath));
}
Profile profile(!profileName.isEmpty() ? profileName : machineName, settings);
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp
index fda3c7b7b..104311fe0 100644
--- a/src/lib/qtprofilesetup/qtprofilesetup.cpp
+++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp
@@ -260,7 +260,7 @@ static void createModules(Profile &profile, Settings *settings,
QFile priFile(dit.filePath());
if (!priFile.open(QIODevice::ReadOnly)) {
throw ErrorInfo(Internal::Tr::tr("Setting up Qt profile '%1' failed: Cannot open "
- "file '%1' (%2).").arg(priFile.fileName(), priFile.errorString()));
+ "file '%2' (%3).").arg(profile.name(), priFile.fileName(), priFile.errorString()));
}
const QByteArray priFileContents = priFile.readAll();
foreach (const QByteArray &line, priFileContents.split('\n')) {