.gitignore

@@ -1,27 +1 @@
-/qtdeclarative-everywhere-src-6.0.0.tar.xz
-/qtdeclarative-everywhere-src-6.0.1.tar.xz
-/qtdeclarative-everywhere-src-6.0.3.tar.xz
-/qtdeclarative-everywhere-src-6.1.0.tar.xz
-/qtdeclarative-everywhere-src-6.1.1.tar.xz
-/qtdeclarative-everywhere-src-6.1.2.tar.xz
-/qtdeclarative-everywhere-src-6.2.0-beta3.tar.xz
-/qtdeclarative-everywhere-src-6.2.0-beta4.tar.xz
-/qtdeclarative-everywhere-src-6.2.0-rc.tar.xz
-/qtdeclarative-everywhere-src-6.2.0-rc2.tar.xz
-/qtdeclarative-everywhere-src-6.2.0.tar.xz
-/qtdeclarative-everywhere-src-6.2.1.tar.xz
-/qtdeclarative-everywhere-src-6.2.2.tar.xz
-/qtdeclarative-everywhere-src-6.2.3.tar.xz
-/qtdeclarative-everywhere-src-6.3.0.tar.xz
-/qtdeclarative-everywhere-src-6.3.1.tar.xz
-/qtdeclarative-everywhere-src-6.4.0.tar.xz
-/qtdeclarative-everywhere-src-6.4.1.tar.xz
-/qtdeclarative-everywhere-src-6.4.2.tar.xz
-/qtdeclarative-everywhere-src-6.4.3.tar.xz
-/qtdeclarative-everywhere-src-6.5.0.tar.xz
-/qtdeclarative-everywhere-src-6.5.1.tar.xz
-/qtdeclarative-everywhere-src-6.5.2.tar.xz
-/qtdeclarative-everywhere-src-6.5.3.tar.xz
-/qtdeclarative-everywhere-src-6.6.0.tar.xz
-/qtdeclarative-everywhere-src-6.6.1.tar.xz
-/qtdeclarative-everywhere-src-6.6.2.tar.xz
+SOURCES/qtdeclarative-everywhere-src-6.7.1.tar.xz

.qt6-qtdeclarative.metadata

@@ -0,0 +1 @@
+495ab434a05a657658718b70397ec5b7df356877 SOURCES/qtdeclarative-everywhere-src-6.7.1.tar.xz

SOURCES/qtdeclarative-avoid-asserts-during-dom-construction.patch

@@ -0,0 +1,352 @@
+From 3ed063d2ff6b418e8487bea0d839fd2f768c91b6 Mon Sep 17 00:00:00 2001
+From: Sami Shalayel <sami.shalayel@qt.io>
+Date: Thu, 21 Mar 2024 14:43:19 +0100
+Subject: [PATCH] dom: avoid asserts during dom construction
+
+Add missing safeguards to avoid crashing when constructing the Dom, also
+add some tests.
+
+Fixes: QTBUG-123871
+Change-Id: Ie5da7c3b7bbf61d49d755ec6c338e2011532e89b
+(cherry picked from commit 4c4605be79e564921699a065df58333d3ee10d59)
+Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
+---
+
+diff --git a/src/qmldom/qqmldomastcreator.cpp b/src/qmldom/qqmldomastcreator.cpp
+index 1f5db5a..d8e7590 100644
+--- a/src/qmldom/qqmldomastcreator.cpp
++++ b/src/qmldom/qqmldomastcreator.cpp
+@@ -495,8 +495,10 @@
+ {
+     if (auto &lastEl = currentNode(); lastEl.kind == DomType::Binding) {
+         Binding &b = std::get<Binding>(lastEl.value);
+-        if (m_enableScriptExpressions && scriptNodeStack.size() != 1)
++        if (m_enableScriptExpressions
++            && (scriptNodeStack.size() != 1 || scriptNodeStack.last().isList())) {
+             Q_SCRIPTELEMENT_DISABLE();
++        }
+         if (m_enableScriptExpressions) {
+             b.scriptExpressionValue()->setScriptElement(finalizeScriptExpression(
+                     currentScriptNodeEl().takeVariant(), Path().field(Fields::scriptElement),
+@@ -1077,7 +1079,7 @@
+         if (!m_enableScriptExpressions)
+             return false;
+ 
+-        if (scriptNodeStack.empty()) {
++        if (scriptNodeStack.empty() || scriptNodeStack.last().isList()) {
+             Q_SCRIPTELEMENT_DISABLE();
+             return false;
+         }
+@@ -1106,7 +1108,7 @@
+     for (auto it = list; it; it = it->next) {
+         if (it->elision) {
+             Node::accept(it->elision, this);
+-            if (scriptNodeStack.empty()) {
++            if (scriptNodeStack.empty() || !scriptNodeStack.last().isList()) {
+                 Q_SCRIPTELEMENT_DISABLE();
+                 return false;
+             }
+@@ -1115,7 +1117,7 @@
+         }
+         if (it->element) {
+             Node::accept(it->element, this);
+-            if (scriptNodeStack.empty()) {
++            if (scriptNodeStack.empty() || scriptNodeStack.last().isList()) {
+                 Q_SCRIPTELEMENT_DISABLE();
+                 return false;
+             }
+@@ -1142,7 +1144,7 @@
+             Node::accept(it->property, this);
+             if (!m_enableScriptExpressions)
+                 return false;
+-            if (scriptNodeStack.empty()) {
++            if (scriptNodeStack.empty() || scriptNodeStack.last().isList()) {
+                 Q_SCRIPTELEMENT_DISABLE();
+                 return false;
+             }
+@@ -1346,7 +1348,7 @@
+     auto current = makeScriptList(list);
+ 
+     for (auto it = list; it; it = it->next) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current.append(scriptNodeStack.takeLast().takeVariant());
+     }
+ 
+@@ -1364,15 +1366,15 @@
+ 
+ void QQmlDomAstCreator::endVisit(AST::BinaryExpression *exp)
+ {
+-    Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.size() < 2);
+-
+     if (!m_enableScriptExpressions)
+         return;
+ 
+     auto current = makeScriptElement<ScriptElements::BinaryExpression>(exp);
+     current->addLocation(OperatorTokenRegion, exp->operatorToken);
++    Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+     current->setRight(currentScriptNodeEl().takeVariant());
+     removeCurrentScriptNode({});
++    Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+     current->setLeft(currentScriptNodeEl().takeVariant());
+     removeCurrentScriptNode({});
+ 
+@@ -1426,19 +1428,19 @@
+     current->addLocation(FileLocationRegion::RightParenthesisRegion, forStatement->rparenToken);
+ 
+     if (forStatement->statement) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->setBody(currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode(std::nullopt);
+     }
+ 
+     if (forStatement->expression) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->setExpression(currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode(std::nullopt);
+     }
+ 
+     if (forStatement->condition) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->setCondition(currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode(std::nullopt);
+     }
+@@ -1458,7 +1460,7 @@
+     }
+ 
+     if (forStatement->initialiser) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->setInitializer(currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode(std::nullopt);
+     }
+@@ -1590,7 +1592,7 @@
+             Node::accept(it->declaration, this);
+             if (!m_enableScriptExpressions)
+                 return false;
+-            if (scriptNodeStack.empty()) {
++            if (scriptNodeStack.empty() || scriptNodeStack.last().isList()) {
+                 Q_SCRIPTELEMENT_DISABLE();
+                 return false;
+             }
+@@ -1697,18 +1699,18 @@
+     current->addLocation(ElseKeywordRegion, ifStatement->elseToken);
+ 
+     if (ifStatement->ko) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->setAlternative(scriptNodeStack.last().takeVariant());
+         scriptNodeStack.removeLast();
+     }
+ 
+     if (ifStatement->ok) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->setConsequence(scriptNodeStack.last().takeVariant());
+         scriptNodeStack.removeLast();
+     }
+     if (ifStatement->expression) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->setCondition(scriptNodeStack.last().takeVariant());
+         scriptNodeStack.removeLast();
+     }
+@@ -1733,7 +1735,7 @@
+     current->addLocation(ReturnKeywordRegion, returnStatement->returnToken);
+ 
+     if (returnStatement->expression) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->setExpression(currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode({});
+     }
+@@ -1759,7 +1761,7 @@
+     current->addLocation(FileLocationRegion::OperatorTokenRegion, expression->dotToken);
+ 
+     if (expression->base) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->setLeft(currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode({});
+     }
+@@ -1790,7 +1792,7 @@
+     current->addLocation(FileLocationRegion::OperatorTokenRegion, expression->lbracketToken);
+ 
+     if (expression->expression) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         // if scriptNodeStack.last() is fieldmember expression, add expression to it instead of
+         // creating new one
+         current->setRight(currentScriptNodeEl().takeVariant());
+@@ -1798,7 +1800,7 @@
+     }
+ 
+     if (expression->base) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->setLeft(currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode({});
+     }
+@@ -1834,7 +1836,7 @@
+     }
+ 
+     if (exp->base) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->insertChild(Fields::callee, currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode({});
+     }
+@@ -1924,7 +1926,7 @@
+         return;
+ 
+     if (exp->name) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->insertChild(Fields::name, currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode({});
+     }
+@@ -2038,7 +2040,7 @@
+     }
+ 
+     if (exp->expression) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->insertChild(Fields::expression, currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode({});
+     }
+@@ -2062,7 +2064,7 @@
+     auto current = makeScriptList(list);
+ 
+     for (auto it = list; it; it = it->next) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current.append(scriptNodeStack.takeLast().takeVariant());
+     }
+ 
+@@ -2094,7 +2096,7 @@
+     }
+ 
+     if (exp->defaultClause) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->insertChild(Fields::defaultClause, currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode({});
+     }
+@@ -2125,12 +2127,12 @@
+     current->addLocation(FileLocationRegion::RightParenthesisRegion, exp->rparenToken);
+ 
+     if (exp->block) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->insertChild(Fields::caseBlock, currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode({});
+     }
+     if (exp->expression) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->insertChild(Fields::expression, currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode({});
+     }
+@@ -2157,13 +2159,13 @@
+     current->addLocation(FileLocationRegion::RightParenthesisRegion, exp->rparenToken);
+ 
+     if (exp->statement) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->insertChild(Fields::body, currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode({});
+     }
+ 
+     if (exp->expression) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->insertChild(Fields::expression, currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode({});
+     }
+@@ -2191,13 +2193,13 @@
+     current->addLocation(FileLocationRegion::RightParenthesisRegion, exp->rparenToken);
+ 
+     if (exp->expression) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->insertChild(Fields::expression, currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode({});
+     }
+ 
+     if (exp->statement) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->insertChild(Fields::body, currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode({});
+     }
+@@ -2224,18 +2226,18 @@
+     current->addLocation(FileLocationRegion::RightParenthesisRegion, exp->rparenToken);
+ 
+     if (exp->statement) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->insertChild(Fields::body, currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode({});
+     }
+     if (exp->expression) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->insertChild(Fields::expression, currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode({});
+     }
+ 
+     if (exp->lhs) {
+-        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty());
++        Q_SCRIPTELEMENT_EXIT_IF(scriptNodeStack.isEmpty() || scriptNodeStack.last().isList());
+         current->insertChild(Fields::bindingElement, currentScriptNodeEl().takeVariant());
+         removeCurrentScriptNode({});
+     }
+diff --git a/tests/auto/qmldom/domdata/domitem/crashes/lambda.qml b/tests/auto/qmldom/domdata/domitem/crashes/lambda.qml
+new file mode 100644
+index 0000000..85f696f
+--- /dev/null
++++ b/tests/auto/qmldom/domdata/domitem/crashes/lambda.qml
+@@ -0,0 +1,7 @@
++import QtQuick.Controls
++
++Action {
++    onTriggered: foo(Bla.Bar, function() {
++        console.log("Hello")
++    })
++} 
+diff --git a/tests/auto/qmldom/domdata/domitem/crashes/templateStrings.qml b/tests/auto/qmldom/domdata/domitem/crashes/templateStrings.qml
+new file mode 100644
+index 0000000..feb5646
+--- /dev/null
++++ b/tests/auto/qmldom/domdata/domitem/crashes/templateStrings.qml
+@@ -0,0 +1,10 @@
++import QtQuick
++
++
++Item {
++    property string verbatim1: 'A "verbatim" string!'
++    property string verbatim2: "A 'verbatim' string\u2757"
++    property string verbatim3: `400 + 300 is ${400 + 300}.
++
++mutliline`
++}
+diff --git a/tests/auto/qmldom/domitem/tst_qmldomitem.h b/tests/auto/qmldom/domitem/tst_qmldomitem.h
+index 184dc8e..3673871 100644
+--- a/tests/auto/qmldom/domitem/tst_qmldomitem.h
++++ b/tests/auto/qmldom/domitem/tst_qmldomitem.h
+@@ -2813,6 +2813,12 @@
+ 
+         QTest::addRow("inactiveVisitorMarkerCrash")
+                 << baseDir + u"/inactiveVisitorMarkerCrash.qml"_s;
++
++        QTest::addRow("templateStrings")
++                << baseDir + u"/crashes/templateStrings.qml"_s;
++
++        QTest::addRow("lambda")
++                << baseDir + u"/crashes/lambda.qml"_s;
+     }
+     void crashes()
+     {

SPECS/qt6-qtdeclarative.spec

@@ -12,11 +12,12 @@
 %endif
 
 %global examples 1
+%global build_tests 1
 
 Summary: Qt6 - QtDeclarative component
 Name:    qt6-%{qt_module}
-Version: 6.6.2
-Release: 1%{?dist}
+Version: 6.7.1
+Release: 6%{?dist}
 
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 Url:     http://www.qt.io
@@ -34,6 +35,8 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
 Source5: qv4global_p-multilib.h
 
 ## upstream patches
+# https://codereview.qt-project.org/c/qt/qtdeclarative/+/550241
+Patch0:  qtdeclarative-avoid-asserts-during-dom-construction.patch
 
 ## upstreamable patches
 
@@ -92,24 +95,50 @@ Provides:  qt6-qtquickcontrols2-examples = %{version}-%{release}
 %{summary}.
 %endif
 
+%if 0%{?build_tests}
+%package tests
+Summary: Unit tests for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description tests
+%{summary}.
+%endif
+
 %prep
 %autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
 
 
 %build
-
 # HACK so calls to "python" get what we want
 ln -s %{__python3} python
 export PATH=`pwd`:$PATH
 
-%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF}
+%cmake_qt6 \
+  -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
+  -DQT_BUILD_TESTS=%{?build_tests:ON}%{!?build_tests:OFF} \
+  -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF}
+
+# FIXME: tests/auto/qml/qmltc doesn't build
+sed -i 's|add_subdirectory(qmltc)||' tests/auto/qml/CMakeLists.txt
+
+%if 0%{?build_tests}
+%qt6_fix_tests
+%endif
 
 %cmake_build
 
 
 %install
+%if 0%{?build_tests}
+%qt6_dont_autoinstall_tests
+%endif
+
 %cmake_install
 
+%if 0%{?build_tests}
+%qt6_install_tests
+%endif
+
 %ifarch %{multilib_archs}
 # multilib: qv4global_p.h
   mv %{buildroot}%{_qt6_headerdir}/QtQml/%{qt_version}/QtQml/private/qv4global_p.h \
@@ -144,8 +173,6 @@ for prl_file in libQt6*.prl ; do
 done
 popd
 
-# FIXME: where does it come from?
-rm -rf %{buildroot}%{_qt6_libdir}/objects-RelWithDebInfo/QmlCompilerPrivate_resources_1/.rcc/qrc_builtins.cpp.o
 
 %check
 %if 0%{?tests}
@@ -159,7 +186,6 @@ time \
 make check -k -C tests ||:
 %endif
 
-
 %ldconfig_scriptlets
 
 %files
@@ -171,12 +197,13 @@ make check -k -C tests ||:
 %{_qt6_libdir}/libQt6LabsSharedImage.so.6*
 %{_qt6_libdir}/libQt6LabsWavefrontMesh.so.6*
 %{_qt6_libdir}/libQt6QmlLocalStorage.so.6*
+%{_qt6_libdir}/libQt6QmlNetwork.so.6*
 %{_qt6_libdir}/libQt6Qml.so.6*
 %{_qt6_libdir}/libQt6QmlCompiler.so.*
 %{_qt6_libdir}/libQt6QmlCore.so.6*
 %{_qt6_libdir}/libQt6QmlModels.so.6*
 %{_qt6_libdir}/libQt6QmlWorkerScript.so.6*
-%{_qt6_libdir}/libQt6Quick.so.6*
+%{_qt6_libdir}/libQt6Quick*.so.6*
 %{_qt6_libdir}/libQt6QuickControls2.so.6*
 %{_qt6_libdir}/libQt6QuickControls2Impl.so.6*
 %{_qt6_libdir}/libQt6QuickDialogs2.so.6*
@@ -192,12 +219,15 @@ make check -k -C tests ||:
 %{_qt6_libdir}/libQt6QmlXmlListModel.so.6*
 %{_qt6_plugindir}/qmltooling/
 %{_qt6_plugindir}/qmllint/
-%{_qt6_archdatadir}/qml/
+%{_qt6_archdatadir}/qml/Qt*
+%{_qt6_archdatadir}/qml/QmlTime
+%{_qt6_archdatadir}/qml/*.qmltypes
 
 %files devel
 %dir %{_qt6_libdir}/cmake/Qt6PacketProtocolPrivate
 %dir %{_qt6_libdir}/cmake/Qt6Qml
 %dir %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins
+%dir %{_qt6_libdir}/cmake/Qt6QmlBuiltins
 %dir %{_qt6_libdir}/cmake/Qt6QmlCompiler
 %dir %{_qt6_libdir}/cmake/Qt6QmlCore
 %dir %{_qt6_libdir}/cmake/Qt6QmlDebugPrivate
@@ -209,10 +239,21 @@ make check -k -C tests ||:
 %dir %{_qt6_libdir}/cmake/Qt6LabsSettings
 %dir %{_qt6_libdir}/cmake/Qt6LabsSharedImage
 %dir %{_qt6_libdir}/cmake/Qt6LabsWavefrontMesh
+%dir %{_qt6_libdir}/cmake/Qt6QuickControls2Basic
+%dir %{_qt6_libdir}/cmake/Qt6QuickControls2BasicStyleImpl
+%dir %{_qt6_libdir}/cmake/Qt6QuickControls2Fusion
+%dir %{_qt6_libdir}/cmake/Qt6QuickControls2FusionStyleImpl
+%dir %{_qt6_libdir}/cmake/Qt6QuickControls2Imagine
+%dir %{_qt6_libdir}/cmake/Qt6QuickControls2ImagineStyleImpl
+%dir %{_qt6_libdir}/cmake/Qt6QuickControls2Material
+%dir %{_qt6_libdir}/cmake/Qt6QuickControls2MaterialStyleImpl
+%dir %{_qt6_libdir}/cmake/Qt6QuickControls2Universal
+%dir %{_qt6_libdir}/cmake/Qt6QuickControls2UniversalStyleImpl
 %dir %{_qt6_libdir}/cmake/Qt6QmlLSPrivate
 %dir %{_qt6_libdir}/cmake/Qt6QmlDomPrivate
 %dir %{_qt6_libdir}/cmake/Qt6QmlLocalStorage
 %dir %{_qt6_libdir}/cmake/Qt6QmlModels
+%dir %{_qt6_libdir}/cmake/Qt6QmlNetwork
 %dir %{_qt6_libdir}/cmake/Qt6QmlTools
 %dir %{_qt6_libdir}/cmake/Qt6QmlToolingSettingsPrivate
 %dir %{_qt6_libdir}/cmake/Qt6QmlWorkerScript
@@ -237,6 +278,7 @@ make check -k -C tests ||:
 %{_qt6_libexecdir}/qmlcachegen
 %{_qt6_libexecdir}/qmlimportscanner
 %{_qt6_libexecdir}/qmltyperegistrar
+%{_qt6_libexecdir}/qmljsrootgen
 %{_qt6_headerdir}/Qt*/
 %{_qt6_libdir}/libQt6LabsAnimation.so
 %{_qt6_libdir}/libQt6LabsFolderListModel.so
@@ -246,6 +288,7 @@ make check -k -C tests ||:
 %{_qt6_libdir}/libQt6LabsWavefrontMesh.so
 %{_qt6_libdir}/libQt6QmlLocalStorage.so
 %{_qt6_libdir}/libQt6Qml.so
+%{_qt6_libdir}/libQt6QmlNetwork.so
 %{_qt6_libdir}/libQt6QmlCompiler.so
 %{_qt6_libdir}/libQt6QmlCore.so
 %{_qt6_libdir}/libQt6QmlModels.so
@@ -253,6 +296,7 @@ make check -k -C tests ||:
 %{_qt6_libdir}/libQt6Quick*.so
 %{_qt6_libdir}/libQt6QmlXmlListModel.so
 %{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
+%{_qt6_libdir}/qt6/objects-RelWithDebInfo/QmlTypeRegistrarPrivate_resources_1/.qt/rcc/qrc_jsRootMetaTypes_init.cpp.o
 %{_qt6_archdatadir}/mkspecs/modules/*.pri
 %{_qt6_archdatadir}/mkspecs/features/*.prf
 %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtDeclarativeTestsConfig.cmake
@@ -260,6 +304,7 @@ make check -k -C tests ||:
 %{_qt6_libdir}/cmake/Qt6Qml/*.cmake*
 %{_qt6_libdir}/cmake/Qt6Qml/*.cpp.in
 %{_qt6_libdir}/cmake/Qt6Qml/*.qrc.in
+%{_qt6_libdir}/cmake/Qt6QmlBuiltins/*cmake
 %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
 %{_qt6_libdir}/cmake/Qt6QmlCompiler/*.cmake
 %{_qt6_libdir}/cmake/Qt6QmlCore/*.cmake
@@ -275,7 +320,18 @@ make check -k -C tests ||:
 %{_qt6_libdir}/cmake/Qt6QmlLSPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6QmlDomPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6QmlLocalStorage/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickControls2Basic/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickControls2BasicStyleImpl/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickControls2Fusion/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickControls2FusionStyleImpl/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickControls2Imagine/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickControls2ImagineStyleImpl/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickControls2Material/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickControls2MaterialStyleImpl/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickControls2Universal/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickControls2UniversalStyleImpl/*.cmake
 %{_qt6_libdir}/cmake/Qt6QmlModels/*.cmake
+%{_qt6_libdir}/cmake/Qt6QmlNetwork/*.cmake
 %{_qt6_libdir}/cmake/Qt6QmlTools/*.cmake
 %{_qt6_libdir}/cmake/Qt6QmlToolingSettingsPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6QmlWorkerScript/*.cmake
@@ -298,45 +354,63 @@ make check -k -C tests ||:
 %{_qt6_libdir}/cmake/Qt6QuickWidgets/*.cmake
 %{_qt6_libdir}/qt6/modules/*.json
 %{_qt6_libdir}/pkgconfig/*.pc
+%{_qt6_libdir}/libQt6*.prl
+# FIXME: should be in -static, but looks it's required for all modules
+ %{_qt6_libdir}/libQt6QmlBuiltins.a
 
 %files static
-%{_qt6_libdir}/libQt6LabsAnimation.prl
-%{_qt6_libdir}/libQt6LabsFolderListModel.prl
-%{_qt6_libdir}/libQt6LabsQmlModels.prl
-%{_qt6_libdir}/libQt6LabsSettings.prl
-%{_qt6_libdir}/libQt6LabsSharedImage.prl
-%{_qt6_libdir}/libQt6LabsWavefrontMesh.prl
-%{_qt6_libdir}/libQt6QmlCore.prl
 %{_qt6_libdir}/libQt6QmlDom.a
-%{_qt6_libdir}/libQt6QmlDom.prl
-%{_qt6_libdir}/libQt6QmlLocalStorage.prl
 %{_qt6_libdir}/libQt6QmlLS.a
-%{_qt6_libdir}/libQt6QmlLS.prl
-%{_qt6_libdir}/libQt6Quick*.prl
-%{_qt6_libdir}/libQt6QmlWorkerScript.prl
-%{_qt6_libdir}/libQt6QmlModels.prl
-%{_qt6_libdir}/libQt6Qml.prl
-%{_qt6_libdir}/libQt6QmlCompiler.prl
-%{_qt6_libdir}/libQt6QmlTypeRegistrar.prl
 %{_qt6_libdir}/libQt6QmlTypeRegistrar.a
 %{_qt6_libdir}/libQt6QmlToolingSettings.a
-%{_qt6_libdir}/libQt6QmlToolingSettings.prl
 %{_qt6_libdir}/libQt6PacketProtocol.a
-%{_qt6_libdir}/libQt6PacketProtocol.prl
 %{_qt6_libdir}/libQt6QuickControlsTestUtils.a
 %{_qt6_libdir}/libQt6QuickTestUtils.a
 %{_qt6_libdir}/libQt6QmlDebug.a
-%{_qt6_libdir}/libQt6QmlDebug.prl
-%{_qt6_libdir}/libQt6QmlXmlListModel.prl
 
 %if 0%{?examples}
 %files examples
 %{_qt6_examplesdir}/
 %endif
 
+%if 0%{?build_tests}
+%files tests
+%{_qt6_archdatadir}/tests
+%endif
+
 %changelog
-* Thu Feb 15 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.2-1
-- 6.6.2
+* Mon Jul 22 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-6
+- Do not own /usr/lib[64]/qml directory
+  Resolves: RHEL-50036
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.7.1-5
+- Bump release for June 2024 mass rebuild
+
+* Mon Jun 17 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-4
+- Move all *.prl files to -devel subpackage
+  Resolves: RHEL-42429
+
+* Thu Jun 06 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-3
+- Backport upstream fix - dom: avoid asserts during dom construction
+  Resolves: RHEL-36430
+
+* Tue Jun 04 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-2
+- Add rpminspect.yaml
+  Resolves: RHEL-36430
+
+* Fri May 31 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-1
+- 6.7.1
+  Resolves: RHEL-36430
+
+* Thu Apr 18 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-1
+- 6.7.0
+  Resolves: RHEL-27845
+  Resolves: RHEL-31151
+  Resolves: RHEL-32080
+
+* Wed Mar 27 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-4
+- Add -tests subpackage with unit tests that can run in CI
+  Resolves: RHEL-28239
 
 * Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

sources

@@ -1,2 +0,0 @@
-SHA512 (qtdeclarative-everywhere-src-6.6.1.tar.xz) = 1a819187519670338df1c308d5980aed985670ee3e79a424e56d8e300855513541f46a1b89d9f595bdab382a0072761f0fda87d78653602041a10a5bd3e7bdcd
-SHA512 (qtdeclarative-everywhere-src-6.6.2.tar.xz) = 944e9f824dd8ec47d9e23e716d09142c5942f4478238f207d70f1144993440afa7925f85f3fd4cb5659191dee6a142524db40c7144c69c8bec9817591324cee1