diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2014-05-26 10:44:18 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-26 18:15:11 +0200 |
commit | 0f0d90485e591eb74e3f5b773e849aadba480088 (patch) | |
tree | fcf29ff8207a1b2951c3a58091dde67016a8f097 /src/lib/corelib/language | |
parent | 875f9ba4e7631a3c66e1edfc54f6b4ed6a42b841 (diff) |
Add the settings directory to the project setup parameters.
This way, the settings become available for use in the qbs library,
which means it can, for instance, expand the build configuration itself
instead of putting this burden onto the API callers.
Change-Id: I09e6067990ac2b7c2238951f9759fe52dc51b6f9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/corelib/language')
-rw-r--r-- | src/lib/corelib/language/tst_language.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/corelib/language/tst_language.cpp b/src/lib/corelib/language/tst_language.cpp index 56876bb32..422d77a2f 100644 --- a/src/lib/corelib/language/tst_language.cpp +++ b/src/lib/corelib/language/tst_language.cpp @@ -143,8 +143,7 @@ void TestLanguage::initTestCase() << QLatin1String(SRCDIR "/../../../share/qbs")); defaultParameters.setTopLevelProfile("qbs_autotests"); defaultParameters.setBuildVariant("debug"); - Settings settings((QString())); - defaultParameters.expandBuildConfiguration(&settings); + defaultParameters.expandBuildConfiguration(); QVERIFY(QFileInfo(m_wildcardsTestDirPath).isAbsolute()); } @@ -821,8 +820,7 @@ void TestLanguage::jsImportUsedInMultipleScopes() SetupProjectParameters params = defaultParameters; params.setProjectFilePath(testProject("jsimportsinmultiplescopes.qbs")); params.setBuildVariant(buildVariant); - Settings settings((QString())); - params.expandBuildConfiguration(&settings); + params.expandBuildConfiguration(); TopLevelProjectPtr project = loader->loadProject(params); QVERIFY(project); QHash<QString, ResolvedProductPtr> products = productsFromProject(project); @@ -1042,7 +1040,7 @@ void TestLanguage::profileValuesAndOverriddenValues() overriddenValues.insert("dummy.cFlags", "OVERRIDDEN"); parameters.setOverriddenValues(overriddenValues); parameters.setProjectFilePath(testProject("profilevaluesandoverriddenvalues.qbs")); - parameters.expandBuildConfiguration(&settings); + parameters.expandBuildConfiguration(); project = loader->loadProject(parameters); QVERIFY(project); QHash<QString, ResolvedProductPtr> products = productsFromProject(project); |