summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2013-06-18 10:27:48 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2013-06-18 10:45:02 +0200
commitf2f5d60dafeeb7030b7155b7fa8437fc2dfe55f5 (patch)
tree4fba57981983ebbf0a41eb5b42f83b2e087b3014
parent43c69ee09c913a0ddbab7fe5f997b692d82108ca (diff)
downloadqbs-f2f5d60dafeeb7030b7155b7fa8437fc2dfe55f5.tar.gz
adjust tst_language to latest changes
SetupProjectParameters takes "flat" build configs now. This fixes the soft assert in the language test that was introduced in aa74bd71956464adc12249055f8f9e29fe3bd5ad. Change-Id: Idddf7eca9b5fbac06ae1e56bc1b7e1a93003e75f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
-rw-r--r--src/lib/language/tst_language.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/language/tst_language.cpp b/src/lib/language/tst_language.cpp
index 16e88e020..9e6157b0a 100644
--- a/src/lib/language/tst_language.cpp
+++ b/src/lib/language/tst_language.cpp
@@ -138,8 +138,8 @@ void TestLanguage::initTestCase()
loader->setSearchPaths(QStringList()
<< QLatin1String(SRCDIR "/../../share/qbs"));
QVariantMap buildConfig = defaultParameters.buildConfigurationTree();
- setConfigProperty(buildConfig, QStringList() << "qbs" << "targetOS", "linux");
- setConfigProperty(buildConfig, QStringList() << "qbs" << "profile", "qbs_autotests");
+ buildConfig.insert("qbs.targetOS", "linux");
+ buildConfig.insert("qbs.profile", "qbs_autotests");
defaultParameters.setBuildConfiguration(buildConfig);
QVERIFY(QFileInfo(m_wildcardsTestDirPath).isAbsolute());
}