Accepting request 1033058 from home:Vogtinator:qt5.15
Qt 5.15.7, untested OBS-URL: https://build.opensuse.org/request/show/1033058 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtdeclarative?expand=0&rev=23
This commit is contained in:
Christophe Giboudeaux
Git OBS Bridge
parent
cfb15b3740
commit
689b370092
4
_service
4
_service
@ -1,12 +1,12 @@
|
||||
<services>
|
||||
<service name="obs_scm" mode="disabled">
|
||||
<param name="changesgenerate">enable</param>
|
||||
<param name="versionformat">5.15.6+kde@TAG_OFFSET@</param>
|
||||
<param name="versionformat">5.15.7+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.6-lts-lgpl</param>
|
||||
<param name="parent-tag">v5.15.7-lts-lgpl</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
</service>
|
||||
<service name="set_version" mode="disabled"/>
|
||||
|
||||
@ -1,3 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 3 08:53:44 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to version 5.15.7+kde18, rebased upstream:
|
||||
* Revert "Fix ListView.isCurrentItem when used with DelegateModel"
|
||||
* Stop using QHash::unite() in storage model manual test
|
||||
* SaveableUnitPointer::saveToDisk restores flags incorrectly at cleanup
|
||||
* Document that clearComponentCache() does not clear existing objects
|
||||
* Doc: Replace return `0` with nullptr
|
||||
* Doc: Fix QtQuick::Keys::forwardTo generic list type
|
||||
* Doc: QQmlContext: make it more readable
|
||||
* Fix ListView.isCurrentItem when used with DelegateModel
|
||||
* Fix documentation on JavaScript imports
|
||||
* doc: Remove bogus PinchHandler.minimumTouchPoints prop; improve actual
|
||||
* tst_grabImage: Fix the cases were visually comparing invisible items
|
||||
* Reinitialize shader data structure when effect changes
|
||||
* Doc: mention that clipping can affect performance and link to page
|
||||
* Ensure init of m_current_projection_matrix in single-clipped-item scene
|
||||
* Canvas: Add a means to override the DPR used via an environment variable
|
||||
* Fix regression in ListView/Flickable event delivery
|
||||
* qquicktextinput: Clear pre-edit text after input method reset
|
||||
- Rebase qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 26 10:33:14 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
|
||||
@ -19,11 +19,11 @@
|
||||
%define qt5_snapshot 1
|
||||
%define libname libQtQuick5
|
||||
%define base_name libqt5
|
||||
%define real_version 5.15.6
|
||||
%define so_version 5.15.6
|
||||
%define real_version 5.15.7
|
||||
%define so_version 5.15.7
|
||||
%define tar_version qtdeclarative-everywhere-src-%{version}
|
||||
Name: libqt5-qtdeclarative
|
||||
Version: 5.15.6+kde20
|
||||
Version: 5.15.7+kde18
|
||||
Release: 0
|
||||
Summary: Qt 5 Declarative Library
|
||||
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 6a07dafec274076303573555f256c27aaf309d7e Mon Sep 17 00:00:00 2001
|
||||
From b82b1954fd0ab4e1c8aff38dac7310f6c4f144e0 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()
|
||||
@ -19,20 +19,20 @@ Fixes: QTBUG-83890
|
||||
Pick-to: 5.15
|
||||
---
|
||||
src/quick/items/qquickitemview.cpp | 4 +-
|
||||
.../qquicklistview/tst_qquicklistview.cpp | 6 +
|
||||
.../qquicklistview/tst_qquicklistview.cpp | 5 +
|
||||
.../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(-)
|
||||
7 files changed, 243 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
|
||||
index f8ad168a17..a797bec4ef 100644
|
||||
--- a/src/quick/items/qquickitemview.cpp
|
||||
+++ b/src/quick/items/qquickitemview.cpp
|
||||
@@ -1393,7 +1393,7 @@ qreal QQuickItemView::maxYExtent() const
|
||||
@ -54,7 +54,7 @@ index 010a0152e1..965beed7bc 100644
|
||||
if (d->hData.maxExtentDirty) {
|
||||
d->maxExtent = d->maxExtentForAxis(d->hData, true);
|
||||
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
|
||||
index a7aefbe432..afe5c5ac1a 100644
|
||||
index b564fd3ba5..5f0aeb42f7 100644
|
||||
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
|
||||
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
|
||||
@@ -73,6 +73,8 @@ public:
|
||||
@ -66,24 +66,23 @@ index a7aefbe432..afe5c5ac1a 100644
|
||||
void init();
|
||||
void cleanupTestCase();
|
||||
// Test QAbstractItemModel model types
|
||||
@@ -300,6 +302,8 @@ private slots:
|
||||
void clickHeaderAndFooterWhenClip();
|
||||
void animatedDelegate();
|
||||
@@ -303,6 +305,8 @@ private slots:
|
||||
void dragDelegateWithMouseArea_data();
|
||||
void isCurrentItem_DelegateModel();
|
||||
|
||||
+ // 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);
|
||||
@@ -10109,6 +10113,8 @@ void tst_QQuickListView::animatedDelegate()
|
||||
@@ -10200,6 +10204,7 @@ void tst_QQuickListView::dragDelegateWithMouseArea_data()
|
||||
QTest::newRow(enumValueName) << static_cast<QQuickItemView::LayoutDirection>(layDir);
|
||||
}
|
||||
}
|
||||
|
||||
+// WARNING: please add new tests to tst_qquicklistview2; this file is too slow to work with.
|
||||
+
|
||||
|
||||
QTEST_MAIN(tst_QQuickListView)
|
||||
|
||||
#include "tst_qquicklistview.moc"
|
||||
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
|
||||
@ -356,5 +355,5 @@ index 45bcf8a9ce..00f7d64d1e 100644
|
||||
qquickloader \
|
||||
qquickmousearea \
|
||||
--
|
||||
2.36.1
|
||||
2.38.0
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f5d75798be550f443ef5197c83714f0a1e18e2c2653aea4f8797be4c6397e513
|
||||
size 143318542
|
||||
3
qtdeclarative-everywhere-src-5.15.7+kde18.obscpio
Normal file
3
qtdeclarative-everywhere-src-5.15.7+kde18.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:edb0858f0b0f77ac2777adee66d7b0209e23b51ff7cb0a4db45a111a3311e13a
|
||||
size 143330318
|
||||
@ -1,4 +1,4 @@
|
||||
name: qtdeclarative-everywhere-src
|
||||
version: 5.15.6+kde20
|
||||
mtime: 1662624843
|
||||
commit: b3aaf1482c48bbc0ca4f7c7934597c055afe4b6a
|
||||
version: 5.15.7+kde18
|
||||
mtime: 1666990413
|
||||
commit: 45d43c04088efb8346979f633f72bb1f23183461
|
||||
|
||||
Loading…
Reference in New Issue
Block a user