From c585823afd68fcee4e1bc61ba87adefd8c7395b1 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 31 Jul 2014 14:17:46 +0200 Subject: Add missing comma to error message. Change-Id: I90b1b4dd35c6b2c625d11137e0f7d76d92641f72 Reviewed-by: Joerg Bornemann --- src/lib/corelib/language/projectresolver.cpp | 2 +- src/lib/corelib/language/tst_language.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index 92244f6a4..5da3e3f0c 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -231,7 +231,7 @@ void ProjectResolver::resolveProject(Item *item, ProjectContext *projectContext) if (!m_qbsVersion.isValid()) m_qbsVersion = qbsVersionFromString(QLatin1String(QBS_VERSION)); if (m_qbsVersion < minVersion) { - throw ErrorInfo(Tr::tr("The project requires at least qbs version %1 but " + throw ErrorInfo(Tr::tr("The project requires at least qbs version %1, but " "this is qbs version %2.").arg(minVersion.toString(), m_qbsVersion.toString())); } diff --git a/src/lib/corelib/language/tst_language.cpp b/src/lib/corelib/language/tst_language.cpp index e5fde813e..7f32a1de8 100644 --- a/src/lib/corelib/language/tst_language.cpp +++ b/src/lib/corelib/language/tst_language.cpp @@ -376,7 +376,7 @@ void TestLanguage::erroneousFiles_data() "at .*duplicate_sources_wildcards.qbs:4:12 " "and .*duplicate_sources_wildcards.qbs:6:16."; QTest::newRow("oldQbsVersion") - << "The project requires at least qbs version \\d+\\.\\d+.\\d+ " + << "The project requires at least qbs version \\d+\\.\\d+.\\d+, " "but this is qbs version " QBS_VERSION "."; QTest::newRow("wrongQbsVersionFormat") << "The value of Project.minimumQbsVersion is not a valid version string."; -- cgit v1.2.3