diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-05-24 14:59:43 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-06-13 14:33:37 +0200 |
| commit | 9680828ac40d6e10eac02f4981f3668669409acf (patch) | |
| tree | aabb21fc66835ac66d2857b328ea80a7ba8a463d /src/core/profile_adapter.cpp | |
| parent | 93827875d4515a686978d98ff239332ce1adcb01 (diff) | |
Persistent storage of preferences between app runs
We can now persist the user preferences to disk at application exit so
they are correctly remembered for the next run. The preferences are
stored in dataPath()/user_prefs.json. This is managed via the
PrefServiceAdapter class.
It's not possible to test this in a correct pattern as we require the
app to exit properly to be able to guarantee that the preferences are
written to disk. The code added in ~PrefServiceAdapter() does not
provide any guarantees in the next profile construction that the
previous preferences have been written to disk.
Fixes: QTBUG-75740
Change-Id: I96bb3037707d90b05b3dfab4f083702351923aee
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/profile_adapter.cpp')
| -rw-r--r-- | src/core/profile_adapter.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/core/profile_adapter.cpp b/src/core/profile_adapter.cpp index ff0199833..8d32aad84 100644 --- a/src/core/profile_adapter.cpp +++ b/src/core/profile_adapter.cpp @@ -126,6 +126,7 @@ void ProfileAdapter::setStorageName(const QString &storageName) return; m_name = storageName; if (!m_offTheRecord) { + m_profile->setupPrefService(); if (m_profile->m_urlRequestContextGetter.get()) m_profile->m_profileIOData->updateStorageSettings(); if (m_visitedLinksManager) @@ -138,6 +139,7 @@ void ProfileAdapter::setOffTheRecord(bool offTheRecord) if (offTheRecord == m_offTheRecord) return; m_offTheRecord = offTheRecord; + m_profile->setupPrefService(); if (m_profile->m_urlRequestContextGetter.get()) m_profile->m_profileIOData->updateStorageSettings(); if (m_visitedLinksManager) @@ -263,6 +265,7 @@ void ProfileAdapter::setDataPath(const QString &path) return; m_dataPath = path; if (!m_offTheRecord) { + m_profile->setupPrefService(); if (m_profile->m_urlRequestContextGetter.get()) m_profile->m_profileIOData->updateStorageSettings(); if (m_visitedLinksManager) @@ -614,14 +617,14 @@ void ProfileAdapter::clearHttpCache() void ProfileAdapter::setSpellCheckLanguages(const QStringList &languages) { #if QT_CONFIG(webengine_spellchecker) - m_profile->setSpellCheckLanguages(languages); + m_profile->prefServiceAdapter().setSpellCheckLanguages(languages); #endif } QStringList ProfileAdapter::spellCheckLanguages() const { #if QT_CONFIG(webengine_spellchecker) - return m_profile->spellCheckLanguages(); + return m_profile->prefServiceAdapter().spellCheckLanguages(); #else return QStringList(); #endif @@ -630,14 +633,14 @@ QStringList ProfileAdapter::spellCheckLanguages() const void ProfileAdapter::setSpellCheckEnabled(bool enabled) { #if QT_CONFIG(webengine_spellchecker) - m_profile->setSpellCheckEnabled(enabled); + m_profile->prefServiceAdapter().setSpellCheckEnabled(enabled); #endif } bool ProfileAdapter::isSpellCheckEnabled() const { #if QT_CONFIG(webengine_spellchecker) - return m_profile->isSpellCheckEnabled(); + return m_profile->prefServiceAdapter().isSpellCheckEnabled(); #else return false; #endif |