From ca58db13c3237159ea8019f538e6cdb36cf89d3434bc09d4deceba43e845ba73 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Tue, 26 Mar 2024 22:00:44 +0000 Subject: [PATCH] Qt 6.6.3. Not built yet OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-declarative?expand=0&rev=65 --- ...n-controls-styles-in-QuickDialogs2Qu.patch | 652 ------------------ ...nk-the-impl-libraries-into-the-base-.patch | 239 ------- qt6-declarative.changes | 9 + qt6-declarative.spec | 7 +- qtdeclarative-everywhere-src-6.6.2.tar.xz | 3 - qtdeclarative-everywhere-src-6.6.3.tar.xz | 3 + 6 files changed, 14 insertions(+), 899 deletions(-) delete mode 100644 0001-Dialogs-Depend-on-controls-styles-in-QuickDialogs2Qu.patch delete mode 100644 0001-QuickControls-Link-the-impl-libraries-into-the-base-.patch delete mode 100644 qtdeclarative-everywhere-src-6.6.2.tar.xz create mode 100644 qtdeclarative-everywhere-src-6.6.3.tar.xz diff --git a/0001-Dialogs-Depend-on-controls-styles-in-QuickDialogs2Qu.patch b/0001-Dialogs-Depend-on-controls-styles-in-QuickDialogs2Qu.patch deleted file mode 100644 index 964b826..0000000 --- a/0001-Dialogs-Depend-on-controls-styles-in-QuickDialogs2Qu.patch +++ /dev/null @@ -1,652 +0,0 @@ -From 20aaab899b791aca0413255dca149275f7a01ea2 Mon Sep 17 00:00:00 2001 -From: Ulf Hermann -Date: Thu, 1 Feb 2024 13:09:22 +0100 -Subject: [PATCH] Dialogs: Depend on controls styles in QuickDialogs2QuickImpl - -This forces them to be built before, making their qmltypes available to -the subsequent build steps. Having the styles as linkable backing -libraries also makes their C++ types available to qmlsc's direct mode. - -Task-number: QTBUG-121643 -Change-Id: I24688b325d27f16e7cc77219cf481b3b30ca52a3 -Reviewed-by: Fabian Kosmale -(cherry picked from commit 9859107081b2af18b2964d6e22e3c425ff4e7cdf) -Reviewed-by: Mitch Curtis -(cherry picked from commit b116d89a1edb77b7bb051c11e5c49188b17c5573) -Reviewed-by: Qt Cherry-pick Bot ---- - src/quickcontrols/basic/CMakeLists.txt | 24 +++++++++++++------ - src/quickcontrols/basic/qquickbasicstyle_p.h | 4 ++-- - src/quickcontrols/basic/qquickbasictheme_p.h | 4 ++-- - .../qtquickcontrols2basicstyleplugin.cpp | 1 - - src/quickcontrols/fusion/CMakeLists.txt | 20 ++++++++++++---- - .../fusion/qquickfusionstyle_p.h | 6 +++-- - .../fusion/qquickfusiontheme_p.h | 4 ++-- - .../qtquickcontrols2fusionstyleplugin.cpp | 1 - - src/quickcontrols/imagine/CMakeLists.txt | 24 +++++++++++++------ - .../imagine/qquickimaginestyle_p.h | 3 ++- - .../imagine/qquickimaginetheme_p.h | 4 ++-- - .../qtquickcontrols2imaginestyleplugin.cpp | 1 - - src/quickcontrols/material/CMakeLists.txt | 22 ++++++++++++----- - .../material/qquickmaterialstyle_p.h | 3 ++- - .../material/qquickmaterialtheme_p.h | 4 ++-- - .../qtquickcontrols2materialstyleplugin.cpp | 2 -- - src/quickcontrols/qquickstyleplugin_p.h | 1 - - src/quickcontrols/universal/CMakeLists.txt | 20 ++++++++++++---- - .../universal/qquickuniversalstyle_p.h | 3 ++- - .../universal/qquickuniversaltheme_p.h | 4 ++-- - .../qtquickcontrols2universalstyleplugin.cpp | 1 - - .../quickdialogsquickimpl/CMakeLists.txt | 24 ++++++++++++++++--- - 22 files changed, 123 insertions(+), 57 deletions(-) - -diff --git a/src/quickcontrols/basic/CMakeLists.txt b/src/quickcontrols/basic/CMakeLists.txt -index dbe0d3027e..12404f0851 100644 ---- a/src/quickcontrols/basic/CMakeLists.txt -+++ b/src/quickcontrols/basic/CMakeLists.txt -@@ -148,7 +148,9 @@ if (QT_FEATURE_quicktemplates2_calendar) - ) - endif() - --qt_internal_add_qml_module(qtquickcontrols2basicstyleplugin -+add_subdirectory(impl) -+ -+qt_internal_add_qml_module(QuickControls2Basic - URI "QtQuick.Controls.Basic" - VERSION "${PROJECT_VERSION}" - PAST_MAJOR_VERSIONS 2 -@@ -163,7 +165,6 @@ qt_internal_add_qml_module(qtquickcontrols2basicstyleplugin - SOURCES - qquickbasicstyle.cpp qquickbasicstyle_p.h - qquickbasictheme.cpp qquickbasictheme_p.h -- qtquickcontrols2basicstyleplugin.cpp - QML_FILES - ${qml_files} - DEFINES -@@ -177,10 +178,21 @@ qt_internal_add_qml_module(qtquickcontrols2basicstyleplugin - Qt::QuickControls2Private - Qt::QuickPrivate - Qt::QuickTemplates2Private -+ GENERATE_CPP_EXPORTS -+) -+ -+target_sources(qtquickcontrols2basicstyleplugin -+ PRIVATE -+ qtquickcontrols2basicstyleplugin.cpp -+) -+ -+target_link_libraries(qtquickcontrols2basicstyleplugin -+ PRIVATE -+ Qt::QuickControls2Private - ) - - # Resources: --set(qtquickcontrols2basicstyleplugin_resource_files -+set(qtquickcontrols2basicstyle_resource_files - "images/arrow-indicator.png" - "images/arrow-indicator@2x.png" - "images/arrow-indicator@3x.png" -@@ -203,14 +215,12 @@ set(qtquickcontrols2basicstyleplugin_resource_files - "images/drop-indicator@4x.png" - ) - --qt_internal_add_resource(qtquickcontrols2basicstyleplugin "qtquickcontrols2basicstyleplugin" -+qt_internal_add_resource(QuickControls2Basic "qtquickcontrols2basicstyle" - PREFIX - "/qt-project.org/imports/QtQuick/Controls/Basic" - FILES -- ${qtquickcontrols2basicstyleplugin_resource_files} -+ ${qtquickcontrols2basicstyle_resource_files} - ) - --add_subdirectory(impl) -- - _qt_internal_add_qml_static_plugin_dependency(qtquickcontrols2basicstyleplugin - qtquickcontrols2basicstyleimplplugin) -diff --git a/src/quickcontrols/basic/qquickbasicstyle_p.h b/src/quickcontrols/basic/qquickbasicstyle_p.h -index f543d27e47..00d90612c8 100644 ---- a/src/quickcontrols/basic/qquickbasicstyle_p.h -+++ b/src/quickcontrols/basic/qquickbasicstyle_p.h -@@ -18,11 +18,11 @@ - #include - #include - #include --#include -+#include - - QT_BEGIN_NAMESPACE - --class QQuickBasicStyle : public QObject -+class Q_QUICKCONTROLS2BASIC_EXPORT QQuickBasicStyle : public QObject - { - Q_OBJECT - Q_PROPERTY(QColor backgroundColor READ backgroundColor CONSTANT FINAL) -diff --git a/src/quickcontrols/basic/qquickbasictheme_p.h b/src/quickcontrols/basic/qquickbasictheme_p.h -index 710c57f074..bcedee2a12 100644 ---- a/src/quickcontrols/basic/qquickbasictheme_p.h -+++ b/src/quickcontrols/basic/qquickbasictheme_p.h -@@ -15,13 +15,13 @@ - // We mean it. - // - --#include -+#include - - QT_BEGIN_NAMESPACE - - class QQuickTheme; - --class QQuickBasicTheme -+class Q_QUICKCONTROLS2BASIC_EXPORT QQuickBasicTheme - { - public: - static void initialize(QQuickTheme *theme); -diff --git a/src/quickcontrols/basic/qtquickcontrols2basicstyleplugin.cpp b/src/quickcontrols/basic/qtquickcontrols2basicstyleplugin.cpp -index 57c52fff27..e2d726082b 100644 ---- a/src/quickcontrols/basic/qtquickcontrols2basicstyleplugin.cpp -+++ b/src/quickcontrols/basic/qtquickcontrols2basicstyleplugin.cpp -@@ -5,7 +5,6 @@ - #include "qquickbasictheme_p.h" - - #include --#include - - QT_BEGIN_NAMESPACE - -diff --git a/src/quickcontrols/fusion/CMakeLists.txt b/src/quickcontrols/fusion/CMakeLists.txt -index 2bb6d98a44..572a3cf931 100644 ---- a/src/quickcontrols/fusion/CMakeLists.txt -+++ b/src/quickcontrols/fusion/CMakeLists.txt -@@ -92,7 +92,9 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES - QT_QML_SOURCE_VERSIONS "2.15;6.0" - ) - --qt_internal_add_qml_module(qtquickcontrols2fusionstyleplugin -+add_subdirectory(impl) -+ -+qt_internal_add_qml_module(QuickControls2Fusion - URI "QtQuick.Controls.Fusion" - VERSION "${PROJECT_VERSION}" - PAST_MAJOR_VERSIONS 2 -@@ -107,7 +109,6 @@ qt_internal_add_qml_module(qtquickcontrols2fusionstyleplugin - SOURCES - qquickfusionstyle.cpp qquickfusionstyle_p.h - qquickfusiontheme.cpp qquickfusiontheme_p.h -- qtquickcontrols2fusionstyleplugin.cpp - QML_FILES - ${qml_files} - DEFINES -@@ -121,9 +122,20 @@ qt_internal_add_qml_module(qtquickcontrols2fusionstyleplugin - Qt::QuickControls2Private - Qt::QuickPrivate - Qt::QuickTemplates2Private -+ GENERATE_CPP_EXPORTS -+) -+ -+target_sources(qtquickcontrols2fusionstyleplugin -+ PRIVATE -+ qtquickcontrols2fusionstyleplugin.cpp - ) - --qt_internal_add_resource(qtquickcontrols2fusionstyleplugin "qtquickcontrols2fusionstyle" -+target_link_libraries(qtquickcontrols2fusionstyleplugin -+ PRIVATE -+ Qt::QuickControls2Private -+) -+ -+qt_internal_add_resource(QuickControls2Fusion "qtquickcontrols2fusionstyle" - PREFIX - "/qt-project.org/imports/QtQuick/Controls/Fusion" - FILES -@@ -141,8 +153,6 @@ qt_internal_add_resource(qtquickcontrols2fusionstyleplugin "qtquickcontrols2fusi - "images/progressmask@4x.png" - ) - --add_subdirectory(impl) -- - _qt_internal_add_qml_static_plugin_dependency(qtquickcontrols2fusionstyleplugin quickwindow) - _qt_internal_add_qml_static_plugin_dependency(qtquickcontrols2fusionstyleplugin - qtquickcontrols2fusionstyleimplplugin) -diff --git a/src/quickcontrols/fusion/qquickfusionstyle_p.h b/src/quickcontrols/fusion/qquickfusionstyle_p.h -index f31f8cfc52..47fdd77fd7 100644 ---- a/src/quickcontrols/fusion/qquickfusionstyle_p.h -+++ b/src/quickcontrols/fusion/qquickfusionstyle_p.h -@@ -18,11 +18,13 @@ - #include - #include - #include --#include -+#include - - QT_BEGIN_NAMESPACE - --class QQuickFusionStyle : public QObject -+class QQuickPalette; -+ -+class Q_QUICKCONTROLS2FUSION_EXPORT QQuickFusionStyle : public QObject - { - Q_OBJECT - Q_PROPERTY(QColor lightShade READ lightShade CONSTANT FINAL) -diff --git a/src/quickcontrols/fusion/qquickfusiontheme_p.h b/src/quickcontrols/fusion/qquickfusiontheme_p.h -index a41c9d7315..b60521394c 100644 ---- a/src/quickcontrols/fusion/qquickfusiontheme_p.h -+++ b/src/quickcontrols/fusion/qquickfusiontheme_p.h -@@ -15,13 +15,13 @@ - // We mean it. - // - --#include -+#include - - QT_BEGIN_NAMESPACE - - class QQuickTheme; - --class QQuickFusionTheme -+class Q_QUICKCONTROLS2FUSION_EXPORT QQuickFusionTheme - { - public: - static void initialize(QQuickTheme *theme); -diff --git a/src/quickcontrols/fusion/qtquickcontrols2fusionstyleplugin.cpp b/src/quickcontrols/fusion/qtquickcontrols2fusionstyleplugin.cpp -index 532d7597ce..f61dafa478 100644 ---- a/src/quickcontrols/fusion/qtquickcontrols2fusionstyleplugin.cpp -+++ b/src/quickcontrols/fusion/qtquickcontrols2fusionstyleplugin.cpp -@@ -6,7 +6,6 @@ - - #include - #include --#include - - QT_BEGIN_NAMESPACE - -diff --git a/src/quickcontrols/imagine/CMakeLists.txt b/src/quickcontrols/imagine/CMakeLists.txt -index 4ef398e0fb..a029e09e82 100644 ---- a/src/quickcontrols/imagine/CMakeLists.txt -+++ b/src/quickcontrols/imagine/CMakeLists.txt -@@ -85,7 +85,9 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES - QT_QML_SOURCE_VERSIONS "2.15;6.0" - ) - --qt_internal_add_qml_module(qtquickcontrols2imaginestyleplugin -+add_subdirectory(impl) -+ -+qt_internal_add_qml_module(QuickControls2Imagine - URI "QtQuick.Controls.Imagine" - VERSION "${PROJECT_VERSION}" - PAST_MAJOR_VERSIONS 2 -@@ -98,7 +100,6 @@ qt_internal_add_qml_module(qtquickcontrols2imaginestyleplugin - SOURCES - qquickimaginestyle.cpp qquickimaginestyle_p.h - qquickimaginetheme.cpp qquickimaginetheme_p.h -- qtquickcontrols2imaginestyleplugin.cpp - QML_FILES - ${qml_files} - DEFINES -@@ -113,6 +114,17 @@ qt_internal_add_qml_module(qtquickcontrols2imaginestyleplugin - Qt::QuickControls2Private - Qt::QuickPrivate - Qt::QuickTemplates2Private -+ GENERATE_CPP_EXPORTS -+) -+ -+target_sources(qtquickcontrols2imaginestyleplugin -+ PRIVATE -+ qtquickcontrols2imaginestyleplugin.cpp -+) -+ -+target_link_libraries(qtquickcontrols2imaginestyleplugin -+ PRIVATE -+ Qt::QuickControls2Private - ) - - file(GLOB resource_glob_0 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "images/*.png") -@@ -126,20 +138,18 @@ foreach(file IN LISTS resource_glob_1) - endforeach() - - # Resources: --set(qmake_qtquickcontrols2imaginestyleplugin_resource_files -+set(qmake_qtquickcontrols2imaginestyle_resource_files - ${resource_glob_0} - ${resource_glob_1} - ) - --qt_internal_add_resource(qtquickcontrols2imaginestyleplugin "qmake_qtquickcontrols2imaginestyleplugin" -+qt_internal_add_resource(QuickControls2Imagine "qmake_qtquickcontrols2imaginestyle" - PREFIX - "/qt-project.org/imports/QtQuick/Controls/Imagine" - FILES -- ${qmake_qtquickcontrols2imaginestyleplugin_resource_files} -+ ${qmake_qtquickcontrols2imaginestyle_resource_files} - ) - --add_subdirectory(impl) -- - _qt_internal_add_qml_static_plugin_dependency(qtquickcontrols2imaginestyleplugin quickwindow) - _qt_internal_add_qml_static_plugin_dependency(qtquickcontrols2imaginestyleplugin - qtquickcontrols2imaginestyleimplplugin) -diff --git a/src/quickcontrols/imagine/qquickimaginestyle_p.h b/src/quickcontrols/imagine/qquickimaginestyle_p.h -index 81f17fb58c..9d8f3d983a 100644 ---- a/src/quickcontrols/imagine/qquickimaginestyle_p.h -+++ b/src/quickcontrols/imagine/qquickimaginestyle_p.h -@@ -18,10 +18,11 @@ - #include - #include - #include -+#include - - QT_BEGIN_NAMESPACE - --class QQuickImagineStyle : public QQuickAttachedPropertyPropagator -+class Q_QUICKCONTROLS2IMAGINE_EXPORT QQuickImagineStyle : public QQuickAttachedPropertyPropagator - { - Q_OBJECT - Q_PROPERTY(QString path READ path WRITE setPath RESET resetPath NOTIFY pathChanged FINAL) -diff --git a/src/quickcontrols/imagine/qquickimaginetheme_p.h b/src/quickcontrols/imagine/qquickimaginetheme_p.h -index 93b3063b78..522c99727b 100644 ---- a/src/quickcontrols/imagine/qquickimaginetheme_p.h -+++ b/src/quickcontrols/imagine/qquickimaginetheme_p.h -@@ -15,13 +15,13 @@ - // We mean it. - // - --#include -+#include - - QT_BEGIN_NAMESPACE - - class QQuickTheme; - --class QQuickImagineTheme -+class Q_QUICKCONTROLS2IMAGINE_EXPORT QQuickImagineTheme - { - public: - static void initialize(QQuickTheme *theme); -diff --git a/src/quickcontrols/imagine/qtquickcontrols2imaginestyleplugin.cpp b/src/quickcontrols/imagine/qtquickcontrols2imaginestyleplugin.cpp -index ddf3927562..80949ff648 100644 ---- a/src/quickcontrols/imagine/qtquickcontrols2imaginestyleplugin.cpp -+++ b/src/quickcontrols/imagine/qtquickcontrols2imaginestyleplugin.cpp -@@ -7,7 +7,6 @@ - #include - #include - #include --#include - - QT_BEGIN_NAMESPACE - -diff --git a/src/quickcontrols/material/CMakeLists.txt b/src/quickcontrols/material/CMakeLists.txt -index a52c053af6..a427b3711c 100644 ---- a/src/quickcontrols/material/CMakeLists.txt -+++ b/src/quickcontrols/material/CMakeLists.txt -@@ -94,7 +94,9 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES - QT_QML_SOURCE_VERSIONS "2.15;6.0" - ) - --qt_internal_add_qml_module(qtquickcontrols2materialstyleplugin -+add_subdirectory(impl) -+ -+qt_internal_add_qml_module(QuickControls2Material - URI "QtQuick.Controls.Material" - VERSION "${PROJECT_VERSION}" - PAST_MAJOR_VERSIONS 2 -@@ -109,7 +111,6 @@ qt_internal_add_qml_module(qtquickcontrols2materialstyleplugin - SOURCES - qquickmaterialstyle.cpp qquickmaterialstyle_p.h - qquickmaterialtheme.cpp qquickmaterialtheme_p.h -- qtquickcontrols2materialstyleplugin.cpp - QML_FILES - ${qml_files} - DEFINES -@@ -124,9 +125,20 @@ qt_internal_add_qml_module(qtquickcontrols2materialstyleplugin - Qt::QuickControls2Private - Qt::QuickPrivate - Qt::QuickTemplates2Private -+ GENERATE_CPP_EXPORTS -+) -+ -+target_sources(qtquickcontrols2materialstyleplugin -+ PRIVATE -+ qtquickcontrols2materialstyleplugin.cpp - ) - --qt_internal_add_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialstyleplugin" -+target_link_libraries(qtquickcontrols2materialstyleplugin -+ PRIVATE -+ Qt::QuickControls2Private -+) -+ -+qt_internal_add_resource(QuickControls2Material "qtquickcontrols2materialstyle" - PREFIX - "/qt-project.org/imports/QtQuick/Controls/Material" - FILES -@@ -144,7 +156,7 @@ qt_internal_add_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2ma - "images/drop-indicator@4x.png" - ) - --qt_internal_add_shaders(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialstyleplugin_shaders" -+qt_internal_add_shaders(QuickControls2Material "qtquickcontrols2materialstyle_shaders" - SILENT - BATCHABLE - PRECOMPILE -@@ -155,8 +167,6 @@ qt_internal_add_shaders(qtquickcontrols2materialstyleplugin "qtquickcontrols2mat - "shaders/RectangularGlow.frag" - ) - --add_subdirectory(impl) -- - _qt_internal_add_qml_static_plugin_dependency(qtquickcontrols2materialstyleplugin quickwindow) - _qt_internal_add_qml_static_plugin_dependency(qtquickcontrols2materialstyleplugin - qtquickcontrols2materialstyleimplplugin) -diff --git a/src/quickcontrols/material/qquickmaterialstyle_p.h b/src/quickcontrols/material/qquickmaterialstyle_p.h -index 5ff27f532e..f7c2b256ba 100644 ---- a/src/quickcontrols/material/qquickmaterialstyle_p.h -+++ b/src/quickcontrols/material/qquickmaterialstyle_p.h -@@ -18,10 +18,11 @@ - #include - #include - #include -+#include - - QT_BEGIN_NAMESPACE - --class QQuickMaterialStyle : public QQuickAttachedPropertyPropagator -+class Q_QUICKCONTROLS2MATERIAL_EXPORT QQuickMaterialStyle : public QQuickAttachedPropertyPropagator - { - Q_OBJECT - Q_PROPERTY(Theme theme READ theme WRITE setTheme RESET resetTheme NOTIFY themeChanged FINAL) -diff --git a/src/quickcontrols/material/qquickmaterialtheme_p.h b/src/quickcontrols/material/qquickmaterialtheme_p.h -index 893f441c86..bdaecd1a87 100644 ---- a/src/quickcontrols/material/qquickmaterialtheme_p.h -+++ b/src/quickcontrols/material/qquickmaterialtheme_p.h -@@ -15,13 +15,13 @@ - // We mean it. - // - --#include -+#include - - QT_BEGIN_NAMESPACE - - class QQuickTheme; - --class QQuickMaterialTheme -+class Q_QUICKCONTROLS2MATERIAL_EXPORT QQuickMaterialTheme - { - public: - static void initialize(QQuickTheme *theme); -diff --git a/src/quickcontrols/material/qtquickcontrols2materialstyleplugin.cpp b/src/quickcontrols/material/qtquickcontrols2materialstyleplugin.cpp -index 10aa64b8cf..4911a3e0f2 100644 ---- a/src/quickcontrols/material/qtquickcontrols2materialstyleplugin.cpp -+++ b/src/quickcontrols/material/qtquickcontrols2materialstyleplugin.cpp -@@ -5,8 +5,6 @@ - #include "qquickmaterialtheme_p.h" - - #include --#include --#include - - QT_BEGIN_NAMESPACE - -diff --git a/src/quickcontrols/qquickstyleplugin_p.h b/src/quickcontrols/qquickstyleplugin_p.h -index d0f690205c..5458892511 100644 ---- a/src/quickcontrols/qquickstyleplugin_p.h -+++ b/src/quickcontrols/qquickstyleplugin_p.h -@@ -17,7 +17,6 @@ - - #include - #include --#include - - QT_BEGIN_NAMESPACE - -diff --git a/src/quickcontrols/universal/CMakeLists.txt b/src/quickcontrols/universal/CMakeLists.txt -index ee03b8595f..b9ab5d9aaa 100644 ---- a/src/quickcontrols/universal/CMakeLists.txt -+++ b/src/quickcontrols/universal/CMakeLists.txt -@@ -92,7 +92,9 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES - QT_QML_SOURCE_VERSIONS "2.15;6.0" - ) - --qt_internal_add_qml_module(qtquickcontrols2universalstyleplugin -+add_subdirectory(impl) -+ -+qt_internal_add_qml_module(QuickControls2Universal - URI "QtQuick.Controls.Universal" - VERSION "${PROJECT_VERSION}" - PAST_MAJOR_VERSIONS 2 -@@ -107,7 +109,6 @@ qt_internal_add_qml_module(qtquickcontrols2universalstyleplugin - SOURCES - qquickuniversalstyle.cpp qquickuniversalstyle_p.h - qquickuniversaltheme.cpp qquickuniversaltheme_p.h -- qtquickcontrols2universalstyleplugin.cpp - QML_FILES - ${qml_files} - DEFINES -@@ -122,9 +123,20 @@ qt_internal_add_qml_module(qtquickcontrols2universalstyleplugin - Qt::QuickControls2UniversalStyleImpl - Qt::QuickPrivate - Qt::QuickTemplates2Private -+ GENERATE_CPP_EXPORTS -+) -+ -+target_sources(qtquickcontrols2universalstyleplugin -+ PRIVATE -+ qtquickcontrols2universalstyleplugin.cpp - ) - --qt_internal_add_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universalstyleplugin" -+target_link_libraries(qtquickcontrols2universalstyleplugin -+ PRIVATE -+ Qt::QuickControls2Private -+) -+ -+qt_internal_add_resource(QuickControls2Universal "qtquickcontrols2universalstyle" - PREFIX - "/qt-project.org/imports/QtQuick/Controls/Universal" - FILES -@@ -146,8 +158,6 @@ qt_internal_add_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2u - "images/rightarrow@4x.png" - ) - --add_subdirectory(impl) -- - _qt_internal_add_qml_static_plugin_dependency(qtquickcontrols2universalstyleplugin quickwindow) - _qt_internal_add_qml_static_plugin_dependency(qtquickcontrols2universalstyleplugin - qtquickcontrols2universalstyleimplplugin) -diff --git a/src/quickcontrols/universal/qquickuniversalstyle_p.h b/src/quickcontrols/universal/qquickuniversalstyle_p.h -index 024fde2192..c97483a5bc 100644 ---- a/src/quickcontrols/universal/qquickuniversalstyle_p.h -+++ b/src/quickcontrols/universal/qquickuniversalstyle_p.h -@@ -18,12 +18,13 @@ - #include - #include - #include -+#include - - QT_BEGIN_NAMESPACE - - class QQuickUniversalStylePrivate; - --class QQuickUniversalStyle : public QQuickAttachedPropertyPropagator -+class Q_QUICKCONTROLS2UNIVERSAL_EXPORT QQuickUniversalStyle : public QQuickAttachedPropertyPropagator - { - Q_OBJECT - Q_PROPERTY(Theme theme READ theme WRITE setTheme RESET resetTheme NOTIFY themeChanged FINAL) -diff --git a/src/quickcontrols/universal/qquickuniversaltheme_p.h b/src/quickcontrols/universal/qquickuniversaltheme_p.h -index 84789c5da1..77373aa6b9 100644 ---- a/src/quickcontrols/universal/qquickuniversaltheme_p.h -+++ b/src/quickcontrols/universal/qquickuniversaltheme_p.h -@@ -15,13 +15,13 @@ - // We mean it. - // - --#include -+#include - - QT_BEGIN_NAMESPACE - - class QQuickTheme; - --class QQuickUniversalTheme -+class Q_QUICKCONTROLS2UNIVERSAL_EXPORT QQuickUniversalTheme - { - public: - static void initialize(QQuickTheme *theme); -diff --git a/src/quickcontrols/universal/qtquickcontrols2universalstyleplugin.cpp b/src/quickcontrols/universal/qtquickcontrols2universalstyleplugin.cpp -index 683c966833..4bdb1216b6 100644 ---- a/src/quickcontrols/universal/qtquickcontrols2universalstyleplugin.cpp -+++ b/src/quickcontrols/universal/qtquickcontrols2universalstyleplugin.cpp -@@ -5,7 +5,6 @@ - #include "qquickuniversaltheme_p.h" - - #include --#include - - QT_BEGIN_NAMESPACE - -diff --git a/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt b/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt -index 224260f14a..ea4a176633 100644 ---- a/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt -+++ b/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt -@@ -101,12 +101,12 @@ qt_internal_add_qml_module(QuickDialogs2QuickImpl - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate -- Qt::QuickPrivate -- Qt::QuickTemplates2 -- Qt::QuickTemplates2Private - Qt::QuickControls2ImplPrivate - Qt::QuickDialogs2Utils - Qt::QuickDialogs2UtilsPrivate -+ Qt::QuickPrivate -+ Qt::QuickTemplates2 -+ Qt::QuickTemplates2Private - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui -@@ -115,6 +115,24 @@ qt_internal_add_qml_module(QuickDialogs2QuickImpl - GENERATE_PRIVATE_CPP_EXPORTS - ) - -+add_dependencies(QuickDialogs2QuickImpl Qt::QuickControls2Basic) -+ -+if(QT_FEATURE_quickcontrols2_fusion) -+ add_dependencies(QuickDialogs2QuickImpl QuickControls2Fusion) -+endif() -+ -+if(QT_FEATURE_quickcontrols2_imagine) -+ add_dependencies(QuickDialogs2QuickImpl QuickControls2Imagine) -+endif() -+ -+if(QT_FEATURE_quickcontrols2_material) -+ add_dependencies(QuickDialogs2QuickImpl QuickControls2Material) -+endif() -+ -+if(QT_FEATURE_quickcontrols2_universal) -+ add_dependencies(QuickDialogs2QuickImpl QuickControls2Universal) -+endif() -+ - qt_internal_extend_target(QuickDialogs2QuickImpl CONDITION QT_FEATURE_quick_listview - SOURCES - qquickfiledialogdelegate.cpp --- -2.43.0 - diff --git a/0001-QuickControls-Link-the-impl-libraries-into-the-base-.patch b/0001-QuickControls-Link-the-impl-libraries-into-the-base-.patch deleted file mode 100644 index baa60d4..0000000 --- a/0001-QuickControls-Link-the-impl-libraries-into-the-base-.patch +++ /dev/null @@ -1,239 +0,0 @@ -From 123068ed865decef3b0bdfb602d037aced4dcea8 Mon Sep 17 00:00:00 2001 -From: Ulf Hermann -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 -Reviewed-by: Mitch Curtis -Reviewed-by: Alexey Edelev -Reviewed-by: Qt CI Bot -(cherry picked from commit 3b01f90fa5fcb7320ce034dc9fe02279012d0b87) -Reviewed-by: Qt Cherry-pick Bot -(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 - diff --git a/qt6-declarative.changes b/qt6-declarative.changes index e66214b..22aa8a9 100644 --- a/qt6-declarative.changes +++ b/qt6-declarative.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 26 14:25:37 UTC 2024 - Christophe Marin + +- Update to 6.6.3: + * https://www.qt.io/blog/qt-6.6.3-released +- Drop patches, merged upstream: + * 0001-QuickControls-Link-the-impl-libraries-into-the-base-.patch + * 0001-Dialogs-Depend-on-controls-styles-in-QuickDialogs2Qu.patch + ------------------------------------------------------------------- Sat Mar 16 10:20:52 UTC 2024 - Fusion Future diff --git a/qt6-declarative.spec b/qt6-declarative.spec index 7e9e034..f53f43a 100644 --- a/qt6-declarative.spec +++ b/qt6-declarative.spec @@ -16,7 +16,7 @@ # -%define real_version 6.6.2 +%define real_version 6.6.3 %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.2 +Version: 6.6.3 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,9 +36,6 @@ Source: https://download.qt.io/official_releases/qt/%{short_version}/%{r 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 # PATCH-FIX-UPSTREAM kde#482580 Patch3: 0001-Fix-PointHandler-rejecting-click-events-near-window-.patch BuildRequires: pkgconfig diff --git a/qtdeclarative-everywhere-src-6.6.2.tar.xz b/qtdeclarative-everywhere-src-6.6.2.tar.xz deleted file mode 100644 index 2049ac6..0000000 --- a/qtdeclarative-everywhere-src-6.6.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c39ce9a7c4468f7399c9ced0fbe6ef9c8d6550efc4b893297aa3cfb965b3d84c -size 34361600 diff --git a/qtdeclarative-everywhere-src-6.6.3.tar.xz b/qtdeclarative-everywhere-src-6.6.3.tar.xz new file mode 100644 index 0000000..a653e26 --- /dev/null +++ b/qtdeclarative-everywhere-src-6.6.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05207b2cfcf2ca74321165e81fc382ca289340d52de74ca2bad4c2b124a792f3 +size 34374500