diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-14 14:21:35 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-14 14:39:47 +0000 |
| commit | be1c2e01ef1efa0e85eeab5fd392ef85c01493d2 (patch) | |
| tree | f10a5120e046f54b29b761691cd6173610816850 /src/controls | |
| parent | b8f21fde5ad9e380bedd74a226dcc0dbb5ec2214 (diff) | |
Read preferred style from qtlabscontrols.conf
Change-Id: I3aeed5c8316a099eed5ea8df25711193ee3c7d90
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/controls')
| -rw-r--r-- | src/controls/qquickstyleselector.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/controls/qquickstyleselector.cpp b/src/controls/qquickstyleselector.cpp index a84645d2..8c67cdce 100644 --- a/src/controls/qquickstyleselector.cpp +++ b/src/controls/qquickstyleselector.cpp @@ -43,8 +43,10 @@ #include <QtCore/QFileInfo> #include <QtCore/QLocale> #include <QtCore/QDebug> +#include <QtCore/QSettings> #include <QtGui/private/qguiapplication_p.h> +#include <QtLabsControls/private/qquickstyle_p.h> QT_BEGIN_NAMESPACE @@ -61,6 +63,11 @@ QQuickStyleSelector::QQuickStyleSelector() : d_ptr(new QQuickStyleSelectorPrivat d->style = QGuiApplicationPrivate::styleOverride; if (d->style.isEmpty()) d->style = QString::fromLatin1(qgetenv("QT_LABS_CONTROLS_STYLE")); + if (d->style.isEmpty()) { + QSharedPointer<QSettings> settings = QQuickStyle::settings(QStringLiteral("Controls")); + if (settings) + d->style = settings->value(QStringLiteral("Style")).toString(); + } } QQuickStyleSelector::~QQuickStyleSelector() |