diff options
author | Maurice Kalinowski <maurice.kalinowski@digia.com> | 2014-04-03 08:21:18 +0200 |
---|---|---|
committer | Maurice Kalinowski <maurice.kalinowski@digia.com> | 2014-08-13 09:40:56 +0200 |
commit | 091653e9e71c3e2ada54efe6b3592340e16eaa85 (patch) | |
tree | 832fa7a95b27cf59e5a01588367febb7ff9a62ee /src/corelib/io/qsettings.cpp | |
parent | 7487592cceaf3d2cfe002257e1d7f0b023c0ec8a (diff) |
Implement native settings format for WinRT
WinRT stores settings inside the app bundle, not in the registry.
Some tests are not fully functional due to errors in the file
implementation (See QTBUG-40588).
QSettings::SystemScope translates to a roaming container on WinRT,
meaning that settings stored inside there should be uploaded and
shared among devices. However, this is untested so far.
The tests have been updated for those platforms which do not store
the order of keys. This has been done on some locations only so
far, but needed to be done on more places for WinRT.
Task-number: QTBUG-33498
Change-Id: Ifd0194387b09c220d31812b4b6fd0ce9a7d84d24
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Diffstat (limited to 'src/corelib/io/qsettings.cpp')
-rw-r--r-- | src/corelib/io/qsettings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 4fb15aa83e..7a2e1909b2 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -282,9 +282,9 @@ after_loop: return result; } -// see also qsettings_win.cpp and qsettings_mac.cpp +// see also qsettings_win.cpp, qsettings_winrt.cpp and qsettings_mac.cpp -#if defined(Q_OS_WINRT) || (!defined(Q_OS_WIN) && !defined(Q_OS_MAC)) +#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) QSettingsPrivate *QSettingsPrivate::create(QSettings::Format format, QSettings::Scope scope, const QString &organization, const QString &application) { @@ -292,7 +292,7 @@ QSettingsPrivate *QSettingsPrivate::create(QSettings::Format format, QSettings:: } #endif -#if defined(Q_OS_WINRT) || !defined(Q_OS_WIN) +#if !defined(Q_OS_WIN) QSettingsPrivate *QSettingsPrivate::create(const QString &fileName, QSettings::Format format) { return new QConfFileSettingsPrivate(fileName, format); |