aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/app/config-ui/settingsmodel.cpp7
-rw-r--r--src/app/config/configmain.cpp7
-rw-r--r--src/app/qbs-qmltypes/qbs-qmltypes.pro2
-rw-r--r--src/app/qbs-qmltypes/qbs-qmltypes.qbs1
-rw-r--r--src/app/qbs-setup-qt/main.cpp8
-rw-r--r--src/app/qbs-setup-qt/qbs-setup-qt.pro3
-rw-r--r--src/app/qbs-setup-qt/qbs-setup-qt.qbs1
-rw-r--r--src/app/qbs-setup-toolchains/main.cpp9
-rw-r--r--src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro1
-rw-r--r--src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs1
-rw-r--r--src/app/qbs/main.cpp7
-rw-r--r--src/app/qbs/qbs.pro3
-rw-r--r--src/app/qbs/qbs.qbs1
-rw-r--r--src/app/shared/qbssettings.h8
-rw-r--r--tests/auto/api/tst_api.cpp13
-rw-r--r--tests/auto/blackbox/tst_blackbox.cpp31
-rw-r--r--tests/auto/tools/tst_tools.cpp6
17 files changed, 48 insertions, 61 deletions
diff --git a/src/app/config-ui/settingsmodel.cpp b/src/app/config-ui/settingsmodel.cpp
index f983d464e..fb1936202 100644
--- a/src/app/config-ui/settingsmodel.cpp
+++ b/src/app/config-ui/settingsmodel.cpp
@@ -31,8 +31,11 @@
#include "../shared/qbssettings.h"
#include <QList>
+#include <QScopedPointer>
#include <QString>
+using qbs::Settings;
+
struct Node
{
Node() : parent(0) {}
@@ -56,14 +59,14 @@ public:
Node *indexToNode(const QModelIndex &index);
Node rootNode;
- SettingsPtr settings;
+ QScopedPointer<Settings> settings;
bool dirty;
};
SettingsModel::SettingsModel(const QString &settingsDir, QObject *parent)
: QAbstractItemModel(parent), d(new SettingsModelPrivate)
{
- d->settings = qbsSettings(settingsDir);
+ d->settings.reset(new Settings(settingsDir));
d->readSettings();
}
diff --git a/src/app/config/configmain.cpp b/src/app/config/configmain.cpp
index 9bf1c9a87..fc0ec6390 100644
--- a/src/app/config/configmain.cpp
+++ b/src/app/config/configmain.cpp
@@ -29,10 +29,10 @@
#include "configcommandlineparser.h"
#include "configcommandexecutor.h"
-#include "../shared/qbssettings.h"
#include <logging/translator.h>
#include <tools/error.h>
+#include <tools/settings.h>
#include <QCoreApplication>
@@ -40,6 +40,7 @@
#include <iostream>
using qbs::Internal::Tr;
+using qbs::Settings;
int main(int argc, char *argv[])
{
@@ -52,8 +53,8 @@ int main(int argc, char *argv[])
parser.printUsage();
return EXIT_SUCCESS;
}
- SettingsPtr settings = qbsSettings(parser.settingsDir());
- ConfigCommandExecutor(settings.data()).execute(parser.command());
+ Settings settings(parser.settingsDir());
+ ConfigCommandExecutor(&settings).execute(parser.command());
} catch (const qbs::ErrorInfo &e) {
std::cerr << qPrintable(e.toString()) << std::endl;
parser.printUsage();
diff --git a/src/app/qbs-qmltypes/qbs-qmltypes.pro b/src/app/qbs-qmltypes/qbs-qmltypes.pro
index 429cd9bec..9e344aa7c 100644
--- a/src/app/qbs-qmltypes/qbs-qmltypes.pro
+++ b/src/app/qbs-qmltypes/qbs-qmltypes.pro
@@ -4,5 +4,3 @@ TARGET = qbs-qmltypes
SOURCES += \
main.cpp \
-
-HEADERS += ../shared/qbssettings.h
diff --git a/src/app/qbs-qmltypes/qbs-qmltypes.qbs b/src/app/qbs-qmltypes/qbs-qmltypes.qbs
index 97e02b2e9..8c11fd911 100644
--- a/src/app/qbs-qmltypes/qbs-qmltypes.qbs
+++ b/src/app/qbs-qmltypes/qbs-qmltypes.qbs
@@ -4,7 +4,6 @@ import "../apptemplate.qbs" as QbsApp
QbsApp {
name: "qbs-qmltypes"
files: [
- "../shared/qbssettings.h",
"main.cpp"
]
}
diff --git a/src/app/qbs-setup-qt/main.cpp b/src/app/qbs-setup-qt/main.cpp
index 065f142c9..4d3fe3be9 100644
--- a/src/app/qbs-setup-qt/main.cpp
+++ b/src/app/qbs-setup-qt/main.cpp
@@ -28,11 +28,11 @@
****************************************************************************/
#include "setupqt.h"
-#include "../shared/qbssettings.h"
#include "commandlineparser.h"
#include <qtprofilesetup.h>
#include <logging/translator.h>
+#include <tools/settings.h>
#include <QCoreApplication>
#include <QFileInfo>
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
return EXIT_SUCCESS;
}
- SettingsPtr settings = qbsSettings(clParser.settingsDir());
+ Settings settings(clParser.settingsDir());
if (clParser.autoDetectionMode()) {
// search all Qt's in path and dump their settings
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
if (!prefixPathParts.isEmpty())
profileName += QLatin1String("-") + prefixPathParts.last();
}
- SetupQt::saveToQbsSettings(profileName, qtEnvironment, settings.data());
+ SetupQt::saveToQbsSettings(profileName, qtEnvironment, &settings);
}
return EXIT_SUCCESS;
}
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
QtEnvironment qtEnvironment = SetupQt::fetchEnvironment(clParser.qmakePath());
QString profileName = clParser.profileName();
profileName.replace(QLatin1Char('.'), QLatin1Char('-'));
- SetupQt::saveToQbsSettings(profileName, qtEnvironment, settings.data());
+ SetupQt::saveToQbsSettings(profileName, qtEnvironment, &settings);
return EXIT_SUCCESS;
} catch (const ErrorInfo &e) {
std::cerr << qPrintable(e.toString()) << std::endl;
diff --git a/src/app/qbs-setup-qt/qbs-setup-qt.pro b/src/app/qbs-setup-qt/qbs-setup-qt.pro
index 9421dfc61..036a4e74c 100644
--- a/src/app/qbs-setup-qt/qbs-setup-qt.pro
+++ b/src/app/qbs-setup-qt/qbs-setup-qt.pro
@@ -10,8 +10,7 @@ SOURCES += \
HEADERS += \
commandlineparser.h \
- setupqt.h \
- ../shared/qbssettings.h
+ setupqt.h
mingw {
RC_FILE = qbs-setup-qt.rc
diff --git a/src/app/qbs-setup-qt/qbs-setup-qt.qbs b/src/app/qbs-setup-qt/qbs-setup-qt.qbs
index 7cdf45d5c..3120901e0 100644
--- a/src/app/qbs-setup-qt/qbs-setup-qt.qbs
+++ b/src/app/qbs-setup-qt/qbs-setup-qt.qbs
@@ -5,7 +5,6 @@ QbsApp {
name: "qbs-setup-qt"
Depends { name: "qbsqtprofilesetup" }
files: [
- "../shared/qbssettings.h",
"commandlineparser.cpp",
"commandlineparser.h",
"main.cpp",
diff --git a/src/app/qbs-setup-toolchains/main.cpp b/src/app/qbs-setup-toolchains/main.cpp
index fbed0fd14..5354ec87d 100644
--- a/src/app/qbs-setup-toolchains/main.cpp
+++ b/src/app/qbs-setup-toolchains/main.cpp
@@ -29,10 +29,10 @@
#include "commandlineparser.h"
#include "probe.h"
-#include "../shared/qbssettings.h"
#include <logging/translator.h>
#include <tools/error.h>
+#include <tools/settings.h>
#include <QCoreApplication>
@@ -40,6 +40,7 @@
#include <iostream>
using qbs::Internal::Tr;
+using qbs::Settings;
static void printUsage(const QString &usageString)
{
@@ -57,13 +58,13 @@ int main(int argc, char **argv)
printUsage(clParser.usageString());
return EXIT_SUCCESS;
}
- SettingsPtr settings = qbsSettings(clParser.settingsDir());
+ Settings settings(clParser.settingsDir());
if (clParser.autoDetectionMode()) {
- probe(settings.data());
+ probe(&settings);
return EXIT_SUCCESS;
}
createProfile(clParser.profileName(), clParser.toolchainType(), clParser.compilerPath(),
- settings.data());
+ &settings);
} catch (const qbs::ErrorInfo &e) {
std::cerr << qPrintable(e.toString()) << std::endl;
return EXIT_FAILURE;
diff --git a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro
index 9a082763a..a3a10b383 100644
--- a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro
+++ b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro
@@ -3,7 +3,6 @@ include(../app.pri)
TARGET = qbs-setup-toolchains
HEADERS += \
- ../shared/qbssettings.h \
commandlineparser.h \
msvcinfo.h \
msvcprobe.h \
diff --git a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
index 5b078818b..a93f7373f 100644
--- a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
+++ b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
@@ -5,7 +5,6 @@ QbsApp {
name: "qbs-setup-toolchains"
cpp.dynamicLibraries: qbs.targetOS.contains("windows") ? base.concat("shell32") : base
files: [
- "../shared/qbssettings.h",
"commandlineparser.cpp",
"commandlineparser.h",
"main.cpp",
diff --git a/src/app/qbs/main.cpp b/src/app/qbs/main.cpp
index 3ce3333d7..2ebe3ce1f 100644
--- a/src/app/qbs/main.cpp
+++ b/src/app/qbs/main.cpp
@@ -32,7 +32,6 @@
#include "qbstool.h"
#include "parser/commandlineparser.h"
#include "../shared/logging/consolelogger.h"
-#include "../shared/qbssettings.h"
#include <qbs.h>
@@ -73,9 +72,9 @@ int main(int argc, char *argv[])
return 0;
}
- SettingsPtr settings = qbsSettings(parser.settingsDir());
- ConsoleLogger::instance().setSettings(settings.data());
- CommandLineFrontend clFrontend(parser, settings.data());
+ Settings settings(parser.settingsDir());
+ ConsoleLogger::instance().setSettings(&settings);
+ CommandLineFrontend clFrontend(parser, &settings);
app.setCommandLineFrontend(&clFrontend);
QTimer::singleShot(0, &clFrontend, SLOT(start()));
return app.exec();
diff --git a/src/app/qbs/qbs.pro b/src/app/qbs/qbs.pro
index 20fce2697..37eda9373 100644
--- a/src/app/qbs/qbs.pro
+++ b/src/app/qbs/qbs.pro
@@ -17,8 +17,7 @@ HEADERS += \
status.h \
consoleprogressobserver.h \
commandlinefrontend.h \
- qbstool.h \
- ../shared/qbssettings.h
+ qbstool.h
include(../../library_dirname.pri)
isEmpty(QBS_RELATIVE_PLUGINS_PATH):QBS_RELATIVE_PLUGINS_PATH=../$${QBS_LIBRARY_DIRNAME}
diff --git a/src/app/qbs/qbs.qbs b/src/app/qbs/qbs.qbs
index dc5f79cad..2f96dde8d 100644
--- a/src/app/qbs/qbs.qbs
+++ b/src/app/qbs/qbs.qbs
@@ -11,7 +11,6 @@ QbsApp {
'QBS_RELATIVE_PLUGINS_PATH="' + project.relativePluginsPath + '"'
])
files: [
- "../shared/qbssettings.h",
"application.cpp",
"application.h",
"commandlinefrontend.cpp",
diff --git a/src/app/shared/qbssettings.h b/src/app/shared/qbssettings.h
index 43852758a..d5b8e4be1 100644
--- a/src/app/shared/qbssettings.h
+++ b/src/app/shared/qbssettings.h
@@ -31,17 +31,9 @@
#include <tools/settings.h>
-#include <QSharedPointer>
#include <QStringList>
#include <QVariant>
-typedef QSharedPointer<qbs::Settings> SettingsPtr;
-
-inline SettingsPtr qbsSettings(const QString &baseDir)
-{
- return SettingsPtr(new qbs::Settings(baseDir));
-}
-
inline QString settingsValueToRepresentation(const QVariant &value)
{
if (value.type() == QVariant::Bool)
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 <api/jobs.h>
#include <api/project.h>
#include <api/projectdata.h>
@@ -41,6 +39,7 @@
#include <tools/installoptions.h>
#include <tools/preferences.h>
#include <tools/profile.h>
+#include <tools/settings.h>
#include <tools/setupprojectparameters.h>
#include <QCoreApplication>
@@ -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 <app/shared/qbssettings.h>
#include <tools/fileinfo.h>
#include <tools/hostosinfo.h>
#include <tools/installoptions.h>
#include <tools/profile.h>
+#include <tools/settings.h>
#include <QLocale>
#include <QRegExp>
@@ -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 <app/shared/qbssettings.h>
+#include <tools/settings.h>
#include <tools/tst_tools.h>
#include <QCoreApplication>
@@ -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);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 02:20:48 +0000