diff options
Diffstat (limited to 'src/imports/controls/default')
4 files changed, 3 insertions, 16 deletions
diff --git a/src/imports/controls/default/.prev_CMakeLists.txt b/src/imports/controls/default/.prev_CMakeLists.txt index 608f81b6..9a37f29c 100644 --- a/src/imports/controls/default/.prev_CMakeLists.txt +++ b/src/imports/controls/default/.prev_CMakeLists.txt @@ -8,8 +8,6 @@ qt_add_qml_module(qtquickcontrols2defaultstyleplugin URI "QtQuick.Controls.Default" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2DefaultStylePlugin - DEPENDENCIES - QtQuick.Controls/2.5 GENERATE_QMLTYPES SOURCES qquickdefaultstyle.cpp qquickdefaultstyle_p.h diff --git a/src/imports/controls/default/CMakeLists.txt b/src/imports/controls/default/CMakeLists.txt index 336d04c9..f7ce5d10 100644 --- a/src/imports/controls/default/CMakeLists.txt +++ b/src/imports/controls/default/CMakeLists.txt @@ -8,8 +8,6 @@ qt_add_qml_module(qtquickcontrols2defaultstyleplugin URI "QtQuick.Controls.Default" VERSION "6.0" # special case CLASSNAME QtQuickControls2DefaultStylePlugin - DEPENDENCIES - QtQuick.Controls/2.5 GENERATE_QMLTYPES SOURCES qquickdefaultstyle.cpp qquickdefaultstyle_p.h diff --git a/src/imports/controls/default/impl/CMakeLists.txt b/src/imports/controls/default/impl/CMakeLists.txt index d90ef86b..e6258d13 100644 --- a/src/imports/controls/default/impl/CMakeLists.txt +++ b/src/imports/controls/default/impl/CMakeLists.txt @@ -8,9 +8,6 @@ qt_add_qml_module(qtquickcontrols2defaultstyleimplplugin URI "QtQuick.Controls.Default.impl" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2DefaultStyleImplPlugin - DEPENDENCIES - QtQuick.Templates/6.0 - QtQuick.Controls/6.0 SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES SOURCES diff --git a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp b/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp index 6b4b3bc3..c7259a29 100644 --- a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp +++ b/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp @@ -51,8 +51,7 @@ public: QtQuickControls2DefaultStylePlugin(QObject *parent = nullptr); QString name() const override; - - void registerTypes(const char *uri) override; + void initializeTheme(QQuickTheme *theme) override; QQuickDefaultTheme theme; }; @@ -66,14 +65,9 @@ QString QtQuickControls2DefaultStylePlugin::name() const return QStringLiteral("Default"); } -void QtQuickControls2DefaultStylePlugin::registerTypes(const char *uri) +void QtQuickControls2DefaultStylePlugin::initializeTheme(QQuickTheme *theme) { - QQuickStylePlugin::registerTypes(uri); - - if (!QQuickTheme::instance()) - return; - - theme.initialize(QQuickTheme::instance()); + this->theme.initialize(theme); } QT_END_NAMESPACE |