diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-21 11:36:02 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-21 12:04:25 +0100 |
| commit | bab99ac39ad9de7f1c244006ccfd49852941ac26 (patch) | |
| tree | ebc89a823692e632cf775d1b01edb4ff307e851a /tests/auto/blackbox | |
| parent | ee7eb1f45529a16a4337c33fac82b205406ca1a0 (diff) | |
Allow the user to specify a custom place for settings.
Task-number: QBS-509
Change-Id: I4ad32c648121068880d652e3ba39d4eea59dfbc3
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/auto/blackbox')
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index b4364cddc..5b63eed65 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -178,7 +178,7 @@ void TestBlackbox::initTestCase() { QVERIFY(QFile::exists(qbsExecutableFilePath)); - SettingsPtr settings = qbsSettings(); + SettingsPtr settings = qbsSettings(QString()); if (!settings->profiles().contains(buildProfileName)) QFAIL(QByteArray("The build profile '" + buildProfileName.toLocal8Bit() + "' could not be found. Please set it up on your machine.")); @@ -1787,7 +1787,7 @@ private: void TestBlackbox::missingProfile() { - SettingsPtr settings = qbsSettings(); + SettingsPtr settings = qbsSettings(QString()); TemporaryDefaultProfileRemover dpr(settings); QVERIFY(settings->defaultProfile().isEmpty()); QDir::setCurrent(testDataDir + "/project_filepath_check"); @@ -1801,7 +1801,7 @@ void TestBlackbox::missingProfile() void TestBlackbox::testAssembly() { - SettingsPtr settings = qbsSettings(); + SettingsPtr settings = qbsSettings(QString()); Profile profile(buildProfileName, settings.data()); bool haveGcc = profile.value("qbs.toolchain").toStringList().contains("gcc"); QDir::setCurrent(testDataDir + "/assembly"); @@ -1844,7 +1844,7 @@ void TestBlackbox::testNsis() return; } - SettingsPtr settings = qbsSettings(); + SettingsPtr settings = qbsSettings(QString()); Profile profile(buildProfileName, settings.data()); bool targetIsWindows = profile.value("qbs.targetOS").toStringList().contains("windows"); QDir::setCurrent(testDataDir + "/nsis"); |