diff options
Diffstat (limited to 'src')
7 files changed, 20 insertions, 0 deletions
diff --git a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp b/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp index a486658e..6b4b3bc3 100644 --- a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp +++ b/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp @@ -70,6 +70,9 @@ void QtQuickControls2DefaultStylePlugin::registerTypes(const char *uri) { QQuickStylePlugin::registerTypes(uri); + if (!QQuickTheme::instance()) + return; + theme.initialize(QQuickTheme::instance()); } diff --git a/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp b/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp index c70c9602..59d99afc 100644 --- a/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp +++ b/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp @@ -71,6 +71,9 @@ void QtQuickControls2FusionStylePlugin::registerTypes(const char *uri) { QQuickStylePlugin::registerTypes(uri); + if (!QQuickTheme::instance()) + return; + theme.initialize(QQuickTheme::instance()); } diff --git a/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp b/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp index 0c864254..336064dd 100644 --- a/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp +++ b/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp @@ -72,6 +72,9 @@ void QtQuickControls2ImagineStylePlugin::registerTypes(const char *uri) { QQuickStylePlugin::registerTypes(uri); + if (!QQuickTheme::instance()) + return; + theme.initialize(QQuickTheme::instance()); } diff --git a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp index 6066d3f5..47e7e877 100644 --- a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp +++ b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp @@ -71,6 +71,9 @@ void QtQuickControls2MaterialStylePlugin::registerTypes(const char *uri) { QQuickStylePlugin::registerTypes(uri); + if (!QQuickTheme::instance()) + return; + QQuickMaterialStyle::initGlobals(); theme.initialize(QQuickTheme::instance()); } diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index ef642905..b089daa2 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -165,6 +165,8 @@ void QtQuickControls2Plugin::unregisterTypes() const int importMajor = !QQuickStylePrivate::isCustomStyle() ? QQmlModuleImportAuto : QQmlModuleImportLatest; qmlUnregisterModuleImport(qtQuickControlsUri, QQmlModuleImportModuleAny, styleUri.toUtf8().constData(), importMajor); + QQuickThemePrivate::instance.reset(); + QQuickStylePrivate::reset(); } diff --git a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp index d6f7746d..539738dd 100644 --- a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp +++ b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp @@ -70,6 +70,9 @@ void QtQuickControls2UniversalStylePlugin::registerTypes(const char *uri) { QQuickStylePlugin::registerTypes(uri); + if (!QQuickTheme::instance()) + return; + QQuickUniversalStyle::initGlobals(); theme.initialize(QQuickTheme::instance()); } diff --git a/src/quickcontrols2/qquickstyleplugin.cpp b/src/quickcontrols2/qquickstyleplugin.cpp index 1f1c3875..657b31fc 100644 --- a/src/quickcontrols2/qquickstyleplugin.cpp +++ b/src/quickcontrols2/qquickstyleplugin.cpp @@ -65,6 +65,9 @@ QString QQuickStylePlugin::name() const void QQuickStylePlugin::registerTypes(const char *uri) { qCDebug(lcStylePlugin).nospace() << "registerTypes called with uri " << uri << "; plugin name is " << name(); + + if (!QQuickTheme::instance()) + qWarning() << "QtQuick.Controls must be imported before importing" << baseUrl().toString(); } void QQuickStylePlugin::unregisterTypes() |