diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-14 16:23:40 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-14 16:03:47 +0000 |
| commit | e8fb7657ed686f32e3f431dc2b810e2bbfdc4f60 (patch) | |
| tree | eb33216c750eafaf49389e8233da1415c7492a6e /src/controls | |
| parent | 8c3316aeea5f061e5b1be5605d69b8777345dd98 (diff) | |
Make QQuickStyleSelector case-insensitive
This is especially nice for qtlabscontrols.conf:
[Controls]
Style=material
vs.
[Controls]
Style=Material
Previously, only the first syntax worked.
Change-Id: Ib4a47dca002acb5c0227f3dcfea7251296f8386e
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src/controls')
| -rw-r--r-- | src/controls/qquickstyleselector.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/controls/qquickstyleselector.cpp b/src/controls/qquickstyleselector.cpp index 61d7136e..a56670e8 100644 --- a/src/controls/qquickstyleselector.cpp +++ b/src/controls/qquickstyleselector.cpp @@ -60,13 +60,13 @@ QQuickStyleSelectorPrivate::QQuickStyleSelectorPrivate() QQuickStyleSelector::QQuickStyleSelector() : d_ptr(new QQuickStyleSelectorPrivate) { Q_D(QQuickStyleSelector); - d->style = QGuiApplicationPrivate::styleOverride; + d->style = QGuiApplicationPrivate::styleOverride.toLower(); if (d->style.isEmpty()) - d->style = QString::fromLatin1(qgetenv("QT_LABS_CONTROLS_STYLE")); + d->style = QString::fromLatin1(qgetenv("QT_LABS_CONTROLS_STYLE")).toLower(); if (d->style.isEmpty()) { QSharedPointer<QSettings> settings = QQuickStyle::settings(QStringLiteral("Controls")); if (settings) - d->style = settings->value(QStringLiteral("Style")).toString(); + d->style = settings->value(QStringLiteral("Style")).toString().toLower(); } } |