diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-20 00:20:18 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-19 23:23:31 +0000 |
commit | 98e1d85d7fcf7bb601518be6956f5473b79b6819 (patch) | |
tree | 06bd759ed015e8fa852d490967b10371a0f9ed6e /src | |
parent | f86b6ff82fbde9ff8ace566fe0a5ad94843e5485 (diff) |
Use QFileSelector for qtlabscontrols.conf
Allows setting different defaults for different platforms, for example:
qtlabscontrols.conf:Style=Default
+android/qtlabscontrols.conf:Style=Material
+windows/qtlabscontrols.conf:Style=Universal
Change-Id: Ie84408f996bd665c343c2d73d5ec26c37c6c2491
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/controls/qquickstyle.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/controls/qquickstyle.cpp b/src/controls/qquickstyle.cpp index 4ab7b7cc..5e1085c6 100644 --- a/src/controls/qquickstyle.cpp +++ b/src/controls/qquickstyle.cpp @@ -38,6 +38,7 @@ #include <QtCore/qfile.h> #include <QtCore/qsettings.h> +#include <QtCore/qfileselector.h> #include <QtQuick/private/qquickitem_p.h> QT_BEGIN_NAMESPACE @@ -157,7 +158,8 @@ QSharedPointer<QSettings> QQuickStyle::settings(const QString &group) #ifndef QT_NO_SETTINGS const QString filePath = QLatin1String(SettingsFilePath); if (QFile::exists(filePath)) { - QSettings *settings = new QSettings(filePath, QSettings::IniFormat); + QFileSelector selector; + QSettings *settings = new QSettings(selector.select(filePath), QSettings::IniFormat); if (!group.isEmpty()) settings->beginGroup(group); return QSharedPointer<QSettings>(settings); |