diff options
| author | David Faure <david.faure@kdab.com> | 2016-06-18 15:20:56 +0200 |
|---|---|---|
| committer | David Faure <david.faure@kdab.com> | 2016-07-06 17:20:34 +0000 |
| commit | f9d052928bb5767d0caf3b6c030d642beac26598 (patch) | |
| tree | 897b5da7e4dd9e7171c892dd43eaaf02deaeefa2 /src | |
| parent | 0ea4a2cd207540c6936c6cf16bc5b371d6bcd09d (diff) | |
| download | qtquickcontrols-f9d052928bb5767d0caf3b6c030d642beac26598.tar.gz | |
Find custom styles from custom paths when set afterwards
This fixes the very frequent warning from plasmashell:
WARNING: Cannot find style "Plasma"
Change-Id: Ibe853e7b8b42adc2bce7c63a1505b27898ea5ffc
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/controls/Private/qquickcontrolsettings.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index 1965738a..a2fb824c 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -339,6 +339,11 @@ void QQuickControlSettings1::setStyleName(const QString &name) QString oldName = m_name; m_name = name; + if (!m_styleMap.contains(name)) { + // Maybe this style is not next to the default style, but elsewhere in the import path + findStyle(m_engine, name); + } + // Don't change the style if it can't be resolved. if (!resolveCurrentStylePath()) m_name = oldName; |