Sync from SUSE:SLFO:Main qt6-declarative revision 52c724667ec7f227636dd298c2881eb2

This commit is contained in:
Adrian Schröter 2025-02-07 11:12:49 +01:00
parent b2038d3afe
commit 9061951c0d
6 changed files with 797 additions and 673 deletions

View File

@ -0,0 +1,42 @@
From eff776c676b042bd75604105a3876f999b9808d5 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Mon, 23 Dec 2024 12:47:21 +0100
Subject: [PATCH] CMake: Fix find_package call in Qt6QmlFindQmlscInternal.cmake
Qt6QmlFindQmlscInternal.cmake tries to find the
Qt6QmlCompilerPlusPrivateTools package and specifies a version. That
version was PROJECT_VERSION, which is the version of the user project.
It should be the Qt's version instead.
Read the package version of the Qt6::Qml target and use that in the
find_package call. The target is guaranteed to exist, because the
Qt6QmlFindQmlscInternal.cmake inclusion is guarded by a check for this
target.
This amends commit b0f1ec4e394dcee82400964225be485a7cdd3c53.
Pick-to: 6.8 6.9
Fixes: QTBUG-132421
Change-Id: I04402296b351ef8df991ade697c633594b0b17b5
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
---
src/qml/Qt6QmlFindQmlscInternal.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/qml/Qt6QmlFindQmlscInternal.cmake b/src/qml/Qt6QmlFindQmlscInternal.cmake
index f02103f45f..3f549c7cbe 100644
--- a/src/qml/Qt6QmlFindQmlscInternal.cmake
+++ b/src/qml/Qt6QmlFindQmlscInternal.cmake
@@ -30,7 +30,8 @@ endif()
# This can't use the find_package(Qt6 COMPONENTS) signature, because Qt6Config uses NO_DEFAULT and
# won't look at the prepended extra find root paths.
-find_package(Qt6QmlCompilerPlusPrivateTools ${PROJECT_VERSION} QUIET CONFIG
+get_target_property(_qt_qml_package_version Qt6::Qml _qt_package_version)
+find_package(Qt6QmlCompilerPlusPrivateTools ${_qt_qml_package_version} QUIET CONFIG
PATHS
${_qt_additional_host_packages_prefix_paths}
)
--
2.47.1

View File

@ -2,10 +2,20 @@
<constraints>
<hardware>
<disk>
<size unit="G">20</size>
<size unit="G">25</size>
</disk>
<processors>4</processors>
</hardware>
<overwrite>
<conditions>
<arch>s390x</arch>
</conditions>
<hardware>
<memory>
<size unit="G">9</size>
</memory>
</hardware>
</overwrite>
<overwrite>
<conditions>
<arch>ppc64</arch>
@ -35,7 +45,7 @@
</conditions>
<hardware>
<disk>
<size unit="G">2</size>
<size unit="G">3</size>
</disk>
<memory>
<size unit="G">2</size>

View File

@ -1,3 +1,88 @@
-------------------------------------------------------------------
Sat Jan 18 15:34:27 UTC 2025 - Christophe Marin <christophe@krop.fr>
- Add patch to fix qmlsc detection:
* 0001-CMake-Fix-find_package-call-in-Qt6QmlFindQmlscIntern.patch
-------------------------------------------------------------------
Mon Dec 2 13:02:02 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 6.8.1:
* https://www.qt.io/blog/qt-6.8.1-released
- Drop patches, merged upstream:
* 0001-Revert-QQmlDelegateModel-fix-delegates-not-being-cre.patch
* 0002-QQmlDelegateModel-fix-delegates-not-being-created-in.patch
* 0001-Compiler-Wrap-raw-string-literals-in-QStringLiteral-.patch
* 0001-QQuickItemView-fix-crash-with-zero-size-SwipeView-th.patch
* 0001-QQuickAccessibleAttached-Let-implicit-names-work-whe.patch
* 0001-QQuickItem-map-To-From-Item-Account-for-not-having-a.patch
* 0001-Log-state-transitions-for-the-GC.patch
* 0001-Engine-Mark-created-wrapped-objects-after-GCState-Ma.patch
-------------------------------------------------------------------
Tue Nov 12 15:40:15 UTC 2024 - Fabian Vogt <fvogt@suse.com>
- Replace 0001-WIP-speculative-gc-fix.patch with newer ones,
should unbreak spectacle and some others (kde#496139):
* 0001-Log-state-transitions-for-the-GC.patch
* 0001-Engine-Mark-created-wrapped-objects-after-GCState-Ma.patch
-------------------------------------------------------------------
Wed Nov 6 19:20:07 UTC 2024 - Fabian Vogt <fvogt@suse.com>
- Add patch (pending upstream) to fix properties getting GC'd:
(QTBUG-128789, kde#494804)
* 0001-WIP-speculative-gc-fix.patch
-------------------------------------------------------------------
Mon Nov 4 17:50:07 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Add upstream change (QTBUG-129500, kde#495089):
* 0001-QQuickItem-map-To-From-Item-Account-for-not-having-a.patch
-------------------------------------------------------------------
Fri Oct 25 11:42:28 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Add upstream changes:
* 0001-QQuickItemView-fix-crash-with-zero-size-SwipeView-th.patch
(QTBUG-129622, kde#493854)
* 0001-QQuickAccessibleAttached-Let-implicit-names-work-whe.patch
(QTBUG-130360)
-------------------------------------------------------------------
Tue Oct 15 09:37:16 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
- Update memory constraints for s390x and use %limit_build
-------------------------------------------------------------------
Tue Oct 15 07:52:36 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update disk constraints
-------------------------------------------------------------------
Wed Oct 9 16:52:34 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Add upstream change to fix compilation failures (kde#494281, QTBUG-129797)
* 0001-Compiler-Wrap-raw-string-literals-in-QStringLiteral-.patch
-------------------------------------------------------------------
Tue Oct 8 10:17:37 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 6.8.0:
* https://www.qt.io/blog/qt-6.8-released
- Add upstream changes:
* 0001-Revert-QQmlDelegateModel-fix-delegates-not-being-cre.patch
* 0002-QQmlDelegateModel-fix-delegates-not-being-created-in.patch
(kde#493116, QTBUG-127340)
- Merge some -devel and -private-devel packages that only have
private API.
-------------------------------------------------------------------
Sat Sep 28 08:22:56 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 6.7.3
* https://www.qt.io/blog/qt-6.7.3-released
-------------------------------------------------------------------
Wed Jun 19 07:25:41 UTC 2024 - Christophe Marin <christophe@krop.fr>

File diff suppressed because it is too large Load Diff

BIN
qtdeclarative-everywhere-src-6.7.2.tar.xz (Stored with Git LFS)

Binary file not shown.

BIN
qtdeclarative-everywhere-src-6.8.1.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.