From 9b925ffec2ca3e87893e5699cc8d48132c5af517 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 8 Jul 2014 12:28:55 +0200 Subject: remove qbsSettings() function Don't use a special Settings shared pointer. This simplifies the code a lot. Change-Id: I974cf9634d1760633744b1ed3cc18a9458ae2caf Reviewed-by: Christian Kandeler --- tests/auto/api/tst_api.cpp | 13 ++++++------- tests/auto/blackbox/tst_blackbox.cpp | 31 ++++++++++++++++--------------- tests/auto/tools/tst_tools.cpp | 6 +++--- 3 files changed, 25 insertions(+), 25 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index 2040a14f9..73e9bb1b6 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -29,8 +29,6 @@ #include "tst_api.h" -#include "../../../src/app/shared/qbssettings.h" - #include #include #include @@ -41,6 +39,7 @@ #include #include #include +#include #include #include @@ -596,11 +595,11 @@ void TestApi::multiArch() const QString topLevelProjectFile = projectDir + QLatin1String("/project.qbs"); setupParams.setBuildRoot(projectDir); setupParams.setProjectFilePath(topLevelProjectFile); - SettingsPtr settings = qbsSettings(QString()); - qbs::Internal::TemporaryProfile tph("host", settings.data()); + qbs::Settings settings((QString())); + qbs::Internal::TemporaryProfile tph("host", &settings); qbs::Profile hostProfile = tph.p; hostProfile.setValue("qbs.architecture", "host-arch"); - qbs::Internal::TemporaryProfile tpt("target", settings.data()); + qbs::Internal::TemporaryProfile tpt("target", &settings); qbs::Profile targetProfile = tpt.p; targetProfile.setValue("qbs.architecture", "target-arch"); QVariantMap overriddenValues; @@ -717,9 +716,9 @@ qbs::SetupProjectParameters TestApi::defaultSetupParameters() const const QString qbsRootPath = QDir::cleanPath(QCoreApplication::applicationDirPath() + QLatin1String("/../")); - SettingsPtr settings = qbsSettings(QString()); + qbs::Settings settings((QString())); const QString profileName = QLatin1String("qbs_autotests"); - const qbs::Preferences prefs(settings.data(), profileName); + const qbs::Preferences prefs(&settings, profileName); setupParams.setSearchPaths(prefs.searchPaths(qbsRootPath)); setupParams.setPluginPaths(prefs.pluginPaths(qbsRootPath + QLatin1String("/lib"))); setupParams.setTopLevelProfile(profileName); diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index feba580d9..e4ae5537f 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -31,11 +31,11 @@ #include "../skip.h" -#include #include #include #include #include +#include #include #include @@ -47,6 +47,7 @@ using qbs::InstallOptions; using qbs::Internal::HostOsInfo; using qbs::Internal::removeDirectoryWithContents; using qbs::Profile; +using qbs::Settings; static bool regularFileExists(const QString &filePath) { @@ -190,12 +191,12 @@ void TestBlackbox::initTestCase() { QVERIFY(regularFileExists(qbsExecutableFilePath)); - SettingsPtr settings = qbsSettings(QString()); - if (!settings->profiles().contains(buildProfileName)) + Settings settings((QString())); + if (!settings.profiles().contains(buildProfileName)) QFAIL(QByteArray("The build profile '" + buildProfileName.toLocal8Bit() + "' could not be found. Please set it up on your machine.")); - Profile buildProfile(buildProfileName, settings.data()); + Profile buildProfile(buildProfileName, &settings); QVariant qtBinPath = buildProfile.value(QLatin1String("Qt.core.binPath")); if (!qtBinPath.isValid()) QFAIL(QByteArray("The build profile '" + buildProfileName.toLocal8Bit() + @@ -1997,7 +1998,7 @@ void TestBlackbox::checkProjectFilePath() class TemporaryDefaultProfileRemover { public: - TemporaryDefaultProfileRemover(const SettingsPtr &settings) + TemporaryDefaultProfileRemover(Settings *settings) : m_settings(settings), m_defaultProfile(settings->defaultProfile()) { m_settings->remove(QLatin1String("defaultProfile")); @@ -2010,15 +2011,15 @@ public: } private: - SettingsPtr m_settings; + Settings *m_settings; const QString m_defaultProfile; }; void TestBlackbox::missingProfile() { - SettingsPtr settings = qbsSettings(QString()); - TemporaryDefaultProfileRemover dpr(settings); - QVERIFY(settings->defaultProfile().isEmpty()); + Settings settings((QString())); + TemporaryDefaultProfileRemover dpr(&settings); + QVERIFY(settings.defaultProfile().isEmpty()); QDir::setCurrent(testDataDir + "/project_filepath_check"); QbsRunParameters params; params.arguments = QStringList("-f") << "project1.qbs"; @@ -2030,8 +2031,8 @@ void TestBlackbox::missingProfile() void TestBlackbox::testAssembly() { - SettingsPtr settings = qbsSettings(QString()); - Profile profile(buildProfileName, settings.data()); + Settings settings((QString())); + Profile profile(buildProfileName, &settings); bool haveGcc = profile.value("qbs.toolchain").toStringList().contains("gcc"); QDir::setCurrent(testDataDir + "/assembly"); QVERIFY(runQbs() == 0); @@ -2073,8 +2074,8 @@ void TestBlackbox::testNsis() return; } - SettingsPtr settings = qbsSettings(QString()); - Profile profile(buildProfileName, settings.data()); + Settings settings((QString())); + Profile profile(buildProfileName, &settings); bool targetIsWindows = profile.value("qbs.targetOS").toStringList().contains("windows"); QDir::setCurrent(testDataDir + "/nsis"); QVERIFY(runQbs() == 0); @@ -2144,8 +2145,8 @@ void TestBlackbox::testWiX() return; } - SettingsPtr settings = qbsSettings(QString()); - Profile profile(buildProfileName, settings.data()); + Settings settings((QString())); + Profile profile(buildProfileName, &settings); const QByteArray arch = profile.value("qbs.architecture").toString().toLatin1(); QDir::setCurrent(testDataDir + "/wix"); diff --git a/tests/auto/tools/tst_tools.cpp b/tests/auto/tools/tst_tools.cpp index 7a1f8fd77..9323f4847 100644 --- a/tests/auto/tools/tst_tools.cpp +++ b/tests/auto/tools/tst_tools.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include +#include #include #include @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) { QCoreApplication app(argc, argv); - SettingsPtr settings = qbsSettings(QString()); - qbs::Internal::TestTools tt(settings.data()); + qbs::Settings settings((QString())); + qbs::Internal::TestTools tt(&settings); return QTest::qExec(&tt, argc, argv); } -- cgit v1.2.3