Qt 5.15.5 with patch collection + qtscript 5.15.10

OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtdeclarative?expand=0&rev=21
2022-06-28 08:21:10 +00:00 · 2022-06-28 08:21:10 +00:00 · cc47a9a29c
commit cc47a9a29c
parent ff96a8e32f
8 changed files with 161 additions and 73 deletions
--- a/0001-Revert-Bump-version.patch
+++ b/0001-Revert-Bump-version.patch
@ -1,23 +0,0 @@
-From d611fb1a24f584b8c1f79f449959171dd7d69cbd Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Mon, 21 Jun 2021 22:37:30 +0200
-Subject: [PATCH] Revert "Bump version"
-
-This reverts commit 568763928a78b52373932b01be17e040f7c3fa50.
---
- .qmake.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.qmake.conf b/.qmake.conf
-index 4e82106546..85b893856b 100644
--- a/.qmake.conf
-+++ b/.qmake.conf
-@@ -4,4 +4,4 @@ CONFIG += warning_clean
- DEFINES += QT_NO_LINKED_LIST
- DEFINES += QT_NO_JAVA_STYLE_ITERATORS
- 
-MODULE_VERSION = 5.15.3
-+MODULE_VERSION = 5.15.2
-- 
-2.20.1
-
--- a/4
+++ b/4
@ -1,12 +1,12 @@
 <services>
  <service name="obs_scm" mode="disabled">
   <param name="changesgenerate">enable</param>
-   <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
+   <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param>
   <param name="url">https://invent.kde.org/qt/qt/qtdeclarative.git</param>
   <param name="scm">git</param>
   <param name="filename">qtdeclarative-everywhere-src</param>
   <param name="revision">kde/5.15</param>
-   <param name="parent-tag">v5.15.2</param>
+   <param name="parent-tag">v5.15.5-lts-lgpl</param>
   <param name="changesgenerate">enable</param>
  </service>
  <service name="set_version" mode="disabled"/>
--- a/libqt5-qtdeclarative.changes
+++ b/libqt5-qtdeclarative.changes
@ -1,3 +1,100 @@
+-------------------------------------------------------------------
+Mon Jun 27 12:41:54 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to version 5.15.5+kde19, rebased upstream:
+  * Fix Flickable with QTBUG-56075 patch applied
+  * Fix Flickable wheel velocity calculation
+  * QSGOpenGLDistanceFieldGlyphCache: fix UB (ordering of pointers not from the same array)
+  * QSGOpenGLDistanceFieldGlyphCache: fix multiplication result truncation
+  * QQuickItem: Guard against cycles in nextPrevItemInTabFocusChain
+  * Make sure QQuickWidget and its offscreen window's screens are always in sync
+  * V4: Do not call dtor of an object we continue to use
+  * doc: Improve QQuickItem::ItemChangeData docs
+  * Remove tst_pixel
+  * docs: Clarify EventPoint properties
+  * Consistent naming for (to|from)Is(Defined|Sourced) in animations
+  * Map window coordinates to the same coordinate system as the QPointerEvent point
+  * Doc: Fix the Shapes table to reflect reality
+  * Doc: Clarify preconditions for using QML_ELEMENT et al
+  * Do full overlap checks within the alpha render list when rebuilding
+  * MASM: Put pageSize into an inline namespace
+  * TextEdit: update all glyphnodes on QTD::contentsChanged() signal
+  * qquicktableview: upon forceLayout(), check for visible rows/columns at the origin
+  * V4 Debugger: Collect locals also from block scopes
+  * Make PinchArea translate correctly inside a rotated parent
+  * Avoid stale QSGTexture pointer accesses
+  * V4 debugger: Properly count break points
+  * Fix build with GCC 11: include <limits>
+  * Document QQmlComponent::createWithInitialProperties() error handling
+  * QQmlComponentPrivate::setInitialProperty: improve error message
+  * Remove extra colon
+  * Fix warning and assert when removing items from groups
+  * Document that QML_SINGLETON only works with QObjects
+  * qqmlirbuilder: Fix treating parser warnings as errros
+  * Prevent infinite recursion in QQuickItemPrivate::itemToWindowTransform
+  * Avoid crash when accessing an empty QTextLine
+  * doc: fix up QQuickItem::contains() docs
+  * QQuickTextInput: update cursor rectangle after padding changed
+  * Assert that pointer is non-null
+  * qqmlapplicationengine: Handle errors during component creation
+  * Do not batch lines with > 1 width in alpha pass
+  * Don't crash when trying to invoke non-existing string converter
+  * Fix incorrect depth test state with QSGRenderNode::DepthAwareRendering
+  * Do not auto-clean components with live inline components
+  * QuickTest: Do not recurse forever on inline components in enumerateTestCases
+  * DelegateModelGroup: Fix bug where item could be removed from the model
+  * Remove unnecessary forward declaration
+  * QQuickTableView: always update content size when rebuilding small tables
+  * Do less work when there are no active ImageParticle particles
+  * Revert "Update commercial license headers"
+  * QQuickTableView: forceLayout() should work, even when no items are loaded
+  * Revert "Use unique_ptr to clarify ownership of QQuickDefaultClipNode objects"
+  * Ensure that the case of the path will match then QUrl for a UNC path
+  * Use unique_ptr to clarify ownership of QQuickDefaultClipNode objects
+  * MouseArea: fix containsMouse behavior during visibility changes
+  * QQuickTextControl: commit pre-edit after key press
+  * qv4generatorobject: Fix crash when creating new properties
+  * QQmlIncubator: handle clear inside setinitialState
+  * Fix release-only windows builds
+  * Fix lookup of existing inline components by name
+  * qquicktextinput: Fix validation for IM event
+  * docs: Fix documentation of the Locale numberOptions property
+  * QQmlPropertyPrivate::signalExpression: handle object being null
+  * qquicktextinput: Fix Undo history for IM event
+  * QQuickWindowIncubationController: Use QPointer to guard QSGRenderLoop reference
+  * qmlplugindump: Fix overload ambiguity
+  * QV4 Engine: Remove MSVC special casing
+  * QQuickTextEdit: ensure we update after changing padding
+  * QQuickItemParticle give() method kill particle
+  * QSequentialAnimationGroupJob: Protect against self-deletion
+  * Change QQuickShortcut::setSequences to bind to all sequences
+  * qquicktextinput: ensure we update IM when cursor changes position
+  * QQuickListView: Add autotest so that animated delegate does not crash
+  * QQmlIRLoader: Actually load RequiredPropertyExtraData
+  * Doc: Fix broken QDoc markup
+  * Update commercial license headers
+  * QQmlProperty: Guard QQmlContextData with QQmlGuardedContextData
+  * ListModel: Fix move handling in sync
+  * tst_EcmaScriptTests: Raise timeout
+  * QuickLayouts: fix crash when layout width depends on parent width
+  * export QAcccessibleQuickItem
+  * QAnimationGroupJob: Don't call virtual functions from dtor
+  * Fix QQuickShortcut::setContext so re-grab all shortcuts
+  * Revert "Set the stencil buffer zone" and "Add clipNext null pointer guard"
+  * Fix Text with ElideRight not being rendered when width goes from 0 to >0
+  * Cache static compilation units
+  * Regenerate Shape fill geometry when alpha changes to non-zero
+  * Remove QQmlCleanup from QQmlScriptData
+  * Add Lancelot tests for both types of clipping
+  * masm: Add error handling for failed mprotect()
+  * QQuickLoader: prevent clearing initial properties after active = true
+  * Correct #if-ery in QML locale's time-zone update test
+  * Doc: mention that Item's childrenRect property is local to the item
+- Commits dropped by the rebase:
+  * Add missing limits include to fix build with GCC 11
+- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
+- Rebase qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch
+
 -------------------------------------------------------------------
 Wed Apr  6 06:50:15 UTC 2022 - Antonio Larrosa <alarrosa@suse.com>

--- a/libqt5-qtdeclarative.spec
+++ b/libqt5-qtdeclarative.spec
@ -19,11 +19,11 @@
 %define qt5_snapshot 1
 %define libname libQtQuick5
 %define base_name libqt5
-%define real_version 5.15.2
-%define so_version 5.15.2
+%define real_version 5.15.5
+%define so_version 5.15.5
 %define tar_version qtdeclarative-everywhere-src-%{version}
 Name:           libqt5-qtdeclarative
-Version:        5.15.2+kde43
+Version:        5.15.5+kde19
 Release:        0
 Summary:        Qt 5 Declarative Library
 License:        LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
@ -31,8 +31,6 @@ Group:          Development/Libraries/X11
 URL:            https://www.qt.io
 Source:         %{tar_version}.tar.xz
 Source1:        baselibs.conf
-# PATCH-FIX-OPENSUSE
-Patch1:         0001-Revert-Bump-version.patch
 # PATCH-FIX-OPENSUSE sse2_nojit.patch -- enable JIT and sse2 only on sse2 case
 Patch100:       sse2_nojit.patch
 Patch103:       qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch
--- a/qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch
+++ b/qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch
@ -1,10 +1,7 @@
-Parent:     f5a4e984 (QQuickTextInputPrivate: refactor getImplicitWidth() to calculateImplicitWidth())
-Author:     David Redondo <qt@david-redondo.de>
-AuthorDate: 2020-05-13 11:04:23 +0200
-Commit:     Mitch Curtis <mitch.curtis@qt.io>
-CommitDate: 2020-05-25 10:58:35 +0200
-
-QQuickItemView: Fix max(X/Y)Extent()
+From 6a07dafec274076303573555f256c27aaf309d7e Mon Sep 17 00:00:00 2001
+From: David Redondo <qt@david-redondo.de>
+Date: Mon, 27 Jun 2022 15:31:10 +0200
+Subject: [PATCH] QQuickItemView: Fix max(X/Y)Extent()

 QQuickFlickable maxXExtent() and maxYExtent() return the amount of space
 that is not shown when inside a ScrollView. QQuickItemView however just
@ -20,12 +17,24 @@ tests.

 Fixes: QTBUG-83890
 Pick-to: 5.15
-Change-Id: I7f4060c2f46ae07611bedceca0d322c5f7f6affb
-========================================================================================================================
-Index: qtdeclarative-everywhere-src-5.15.2/src/quick/items/qquickitemview.cpp
-===================================================================
--- qtdeclarative-everywhere-src-5.15.2.orig/src/quick/items/qquickitemview.cpp
-+++ qtdeclarative-everywhere-src-5.15.2/src/quick/items/qquickitemview.cpp
+---
+ src/quick/items/qquickitemview.cpp            |   4 +-
+ .../qquicklistview/tst_qquicklistview.cpp     |   6 +
+ .../quick/qquicklistview2/data/maxXExtent.qml |  54 +++++++++
+ .../quick/qquicklistview2/data/maxYExtent.qml |  55 +++++++++
+ .../quick/qquicklistview2/qquicklistview2.pro |  12 ++
+ .../qquicklistview2/tst_qquicklistview2.cpp   | 114 ++++++++++++++++++
+ tests/auto/quick/quick.pro                    |   1 +
+ 7 files changed, 244 insertions(+), 2 deletions(-)
+ create mode 100644 tests/auto/quick/qquicklistview2/data/maxXExtent.qml
+ create mode 100644 tests/auto/quick/qquicklistview2/data/maxYExtent.qml
+ create mode 100644 tests/auto/quick/qquicklistview2/qquicklistview2.pro
+ create mode 100644 tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp
+
+diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
+index 010a0152e1..965beed7bc 100644
+--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -1393,7 +1393,7 @@ qreal QQuickItemView::maxYExtent() const
 {
     Q_D(const QQuickItemView);
@ -44,10 +53,10 @@ Index: qtdeclarative-everywhere-src-5.15.2/src/quick/items/qquickitemview.cpp
 
     if (d->hData.maxExtentDirty) {
         d->maxExtent = d->maxExtentForAxis(d->hData, true);
-Index: qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
-===================================================================
--- qtdeclarative-everywhere-src-5.15.2.orig/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
-+++ qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+index a7aefbe432..afe5c5ac1a 100644
+--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -73,6 +73,8 @@ public:
     tst_QQuickListView();
 
@ -57,17 +66,17 @@ Index: qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/qquicklistview/tst_q
     void init();
     void cleanupTestCase();
     // Test QAbstractItemModel model types
-@@ -299,6 +301,8 @@ private slots:
-     void requiredObjectListModel();
+@@ -300,6 +302,8 @@ private slots:
     void clickHeaderAndFooterWhenClip();
+     void animatedDelegate();
 
 +    // WARNING: please add new tests to tst_qquicklistview2; this file is too slow to work with.
 +
 private:
     template <class T> void items(const QUrl &source);
     template <class T> void changed(const QUrl &source);
-@@ -10094,6 +10098,8 @@ void tst_QQuickListView::clickHeaderAndF
-     QVERIFY(root->property("footerPressed").toBool());
+@@ -10109,6 +10113,8 @@ void tst_QQuickListView::animatedDelegate()
+     }
 }
 
 +// WARNING: please add new tests to tst_qquicklistview2; this file is too slow to work with.
@ -75,10 +84,11 @@ Index: qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/qquicklistview/tst_q
 QTEST_MAIN(tst_QQuickListView)
 
 #include "tst_qquicklistview.moc"
-Index: qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/qquicklistview2/data/maxXExtent.qml
-===================================================================
+diff --git a/tests/auto/quick/qquicklistview2/data/maxXExtent.qml b/tests/auto/quick/qquicklistview2/data/maxXExtent.qml
+new file mode 100644
+index 0000000000..3a50ae9edd
 --- /dev/null
-+++ qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/qquicklistview2/data/maxXExtent.qml
+++ b/tests/auto/quick/qquicklistview2/data/maxXExtent.qml
@@ -0,0 +1,54 @@
 +/****************************************************************************
 +**
@ -134,10 +144,11 @@ Index: qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/qquicklistview2/data
 +        }
 +    }
 +}
-Index: qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/qquicklistview2/data/maxYExtent.qml
-===================================================================
+diff --git a/tests/auto/quick/qquicklistview2/data/maxYExtent.qml b/tests/auto/quick/qquicklistview2/data/maxYExtent.qml
+new file mode 100644
+index 0000000000..2c73092aad
 --- /dev/null
-+++ qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/qquicklistview2/data/maxYExtent.qml
+++ b/tests/auto/quick/qquicklistview2/data/maxYExtent.qml
@@ -0,0 +1,55 @@
 +/****************************************************************************
 +**
@ -194,10 +205,11 @@ Index: qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/qquicklistview2/data
 +        }
 +    }
 +}
-Index: qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/qquicklistview2/qquicklistview2.pro
-===================================================================
+diff --git a/tests/auto/quick/qquicklistview2/qquicklistview2.pro b/tests/auto/quick/qquicklistview2/qquicklistview2.pro
+new file mode 100644
+index 0000000000..1128c242c7
 --- /dev/null
-+++ qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/qquicklistview2/qquicklistview2.pro
+++ b/tests/auto/quick/qquicklistview2/qquicklistview2.pro
@@ -0,0 +1,12 @@
 +CONFIG += testcase
 +TARGET = tst_qquicklistview2
@ -211,10 +223,11 @@ Index: qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/qquicklistview2/qqui
 +TESTDATA = data/*
 +
 +QT += core-private gui-private qml-private quick-private testlib qmltest
-Index: qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp
-===================================================================
+diff --git a/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp b/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp
+new file mode 100644
+index 0000000000..916c8730f4
 --- /dev/null
-+++ qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp
+++ b/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp
@@ -0,0 +1,114 @@
 +/****************************************************************************
 +**
@ -330,10 +343,10 @@ Index: qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/qquicklistview2/tst_
 +QTEST_MAIN(tst_QQuickListView2)
 +
 +#include "tst_qquicklistview2.moc"
-Index: qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/quick.pro
-===================================================================
--- qtdeclarative-everywhere-src-5.15.2.orig/tests/auto/quick/quick.pro
-+++ qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/quick.pro
+diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
+index 45bcf8a9ce..00f7d64d1e 100644
+--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -67,6 +67,7 @@ QUICKTESTS += \
     qquickitem2 \
     qquickitemlayer \
@ -342,3 +355,6 @@ Index: qtdeclarative-everywhere-src-5.15.2/tests/auto/quick/quick.pro
     qquicktableview \
     qquickloader \
     qquickmousearea \
+-- 
+2.36.1
+
--- a/qtdeclarative-everywhere-src-5.15.2+kde43.obscpio
+++ b/qtdeclarative-everywhere-src-5.15.2+kde43.obscpio
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d301a6393f54d189bf7ccb14eeb6455c220ea02c818afa0cba3980b88500c77b
-size 143172110
--- a/qtdeclarative-everywhere-src-5.15.5+kde19.obscpio
+++ b/qtdeclarative-everywhere-src-5.15.5+kde19.obscpio
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f38bbb73ffe5f22c24936a544615a40416357565cd5ebcd448ff7dad2ac271ab
+size 143268366
--- a/qtdeclarative-everywhere-src.obsinfo
+++ b/qtdeclarative-everywhere-src.obsinfo
@ -1,4 +1,4 @@
 name: qtdeclarative-everywhere-src
-version: 5.15.2+kde43
-mtime: 1641572191
-commit: c691908c54ed7815f513f8511005dbf1f13ad40d
+version: 5.15.5+kde19
+mtime: 1655470845
+commit: c47f3d7b227c9bc86ca1702ae3291a62c2116cfa