diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index d880de115ce..2acf2ed0f46 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -303,7 +304,7 @@ void Project::saveSettings() emit aboutToSaveSettings(); if (!d->m_accessor) d->m_accessor = new Internal::UserFileAccessor(this); - d->m_accessor->saveSettings(toMap()); + d->m_accessor->saveSettings(toMap(), Core::ICore::mainWindow()); } bool Project::restoreSettings() diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp index 5a6f023f727..2cdbb524b63 100644 --- a/src/plugins/projectexplorer/settingsaccessor.cpp +++ b/src/plugins/projectexplorer/settingsaccessor.cpp @@ -561,7 +561,7 @@ QVariantMap SettingsAccessor::restoreSettings() const return userSettings.m_map; } -bool SettingsAccessor::saveSettings(const QVariantMap &map) const +bool SettingsAccessor::saveSettings(const QVariantMap &map, QWidget *parent) const { if (map.isEmpty()) return false; @@ -574,7 +574,7 @@ bool SettingsAccessor::saveSettings(const QVariantMap &map) const if (shared.isValid()) trackUserStickySettings(settings.m_map, shared.toMap()); - return m_userFileAcessor.writeFile(&settings); + return m_userFileAcessor.writeFile(&settings, parent); } void SettingsAccessor::addVersionUpgrader(VersionUpgrader *handler) @@ -922,7 +922,7 @@ bool SettingsAccessor::FileAccessor::readFile(SettingsData *settings) const return true; } -bool SettingsAccessor::FileAccessor::writeFile(const SettingsData *settings) const +bool SettingsAccessor::FileAccessor::writeFile(const SettingsData *settings, QWidget *parent) const { if (!m_writer || m_writer->fileName() != settings->fileName()) { delete m_writer; @@ -941,7 +941,7 @@ bool SettingsAccessor::FileAccessor::writeFile(const SettingsData *settings) con if (m_environmentSpecific) data.insert(QLatin1String(ENVIRONMENT_ID_KEY), SettingsAccessor::creatorId()); - return m_writer->save(data, Core::ICore::mainWindow()); + return m_writer->save(data, parent); } // ------------------------------------------------------------------------- diff --git a/src/plugins/projectexplorer/settingsaccessor.h b/src/plugins/projectexplorer/settingsaccessor.h index b0f80bf169f..e6bfac4e88f 100644 --- a/src/plugins/projectexplorer/settingsaccessor.h +++ b/src/plugins/projectexplorer/settingsaccessor.h @@ -51,7 +51,7 @@ public: Project *project() const; QVariantMap restoreSettings() const; - bool saveSettings(const QVariantMap &map) const; + bool saveSettings(const QVariantMap &data, QWidget *parent) const; void addVersionUpgrader(Internal::VersionUpgrader *handler); // Takes ownership of the handler! private: @@ -99,7 +99,7 @@ private: ~FileAccessor(); bool readFile(SettingsData *settings) const; - bool writeFile(const SettingsData *settings) const; + bool writeFile(const SettingsData *settings, QWidget *parent) const; QString suffix() const { return m_suffix; }