diff --git a/0012-Qml-Don-t-crash-when-as-casting-to-type-with-errors.patch b/0012-Qml-Don-t-crash-when-as-casting-to-type-with-errors.patch index 58d751c9c06b7efe97d0674e02acbdb70630cee4..ecba269ed7f7d1360d359936d01a097d63f0017d 100644 --- a/0012-Qml-Don-t-crash-when-as-casting-to-type-with-errors.patch +++ b/0012-Qml-Don-t-crash-when-as-casting-to-type-with-errors.patch @@ -1,7 +1,7 @@ -From 7be5422134167fe6d9fd44ef683f407bbda1bce7 Mon Sep 17 00:00:00 2001 +From 63fbc2eac56cc0df72bbe4287e777e8db334db96 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 30 Nov 2021 14:39:48 +0100 -Subject: [PATCH 14/19] Qml: Don't crash when as-casting to type with errors +Subject: [PATCH 14/30] Qml: Don't crash when as-casting to type with errors Such types don't have a compilation unit, but we still know their names. @@ -39,10 +39,10 @@ index 175de8b936..a6ba4b8cb3 100644 myQmlType = qenginepriv->metaObjectForType(myTypeId); } diff --git a/src/qml/types/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp -index 29ed62cd39..aba930dfe1 100644 +index 4a4e6ce12c..a5889b7396 100644 --- a/src/qml/types/qqmlconnections.cpp +++ b/src/qml/types/qqmlconnections.cpp -@@ -338,7 +338,7 @@ void QQmlConnections::connectSignalsToMethods() +@@ -341,7 +341,7 @@ void QQmlConnections::connectSignalsToMethods() && propName.at(2).isUpper()) { qmlWarning(this) << tr("Detected function \"%1\" in Connections element. " "This is probably intended to be a signal handler but no " @@ -75,18 +75,18 @@ index 0000000000..bd88d14c76 + property var selfAsBroken: self as Broken +} diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp -index bffb62c59e..97cc64991f 100644 +index 1be1533b63..dfc82011c6 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp -@@ -336,6 +336,7 @@ private slots: +@@ -337,6 +337,7 @@ private slots: void bareInlineComponent(); void hangOnWarning(); + void objectAsBroken(); void ambiguousContainingType(); - -@@ -5876,6 +5877,21 @@ void tst_qqmllanguage::ambiguousContainingType() + void staticConstexprMembers(); +@@ -5939,6 +5940,21 @@ void tst_qqmllanguage::bindingAliasToComponentUrl() } } @@ -109,5 +109,5 @@ index bffb62c59e..97cc64991f 100644 #include "tst_qqmllanguage.moc" -- -2.40.0 +2.41.0 diff --git a/0013-Fix-missing-glyphs-when-using-NativeRendering.patch b/0013-Fix-missing-glyphs-when-using-NativeRendering.patch deleted file mode 100644 index e761faa5c4ce78dbf2eef1814cbe99438f22c14a..0000000000000000000000000000000000000000 --- a/0013-Fix-missing-glyphs-when-using-NativeRendering.patch +++ /dev/null @@ -1,54 +0,0 @@ -From d54b978c0cba2bf75e145c9e1b00d2a9ab495d70 Mon Sep 17 00:00:00 2001 -From: Eskil Abrahamsen Blomfeldt -Date: Mon, 19 Dec 2022 10:05:33 +0100 -Subject: [PATCH 15/19] Fix missing glyphs when using NativeRendering - -When we look up glyphs with subpixel positions in the glyph cache, -we use the calculated subpixel position (from a set of predefined -subpixel positions) as key. In some very rare cases, we could end -up with different subpixel positions when looking up an on-screen -position than when we entered it into the cache, due to numerical -differences when doing the calculation. - -The reason for this was that when entering the glyph into the -cache, we used the 16.6 fixed point representation, whereas when -looking up, we used the unmodified float. In some cases, the -converted fixed point approximation might snap to a different -predefined subpixel position than the floating point equivalent. - -To avoid this, we reuse the converted fixed point positions when -looking up the glyphs in the cache. - -[ChangeLog][Text] Fixed an issue where text using NativeRendering -would sometimes be missing glyphs. - -Pick-to: 5.15 6.2 6.4 6.5 -Fixes: QTBUG-108713 -Change-Id: Iecc264eb3d27e875c24257eaefcfb18a1a5fb5be -Reviewed-by: Qt CI Bot -Reviewed-by: Lars Knoll -(cherry picked from commit 4bad329985b75090c68a70cceee7edadc172d7ab) ---- - src/quick/scenegraph/qsgdefaultglyphnode_p.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp -index f912da5799..fd128aa06e 100644 ---- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp -+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp -@@ -839,9 +839,11 @@ void QSGTextMaskMaterial::populate(const QPointF &p, - bool supportsSubPixelPositions = fontD->fontEngine->supportsSubPixelPositions(); - for (int i=0; ifontEngine->subPixelPositionForX(QFixed::fromReal(glyphPosition.x())); -+ subPixelPosition = fontD->fontEngine->subPixelPositionForX(QFixed::fromReal(fixedPointPosition.x.toReal() * glyphCacheScaleX)); - - QTextureGlyphCache::GlyphAndSubPixelPosition glyph(glyphIndexes.at(i), subPixelPosition); - const QTextureGlyphCache::Coord &c = cache->coords.value(glyph); --- -2.40.0 - diff --git a/0014-Revert-Fix-missing-glyphs-when-using-NativeRendering.patch b/0014-Revert-Fix-missing-glyphs-when-using-NativeRendering.patch deleted file mode 100644 index 4cf5df5088ac238fea8ff873c62f1ca5ebd40dd1..0000000000000000000000000000000000000000 --- a/0014-Revert-Fix-missing-glyphs-when-using-NativeRendering.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 70b44dd18b9727e9aae857297265a751700a297e Mon Sep 17 00:00:00 2001 -From: Fushan Wen -Date: Tue, 10 Jan 2023 20:42:04 +0800 -Subject: [PATCH 16/19] Revert "Fix missing glyphs when using NativeRendering" - -This reverts commit da5e53b649f50cd9cdd89dadbba16f05e4070be2. - -It breaks fonts on Wayland when global scale > 100%. ---- - src/quick/scenegraph/qsgdefaultglyphnode_p.cpp | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp -index fd128aa06e..f912da5799 100644 ---- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp -+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp -@@ -839,11 +839,9 @@ void QSGTextMaskMaterial::populate(const QPointF &p, - bool supportsSubPixelPositions = fontD->fontEngine->supportsSubPixelPositions(); - for (int i=0; ifontEngine->subPixelPositionForX(QFixed::fromReal(fixedPointPosition.x.toReal() * glyphCacheScaleX)); -+ subPixelPosition = fontD->fontEngine->subPixelPositionForX(QFixed::fromReal(glyphPosition.x())); - - QTextureGlyphCache::GlyphAndSubPixelPosition glyph(glyphIndexes.at(i), subPixelPosition); - const QTextureGlyphCache::Coord &c = cache->coords.value(glyph); --- -2.40.0 - diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec index b7dc08d8fdb8e22f5926619586cae6a3f262e649..aecac0cd3df92ffcf34dab450983c97215647a29 100644 --- a/qt5-qtdeclarative.spec +++ b/qt5-qtdeclarative.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$ Name: qt5-%{qt_module} -Version: 5.15.9 +Version: 5.15.11 Release: %{anolis_release}%{?dist} Summary: Qt5 - QtDeclarative component License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -29,8 +29,6 @@ Patch0009: 0009-QQuickItem-avoid-emitting-signals-during-destruction.patch Patch0010: 0010-a11y-track-item-enabled-state.patch Patch0011: 0011-Make-QaccessibleQuickWidget-private-API.patch Patch0012: 0012-Qml-Don-t-crash-when-as-casting-to-type-with-errors.patch -Patch0013: 0013-Fix-missing-glyphs-when-using-NativeRendering.patch -Patch0014: 0014-Revert-Fix-missing-glyphs-when-using-NativeRendering.patch Patch0015: 0015-QQmlImportDatabase-Make-sure-the-newly-added-import-.patch Patch0016: 0016-QQuickState-when-handle-QJSValue-properties-correctl.patch Patch0017: 0017-Models-Avoid-crashes-when-deleting-cache-items.patch @@ -178,6 +176,9 @@ make check -k -C tests ||: %endif %changelog +* Wed Oct 18 2023 Funda Wang - 5.15.11-1 +- New version 5.15.11 + * Tue May 23 2023 Funda Wang - 5.15.9-1 - New version 5.15.9 diff --git a/qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz b/qtdeclarative-everywhere-opensource-src-5.15.11.tar.xz similarity index 71% rename from qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz rename to qtdeclarative-everywhere-opensource-src-5.15.11.tar.xz index 527257eefd0187f13f51f94ddc39a75fdb4f9150..d5bc0f9075aad35d8585512691c4fba94c76dce8 100644 Binary files a/qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz and b/qtdeclarative-everywhere-opensource-src-5.15.11.tar.xz differ