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>

3 files changed, 9 insertions, 3 deletions

diff --git a/src/app/shared/logging/consolelogger.cpp b/src/app/shared/logging/consolelogger.cpp
index 33707e878..eb5f546d7 100644
--- a/src/app/shared/logging/consolelogger.cpp
+++ b/src/app/shared/logging/consolelogger.cpp
@@ -94,8 +94,13 @@ ConsoleLogger &ConsoleLogger::instance(qbs::Settings *settings)
     return logger;
 }
 
-ConsoleLogger::ConsoleLogger(qbs::Settings *settings) : Logger(&m_logSink)
+void ConsoleLogger::setSettings(qbs::Settings *settings)
 {
     if (settings)
         m_logSink.setColoredOutputEnabled(qbs::Preferences(settings).useColoredOutput());
 }
+
+ConsoleLogger::ConsoleLogger(qbs::Settings *settings) : Logger(&m_logSink)
+{
+    setSettings(settings);
+}
diff --git a/src/app/shared/logging/consolelogger.h b/src/app/shared/logging/consolelogger.h
index 387ddc749..eddeaeb77 100644
--- a/src/app/shared/logging/consolelogger.h
+++ b/src/app/shared/logging/consolelogger.h
@@ -59,6 +59,7 @@ class ConsoleLogger : public qbs::Internal::Logger
 public:
     static ConsoleLogger &instance(qbs::Settings *settings = 0);
     ConsoleLogSink *logSink() { return &m_logSink; }
+    void setSettings(qbs::Settings *settings);
 
 private:
     ConsoleLogger(qbs::Settings *settings);
diff --git a/src/app/shared/qbssettings.h b/src/app/shared/qbssettings.h
index 356399cde..43852758a 100644
--- a/src/app/shared/qbssettings.h
+++ b/src/app/shared/qbssettings.h
@@ -37,9 +37,9 @@
 
 typedef QSharedPointer<qbs::Settings> SettingsPtr;
 
-inline SettingsPtr qbsSettings()
+inline SettingsPtr qbsSettings(const QString &baseDir)
 {
-    return SettingsPtr(new qbs::Settings(QLatin1String("QtProject"), QLatin1String("qbs")));
+    return SettingsPtr(new qbs::Settings(baseDir));
 }
 
 inline QString settingsValueToRepresentation(const QVariant &value)