Merge 1.13 into master

Change-Id: Ic02d717f80f5d831f0cedb3b7c565a9bfef3a2a3

2 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/corelib/tools/settings.cpp b/src/lib/corelib/tools/settings.cpp
index f2902aed4..7312cd622 100644
--- a/src/lib/corelib/tools/settings.cpp
+++ b/src/lib/corelib/tools/settings.cpp
@@ -54,7 +54,7 @@
 namespace qbs {
 using namespace Internal;
 
-static QString defaultSystemSettingsBaseDir()
+QString Settings::defaultSystemSettingsBaseDir()
 {
     switch (HostOsInfo::hostOs()) {
     case HostOsInfo::HostOsWindows: {
@@ -83,7 +83,7 @@ static QString systemSettingsBaseDir()
 #ifdef QBS_SYSTEM_SETTINGS_DIR
     return QLatin1String(QBS_SYSTEM_SETTINGS_DIR);
 #else
-    return defaultSystemSettingsBaseDir() + QStringLiteral("/qbs");
+    return Settings::defaultSystemSettingsBaseDir() + QStringLiteral("/qbs");
 #endif
 }
 
diff --git a/src/lib/corelib/tools/settings.h b/src/lib/corelib/tools/settings.h
index 2748e6890..d4de08490 100644
--- a/src/lib/corelib/tools/settings.h
+++ b/src/lib/corelib/tools/settings.h
@@ -84,6 +84,8 @@ public:
     QString fileName() const;
     QString baseDirectory() const { return m_baseDir; } // As passed into the constructor.
 
+    static QString defaultSystemSettingsBaseDir();
+
 private:
     QString internalRepresentation(const QString &externalKey) const;
     QString externalRepresentation(const QString &internalKey) const;