Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-declarative for openSUSE:Factory
checked in at 2024-02-18 20:23:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-declarative (Old)
and /work/SRC/openSUSE:Factory/.qt6-declarative.new.1815 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-declarative"
Sun Feb 18 20:23:53 2024 rev:34 rq:1147211 version:6.6.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-declarative/qt6-declarative.changes
2023-12-04 22:59:46.679854119 +0100
+++
/work/SRC/openSUSE:Factory/.qt6-declarative.new.1815/qt6-declarative.changes
2024-02-18 20:24:06.300036138 +0100
@@ -1,0 +2,9 @@
+Wed Feb 14 16:53:12 UTC 2024 - Christophe Marin <christo...@krop.fr>
+
+- Update to 6.6.2
+ * https://www.qt.io/blog/qt-6.6.2-released
+- Add upstream changes to make build reproducible:
+ * 0001-QuickControls-Link-the-impl-libraries-into-the-base-.patch
+ * 0001-Dialogs-Depend-on-controls-styles-in-QuickDialogs2Qu.patch
+
+-------------------------------------------------------------------
Old:
----
qtdeclarative-everywhere-src-6.6.1.tar.xz
New:
----
0001-Dialogs-Depend-on-controls-styles-in-QuickDialogs2Qu.patch
0001-QuickControls-Link-the-impl-libraries-into-the-base-.patch
qtdeclarative-everywhere-src-6.6.2.tar.xz
BETA DEBUG BEGIN:
New: * 0001-QuickControls-Link-the-impl-libraries-into-the-base-.patch
* 0001-Dialogs-Depend-on-controls-styles-in-QuickDialogs2Qu.patch
New:- Add upstream changes to make build reproducible:
* 0001-QuickControls-Link-the-impl-libraries-into-the-base-.patch
* 0001-Dialogs-Depend-on-controls-styles-in-QuickDialogs2Qu.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-declarative.spec ++++++
--- /var/tmp/diff_new_pack.N7UB1F/_old 2024-02-18 20:24:07.808090560 +0100
+++ /var/tmp/diff_new_pack.N7UB1F/_new 2024-02-18 20:24:07.808090560 +0100
@@ -16,7 +16,7 @@
#
-%define real_version 6.6.1
+%define real_version 6.6.2
%define short_version 6.6
%define tar_name qtdeclarative-everywhere-src
%define tar_suffix %{nil}
@@ -27,7 +27,7 @@
%endif
#
Name: qt6-declarative%{?pkg_suffix}
-Version: 6.6.1
+Version: 6.6.2
Release: 0
Summary: Qt 6 Declarative Libraries and tools
License: GPL-2.0-only OR GPL-3.0-or-later OR LGPL-3.0-only
@@ -36,6 +36,9 @@
Source99: qt6-declarative-rpmlintrc
# PATCH-FIX-DOWNSTREAM
Patch0: 0001-qmlimportscanner-Include-module-versions-again.patch
+# PATCH-FIX-UPSTREAM -- make build reproducible
+Patch1: 0001-QuickControls-Link-the-impl-libraries-into-the-base-.patch
+Patch2: 0001-Dialogs-Depend-on-controls-styles-in-QuickDialogs2Qu.patch
BuildRequires: pkgconfig
BuildRequires: python3-base
BuildRequires: qt6-core-private-devel
@@ -1343,6 +1346,11 @@
%files -n libQt6QuickControls2-6
%{_qt6_libdir}/libQt6QuickControls2.so.*
+%{_qt6_libdir}/libQt6QuickControls2Basic.so.*
+%{_qt6_libdir}/libQt6QuickControls2Fusion.so.*
+%{_qt6_libdir}/libQt6QuickControls2Imagine.so.*
+%{_qt6_libdir}/libQt6QuickControls2Material.so.*
+%{_qt6_libdir}/libQt6QuickControls2Universal.so.*
%files -n qt6-quickcontrols2-devel
%{_qt6_cmakedir}/Qt6QuickControls2/
@@ -1356,26 +1364,129 @@
%exclude %{_qt6_includedir}/QtQuickControls2/%{real_version}
%files -n qt6-quickcontrols2-private-devel
+%{_qt6_cmakedir}/Qt6QuickControls2Basic/
+%{_qt6_cmakedir}/Qt6QuickControls2Fusion/
+%{_qt6_cmakedir}/Qt6QuickControls2Imagine/
+%{_qt6_cmakedir}/Qt6QuickControls2Material/
+%{_qt6_cmakedir}/Qt6QuickControls2Universal/
+%{_qt6_descriptionsdir}/QuickControls2Basic.json
+%{_qt6_descriptionsdir}/QuickControls2Fusion.json
+%{_qt6_descriptionsdir}/QuickControls2Imagine.json
+%{_qt6_descriptionsdir}/QuickControls2Material.json
+%{_qt6_descriptionsdir}/QuickControls2Universal.json
%{_qt6_includedir}/QtQuickControls2/%{real_version}/
+%{_qt6_includedir}/QtQuickControls2Basic/
+%{_qt6_includedir}/QtQuickControls2Fusion/
+%{_qt6_includedir}/QtQuickControls2Imagine/
+%{_qt6_includedir}/QtQuickControls2Material/
+%{_qt6_includedir}/QtQuickControls2Universal/
+%{_qt6_libdir}/libQt6QuickControls2Basic.prl
+%{_qt6_libdir}/libQt6QuickControls2Basic.so
+%{_qt6_libdir}/libQt6QuickControls2Fusion.prl
+%{_qt6_libdir}/libQt6QuickControls2Fusion.so
+%{_qt6_libdir}/libQt6QuickControls2Imagine.prl
+%{_qt6_libdir}/libQt6QuickControls2Imagine.so
+%{_qt6_libdir}/libQt6QuickControls2Material.prl
+%{_qt6_libdir}/libQt6QuickControls2Material.so
+%{_qt6_libdir}/libQt6QuickControls2Universal.prl
+%{_qt6_libdir}/libQt6QuickControls2Universal.so
+%{_qt6_metatypesdir}/qt6quickcontrols2basic_*_metatypes.json
+%{_qt6_metatypesdir}/qt6quickcontrols2fusion_*_metatypes.json
+%{_qt6_metatypesdir}/qt6quickcontrols2imagine_*_metatypes.json
+%{_qt6_metatypesdir}/qt6quickcontrols2material_*_metatypes.json
+%{_qt6_metatypesdir}/qt6quickcontrols2universal_*_metatypes.json
%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2_private.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2basic.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2basic_private.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2fusion.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2fusion_private.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2imagine.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2imagine_private.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2material.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2material_private.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2universal.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2universal_private.pri
+%{_qt6_pkgconfigdir}/Qt6QuickControls2Basic.pc
+%{_qt6_pkgconfigdir}/Qt6QuickControls2Fusion.pc
+%{_qt6_pkgconfigdir}/Qt6QuickControls2Imagine.pc
+%{_qt6_pkgconfigdir}/Qt6QuickControls2Material.pc
+%{_qt6_pkgconfigdir}/Qt6QuickControls2Universal.pc
%files -n libQt6QuickControls2Impl6
+%{_qt6_libdir}/libQt6QuickControls2BasicStyleImpl.so.*
+%{_qt6_libdir}/libQt6QuickControls2FusionStyleImpl.so.*
+%{_qt6_libdir}/libQt6QuickControls2ImagineStyleImpl.so.*
%{_qt6_libdir}/libQt6QuickControls2Impl.so.*
+%{_qt6_libdir}/libQt6QuickControls2MaterialStyleImpl.so.*
+%{_qt6_libdir}/libQt6QuickControls2UniversalStyleImpl.so.*
%files -n qt6-quickcontrols2impl-devel
%{_qt6_cmakedir}/Qt6QuickControls2Impl/
+%{_qt6_cmakedir}/Qt6QuickControls2BasicStyleImpl/
+%{_qt6_cmakedir}/Qt6QuickControls2FusionStyleImpl/
+%{_qt6_cmakedir}/Qt6QuickControls2ImagineStyleImpl/
+%{_qt6_cmakedir}/Qt6QuickControls2MaterialStyleImpl/
+%{_qt6_cmakedir}/Qt6QuickControls2UniversalStyleImpl/
+%{_qt6_descriptionsdir}/QuickControls2BasicStyleImpl.json
+%{_qt6_descriptionsdir}/QuickControls2FusionStyleImpl.json
+%{_qt6_descriptionsdir}/QuickControls2ImagineStyleImpl.json
+%{_qt6_descriptionsdir}/QuickControls2MaterialStyleImpl.json
+%{_qt6_descriptionsdir}/QuickControls2UniversalStyleImpl.json
%{_qt6_descriptionsdir}/QuickControls2Impl.json
+%{_qt6_includedir}/QtQuickControls2BasicStyleImpl/
+%{_qt6_includedir}/QtQuickControls2FusionStyleImpl/
+%{_qt6_includedir}/QtQuickControls2ImagineStyleImpl/
%{_qt6_includedir}/QtQuickControls2Impl/
+%{_qt6_includedir}/QtQuickControls2MaterialStyleImpl/
+%{_qt6_includedir}/QtQuickControls2UniversalStyleImpl/
+%{_qt6_libdir}/libQt6QuickControls2BasicStyleImpl.prl
+%{_qt6_libdir}/libQt6QuickControls2BasicStyleImpl.so
+%{_qt6_libdir}/libQt6QuickControls2FusionStyleImpl.prl
+%{_qt6_libdir}/libQt6QuickControls2FusionStyleImpl.so
+%{_qt6_libdir}/libQt6QuickControls2ImagineStyleImpl.prl
+%{_qt6_libdir}/libQt6QuickControls2ImagineStyleImpl.so
%{_qt6_libdir}/libQt6QuickControls2Impl.prl
%{_qt6_libdir}/libQt6QuickControls2Impl.so
+%{_qt6_libdir}/libQt6QuickControls2MaterialStyleImpl.prl
+%{_qt6_libdir}/libQt6QuickControls2MaterialStyleImpl.so
+%{_qt6_libdir}/libQt6QuickControls2UniversalStyleImpl.prl
+%{_qt6_libdir}/libQt6QuickControls2UniversalStyleImpl.so
+%{_qt6_metatypesdir}/qt6quickcontrols2basicstyleimpl_*_metatypes.json
+%{_qt6_metatypesdir}/qt6quickcontrols2fusionstyleimpl_*_metatypes.json
+%{_qt6_metatypesdir}/qt6quickcontrols2imaginestyleimpl_*_metatypes.json
%{_qt6_metatypesdir}/qt6quickcontrols2impl_*.json
+%{_qt6_metatypesdir}/qt6quickcontrols2materialstyleimpl_*_metatypes.json
+%{_qt6_metatypesdir}/qt6quickcontrols2universalstyleimpl_*_metatypes.json
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2basicstyleimpl.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2fusionstyleimpl.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2imaginestyleimpl.pri
%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2impl.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2materialstyleimpl.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2universalstyleimpl.pri
+%{_qt6_pkgconfigdir}/Qt6QuickControls2BasicStyleImpl.pc
+%{_qt6_pkgconfigdir}/Qt6QuickControls2FusionStyleImpl.pc
+%{_qt6_pkgconfigdir}/Qt6QuickControls2ImagineStyleImpl.pc
%{_qt6_pkgconfigdir}/Qt6QuickControls2Impl.pc
+%{_qt6_pkgconfigdir}/Qt6QuickControls2MaterialStyleImpl.pc
+%{_qt6_pkgconfigdir}/Qt6QuickControls2UniversalStyleImpl.pc
+%exclude %{_qt6_includedir}/QtQuickControls2BasicStyleImpl/%{real_version}
+%exclude %{_qt6_includedir}/QtQuickControls2FusionStyleImpl/%{real_version}
%exclude %{_qt6_includedir}/QtQuickControls2Impl/%{real_version}
+%exclude %{_qt6_includedir}/QtQuickControls2MaterialStyleImpl/%{real_version}
+%exclude %{_qt6_includedir}/QtQuickControls2UniversalStyleImpl/%{real_version}
%files -n qt6-quickcontrols2impl-private-devel
+%{_qt6_includedir}/QtQuickControls2BasicStyleImpl/%{real_version}/
+%{_qt6_includedir}/QtQuickControls2FusionStyleImpl/%{real_version}/
%{_qt6_includedir}/QtQuickControls2Impl/%{real_version}/
+%{_qt6_includedir}/QtQuickControls2MaterialStyleImpl/%{real_version}/
+%{_qt6_includedir}/QtQuickControls2UniversalStyleImpl/%{real_version}/
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2basicstyleimpl_private.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2fusionstyleimpl_private.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2imaginestyleimpl_private.pri
%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2impl_private.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2materialstyleimpl_private.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2universalstyleimpl_private.pri
%files -n libQt6QuickDialogs2-6
%{_qt6_libdir}/libQt6QuickDialogs2.so.*
++++++ 0001-Dialogs-Depend-on-controls-styles-in-QuickDialogs2Qu.patch ++++++
++++ 653 lines (skipped)
++++++ 0001-QuickControls-Link-the-impl-libraries-into-the-base-.patch ++++++
>From 123068ed865decef3b0bdfb602d037aced4dcea8 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.herm...@qt.io>
Date: Tue, 30 Jan 2024 13:45:45 +0100
Subject: [PATCH] QuickControls: Link the impl libraries into the base modules
This forces the build system to build them before, making the qmltypes
files available to the base modules' build steps. The linker might even
actually link the libraries and avoid the excessivle plugin loading that
way. To encourage that, also drop the pointless NO_PLUGIN_OPTIONAL.
Task-number: QTBUG-121643
Change-Id: Ifd9082a5927deac8c9d67edf4104338ddaa35aa5
Reviewed-by: Fabian Kosmale <fabian.kosm...@qt.io>
Reviewed-by: Mitch Curtis <mitch.cur...@qt.io>
Reviewed-by: Alexey Edelev <alexey.ede...@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_...@qt-project.org>
(cherry picked from commit 3b01f90fa5fcb7320ce034dc9fe02279012d0b87)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_...@qt-project.org>
(cherry picked from commit 4920a7f763bbda4172eba8bda81aebc47986248f)
---
src/quickcontrols/basic/CMakeLists.txt | 1 +
src/quickcontrols/basic/impl/CMakeLists.txt | 3 +--
src/quickcontrols/fusion/CMakeLists.txt | 1 +
src/quickcontrols/fusion/impl/CMakeLists.txt | 3 +--
src/quickcontrols/imagine/CMakeLists.txt | 1 +
src/quickcontrols/imagine/impl/CMakeLists.txt | 5 ++---
src/quickcontrols/ios/CMakeLists.txt | 3 ++-
src/quickcontrols/ios/impl/CMakeLists.txt | 3 +--
src/quickcontrols/material/CMakeLists.txt | 1 +
src/quickcontrols/material/impl/CMakeLists.txt | 3 +--
src/quickcontrols/universal/CMakeLists.txt | 1 +
src/quickcontrols/universal/impl/CMakeLists.txt | 3 +--
12 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/quickcontrols/basic/CMakeLists.txt
b/src/quickcontrols/basic/CMakeLists.txt
index 4bc75288af..dbe0d3027e 100644
--- a/src/quickcontrols/basic/CMakeLists.txt
+++ b/src/quickcontrols/basic/CMakeLists.txt
@@ -173,6 +173,7 @@ qt_internal_add_qml_module(qtquickcontrols2basicstyleplugin
Qt::CorePrivate
Qt::GuiPrivate
Qt::QmlPrivate
+ Qt::QuickControls2BasicStyleImpl
Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
diff --git a/src/quickcontrols/basic/impl/CMakeLists.txt
b/src/quickcontrols/basic/impl/CMakeLists.txt
index ec79fafdda..61801b0cda 100644
--- a/src/quickcontrols/basic/impl/CMakeLists.txt
+++ b/src/quickcontrols/basic/impl/CMakeLists.txt
@@ -5,12 +5,11 @@
## qtquickcontrols2basicstyleimplplugin Plugin:
#####################################################################
-qt_internal_add_qml_module(qtquickcontrols2basicstyleimplplugin
+qt_internal_add_qml_module(QuickControls2BasicStyleImpl
URI "QtQuick.Controls.Basic.impl"
VERSION "${PROJECT_VERSION}"
CLASS_NAME QtQuickControls2BasicStyleImplPlugin
PLUGIN_TARGET qtquickcontrols2basicstyleimplplugin
- NO_PLUGIN_OPTIONAL
SOURCES
qquickbasicbusyindicator.cpp qquickbasicbusyindicator_p.h
qquickbasicdial.cpp qquickbasicdial_p.h
diff --git a/src/quickcontrols/fusion/CMakeLists.txt
b/src/quickcontrols/fusion/CMakeLists.txt
index 69f8f5f96d..2bb6d98a44 100644
--- a/src/quickcontrols/fusion/CMakeLists.txt
+++ b/src/quickcontrols/fusion/CMakeLists.txt
@@ -117,6 +117,7 @@ qt_internal_add_qml_module(qtquickcontrols2fusionstyleplugin
Qt::CorePrivate
Qt::GuiPrivate
Qt::QmlPrivate
+ Qt::QuickControls2FusionStyleImpl
Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
diff --git a/src/quickcontrols/fusion/impl/CMakeLists.txt
b/src/quickcontrols/fusion/impl/CMakeLists.txt
index e52f1ecc06..64ee4851fb 100644
--- a/src/quickcontrols/fusion/impl/CMakeLists.txt
+++ b/src/quickcontrols/fusion/impl/CMakeLists.txt
@@ -14,7 +14,7 @@ set(qml_files
"SwitchIndicator.qml"
)
-qt_internal_add_qml_module(qtquickcontrols2fusionstyleimplplugin
+qt_internal_add_qml_module(QuickControls2FusionStyleImpl
URI "QtQuick.Controls.Fusion.impl"
VERSION "${PROJECT_VERSION}"
PAST_MAJOR_VERSIONS 2
@@ -22,7 +22,6 @@
qt_internal_add_qml_module(qtquickcontrols2fusionstyleimplplugin
DEPENDENCIES
QtQuick/auto
PLUGIN_TARGET qtquickcontrols2fusionstyleimplplugin
- NO_PLUGIN_OPTIONAL
SOURCES
qquickfusionbusyindicator.cpp qquickfusionbusyindicator_p.h
qquickfusiondial.cpp qquickfusiondial_p.h
diff --git a/src/quickcontrols/imagine/CMakeLists.txt
b/src/quickcontrols/imagine/CMakeLists.txt
index e4a164add2..4ef398e0fb 100644
--- a/src/quickcontrols/imagine/CMakeLists.txt
+++ b/src/quickcontrols/imagine/CMakeLists.txt
@@ -108,6 +108,7 @@
qt_internal_add_qml_module(qtquickcontrols2imaginestyleplugin
Qt::CorePrivate
Qt::GuiPrivate
Qt::QmlPrivate
+ Qt::QuickControls2ImagineStyleImpl
Qt::QuickControls2ImplPrivate
Qt::QuickControls2Private
Qt::QuickPrivate
diff --git a/src/quickcontrols/imagine/impl/CMakeLists.txt
b/src/quickcontrols/imagine/impl/CMakeLists.txt
index d988a976a6..5dd12b5de5 100644
--- a/src/quickcontrols/imagine/impl/CMakeLists.txt
+++ b/src/quickcontrols/imagine/impl/CMakeLists.txt
@@ -9,12 +9,11 @@ set(qml_files
"OpacityMask.qml"
)
-qt_internal_add_qml_module(qtquickcontrols2imaginestyleimplplugin
+qt_internal_add_qml_module(QuickControls2ImagineStyleImpl
URI "QtQuick.Controls.Imagine.impl"
VERSION "${PROJECT_VERSION}"
CLASS_NAME QtQuickControls2ImagineStyleImplPlugin
PLUGIN_TARGET qtquickcontrols2imaginestyleimplplugin
- NO_PLUGIN_OPTIONAL
QML_FILES
${qml_files}
IMPORTS
@@ -31,7 +30,7 @@
qt_internal_add_qml_module(qtquickcontrols2imaginestyleimplplugin
Qt::QuickTemplates2Private
)
-qt_internal_add_shaders(qtquickcontrols2imaginestyleimplplugin
"qtquickcontrols2imaginestyleimplplugin_shaders"
+qt_internal_add_shaders(QuickControls2ImagineStyleImpl
"qtquickcontrols2imaginestyleimplplugin_shaders"
SILENT
BATCHABLE
PRECOMPILE
diff --git a/src/quickcontrols/ios/CMakeLists.txt
b/src/quickcontrols/ios/CMakeLists.txt
index bb38601e8b..c4c827677a 100644
--- a/src/quickcontrols/ios/CMakeLists.txt
+++ b/src/quickcontrols/ios/CMakeLists.txt
@@ -79,10 +79,11 @@ qt_internal_add_qml_module(qtquickcontrols2iosstyleplugin
Qt::CorePrivate
Qt::GuiPrivate
Qt::QmlPrivate
+ Qt::QuickControls2IOSStyleImpl
+ Qt::QuickControls2ImplPrivate
Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
- Qt::QuickControls2ImplPrivate
)
qt_internal_extend_target(qtquickcontrols2iosstyleplugin CONDITION APPLE AND
IOS
diff --git a/src/quickcontrols/ios/impl/CMakeLists.txt
b/src/quickcontrols/ios/impl/CMakeLists.txt
index 48727e8dcb..a19704ad11 100644
--- a/src/quickcontrols/ios/impl/CMakeLists.txt
+++ b/src/quickcontrols/ios/impl/CMakeLists.txt
@@ -10,11 +10,10 @@ set(qml_files
"DialogButtonBoxDelegate.qml"
)
-qt_internal_add_qml_module(qtquickcontrols2iosstyleimplplugin
+qt_internal_add_qml_module(QuickControls2IOSStyleImpl
URI "QtQuick.Controls.iOS.impl"
VERSION "${PROJECT_VERSION}"
PLUGIN_TARGET qtquickcontrols2iosstyleimplplugin
- NO_PLUGIN_OPTIONAL
SOURCES
qquickiosstyle.cpp qquickiosstyle_p.h
qquickioscursorflashtimer_p.h qquickioscursorflashtimer.cpp
diff --git a/src/quickcontrols/material/CMakeLists.txt
b/src/quickcontrols/material/CMakeLists.txt
index d6be8a7892..a52c053af6 100644
--- a/src/quickcontrols/material/CMakeLists.txt
+++ b/src/quickcontrols/material/CMakeLists.txt
@@ -120,6 +120,7 @@
qt_internal_add_qml_module(qtquickcontrols2materialstyleplugin
Qt::GuiPrivate
Qt::QmlPrivate
Qt::QuickControls2ImplPrivate
+ Qt::QuickControls2MaterialStyleImpl
Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
diff --git a/src/quickcontrols/material/impl/CMakeLists.txt
b/src/quickcontrols/material/impl/CMakeLists.txt
index abae353f44..37e074b737 100644
--- a/src/quickcontrols/material/impl/CMakeLists.txt
+++ b/src/quickcontrols/material/impl/CMakeLists.txt
@@ -17,7 +17,7 @@ set(qml_files
"SwitchIndicator.qml"
)
-qt_internal_add_qml_module(qtquickcontrols2materialstyleimplplugin
+qt_internal_add_qml_module(QuickControls2MaterialStyleImpl
URI "QtQuick.Controls.Material.impl"
VERSION "${PROJECT_VERSION}"
PAST_MAJOR_VERSIONS 2
@@ -25,7 +25,6 @@
qt_internal_add_qml_module(qtquickcontrols2materialstyleimplplugin
DEPENDENCIES
QtQuick/auto
PLUGIN_TARGET qtquickcontrols2materialstyleimplplugin
- NO_PLUGIN_OPTIONAL
SOURCES
qquickmaterialbusyindicator.cpp qquickmaterialbusyindicator_p.h
qquickmaterialplaceholdertext.cpp qquickmaterialplaceholdertext_p.h
diff --git a/src/quickcontrols/universal/CMakeLists.txt
b/src/quickcontrols/universal/CMakeLists.txt
index 6f5dc1bb25..ee03b8595f 100644
--- a/src/quickcontrols/universal/CMakeLists.txt
+++ b/src/quickcontrols/universal/CMakeLists.txt
@@ -119,6 +119,7 @@
qt_internal_add_qml_module(qtquickcontrols2universalstyleplugin
Qt::QmlPrivate
Qt::QuickControls2ImplPrivate
Qt::QuickControls2Private
+ Qt::QuickControls2UniversalStyleImpl
Qt::QuickPrivate
Qt::QuickTemplates2Private
)
diff --git a/src/quickcontrols/universal/impl/CMakeLists.txt
b/src/quickcontrols/universal/impl/CMakeLists.txt
index 078e42e217..3bbd8e5b21 100644
--- a/src/quickcontrols/universal/impl/CMakeLists.txt
+++ b/src/quickcontrols/universal/impl/CMakeLists.txt
@@ -11,7 +11,7 @@ set(qml_files
"SwitchIndicator.qml"
)
-qt_internal_add_qml_module(qtquickcontrols2universalstyleimplplugin
+qt_internal_add_qml_module(QuickControls2UniversalStyleImpl
URI "QtQuick.Controls.Universal.impl"
VERSION "${PROJECT_VERSION}"
PAST_MAJOR_VERSIONS 2
@@ -19,7 +19,6 @@
qt_internal_add_qml_module(qtquickcontrols2universalstyleimplplugin
DEPENDENCIES
QtQuick/auto
PLUGIN_TARGET qtquickcontrols2universalstyleimplplugin
- NO_PLUGIN_OPTIONAL
SOURCES
qquickuniversalbusyindicator.cpp qquickuniversalbusyindicator_p.h
qquickuniversalfocusrectangle.cpp qquickuniversalfocusrectangle_p.h
--
2.43.0
++++++ qtdeclarative-everywhere-src-6.6.1.tar.xz ->
qtdeclarative-everywhere-src-6.6.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/qt6-declarative/qtdeclarative-everywhere-src-6.6.1.tar.xz
/work/SRC/openSUSE:Factory/.qt6-declarative.new.1815/qtdeclarative-everywhere-src-6.6.2.tar.xz
differ: char 26, line 1
