From 694568d01a1d2480bd57a27ed2f500506f488fcb Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Mon, 29 Apr 2019 20:24:47 +0200 Subject: Fix qbsConfig test on Macos It seems, that QSettings is not working properly with SystemScope on Macos (QTBUG-21062). QSettings::fileName returns a path to a file in a test directory, not in "/Library/Application Support" as expected. Thus, canWriteToSystemSettings is true and test fails when real qbs binary tries to write to the /Library... location Change-Id: I726360a1daacf4871f944f5afe30089083283dce Reviewed-by: Christian Kandeler --- src/lib/corelib/tools/settings.cpp | 4 ++-- src/lib/corelib/tools/settings.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/lib') 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; -- cgit v1.2.3