From e8fb7657ed686f32e3f431dc2b810e2bbfdc4f60 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 14 Dec 2015 16:23:40 +0100 Subject: 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 --- src/controls/qquickstyleselector.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/controls') 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 settings = QQuickStyle::settings(QStringLiteral("Controls")); if (settings) - d->style = settings->value(QStringLiteral("Style")).toString(); + d->style = settings->value(QStringLiteral("Style")).toString().toLower(); } } -- cgit v1.2.3