aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/controls/macos/qtquickcontrols2macosstyleplugin.cpp2
-rw-r--r--src/imports/controls/windows/qtquickcontrols2windowsstyleplugin.cpp2
-rw-r--r--src/imports/nativestyle/qtquickcontrols2nativestyleplugin.cpp3
3 files changed, 5 insertions, 2 deletions
diff --git a/src/imports/controls/macos/qtquickcontrols2macosstyleplugin.cpp b/src/imports/controls/macos/qtquickcontrols2macosstyleplugin.cpp
index 268eb026..a6a26b89 100644
--- a/src/imports/controls/macos/qtquickcontrols2macosstyleplugin.cpp
+++ b/src/imports/controls/macos/qtquickcontrols2macosstyleplugin.cpp
@@ -57,7 +57,7 @@ QString QtQuickControls2MacOSStylePlugin::name() const
void QtQuickControls2MacOSStylePlugin::registerTypes(const char *uri)
{
- Q_UNUSED(uri);
+ QQuickStylePlugin::registerTypes(uri);
}
QT_END_NAMESPACE
diff --git a/src/imports/controls/windows/qtquickcontrols2windowsstyleplugin.cpp b/src/imports/controls/windows/qtquickcontrols2windowsstyleplugin.cpp
index 6d95e7f6..9c50f4fb 100644
--- a/src/imports/controls/windows/qtquickcontrols2windowsstyleplugin.cpp
+++ b/src/imports/controls/windows/qtquickcontrols2windowsstyleplugin.cpp
@@ -57,7 +57,7 @@ QString QtQuickControls2WindowsStylePlugin::name() const
void QtQuickControls2WindowsStylePlugin::registerTypes(const char *uri)
{
- Q_UNUSED(uri);
+ QQuickStylePlugin::registerTypes(uri);
}
QT_END_NAMESPACE
diff --git a/src/imports/nativestyle/qtquickcontrols2nativestyleplugin.cpp b/src/imports/nativestyle/qtquickcontrols2nativestyleplugin.cpp
index dd34d2f8..c7dce598 100644
--- a/src/imports/nativestyle/qtquickcontrols2nativestyleplugin.cpp
+++ b/src/imports/nativestyle/qtquickcontrols2nativestyleplugin.cpp
@@ -137,6 +137,9 @@ void QtQuickControls2NativeStylePlugin::initializeEngine(QQmlEngine *engine, con
void QtQuickControls2NativeStylePlugin::registerTypes(const char *uri)
{
Q_UNUSED(uri);
+ if (!QQuickTheme::instance())
+ return;
+
QQuickTheme::instance()->setPalette(QQuickTheme::System, QPalette());
QQuickTheme::instance()->setFont(QQuickTheme::System, QFont());
}