diff options
| author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-08-13 09:53:25 +0200 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-08-13 09:53:25 +0200 |
| commit | ae2dfc52cfc7e627eab6f0aeadb5bed4ec2e8752 (patch) | |
| tree | 573a3b66577879a278dd758bc52af2900a737b6d /src/imports | |
| parent | c2aaf8ee66ebd56cf4b0b0eedd1e10b80d6c1907 (diff) | |
| parent | 0ba45442f3f1102af73ec2666e4e5c24ed516331 (diff) | |
Merge branch 'dev' into nativestyle
Change-Id: Ib1414eac2ad31cbaff6408ba84020a1e5dc064f4
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 6730848f..53868d16 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -271,7 +271,7 @@ QList<QQuickStylePlugin *> QtQuickControls2Plugin::loadStylePlugins() const auto plugins = QPluginLoader::staticInstances(); for (QObject *instance : plugins) { QQuickStylePlugin *stylePlugin = qobject_cast<QQuickStylePlugin *>(instance); - if (!stylePlugin || parser.className() != QLatin1String(instance->metaObject()->className())) + if (!stylePlugin || !parser.classNames().contains(QLatin1String(instance->metaObject()->className()))) continue; stylePlugins += stylePlugin; } |