5.15.6
This commit is contained in:
Jan Grulich
parent
0274d90b40
commit
eb2f4bd1df
|
|
@ -10,3 +10,4 @@
|
|||
/qtdeclarative-everywhere-opensource-src-5.15.3.tar.xz
|
||||
/qtdeclarative-everywhere-opensource-src-5.15.4.tar.xz
|
||||
/qtdeclarative-everywhere-opensource-src-5.15.5.tar.xz
|
||||
/qtdeclarative-everywhere-opensource-src-5.15.6.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 48fc7f164a347f88c221c6a86614008b63b7767f Mon Sep 17 00:00:00 2001
|
||||
From 343649de778b8c338438e19991c2354d05ec5329 Mon Sep 17 00:00:00 2001
|
||||
From: Albert Astals Cid <albert.astals.cid@kdab.com>
|
||||
Date: Fri, 21 May 2021 13:17:15 +0200
|
||||
Subject: [PATCH 01/19] Document that StyledText also supports and
|
||||
Subject: [PATCH 01/20] Document that StyledText also supports and
|
||||
"
|
||||
|
||||
Change-Id: I1715f8ae8ec8d0fbaf6dbe2b8663cc169da663cd
|
||||
|
|
@ -25,5 +25,5 @@ index 6230186933..c1571fc6f5 100644
|
|||
|
||||
\c Text.StyledText parser is strict, requiring tags to be correctly nested.
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 65394fd28a8acaf26039418c21718894891295c6 Mon Sep 17 00:00:00 2001
|
||||
From 933f752d3223301cbcfe0adc496ffc4442dab5cb Mon Sep 17 00:00:00 2001
|
||||
From: Albert Astals Cid <albert.astals.cid@kdab.com>
|
||||
Date: Fri, 21 May 2021 13:42:35 +0200
|
||||
Subject: [PATCH 02/19] Support ' in styled text
|
||||
Subject: [PATCH 02/20] Support ' in styled text
|
||||
|
||||
Pick-to: 6.1 5.15
|
||||
Change-Id: I4a8db963e52a7899ab1796f9a560e8029cc1c929
|
||||
|
|
@ -40,5 +40,5 @@ index d531fc9205..a25af90414 100644
|
|||
textOut += QChar(34);
|
||||
else if (entity == QLatin1String("nbsp"))
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 9828b34ccf14d33bc9a61a4bd37e9e8d7877168a Mon Sep 17 00:00:00 2001
|
||||
From 7ff3dc36c1bd518bcfaf890694cfea07178cf7f7 Mon Sep 17 00:00:00 2001
|
||||
From: Albert Astals Cid <albert.astals.cid@kdab.com>
|
||||
Date: Thu, 17 Jun 2021 16:32:28 +0200
|
||||
Subject: [PATCH 03/19] Remove unused QPointer<QQuickPointerMask>
|
||||
Subject: [PATCH 03/20] Remove unused QPointer<QQuickPointerMask>
|
||||
|
||||
Change-Id: I009fa6bbd8599dc3bb2e810176fe20e70ed50851
|
||||
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
||||
|
|
@ -31,5 +31,5 @@ index fba383e268..0d63618622 100644
|
|||
QPointF targetStartPos;
|
||||
QPointF lastPos;
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 814f570d51323630ff84038ca04b5c02639e0ee5 Mon Sep 17 00:00:00 2001
|
||||
From 2e36092b74206315a637fd68eceb5e864e6dd0dd Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Shachnev <mitya57@gmail.com>
|
||||
Date: Wed, 18 Aug 2021 22:50:29 +0300
|
||||
Subject: [PATCH 04/19] Include <limits> in Yarr.h to fix build with GCC 11
|
||||
Subject: [PATCH 04/20] Include <limits> in Yarr.h to fix build with GCC 11
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
|
@ -39,5 +39,5 @@ index ccf78f9880..2955ea7e72 100644
|
|||
|
||||
namespace JSC { namespace Yarr {
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From adf0f345f6fb823679e1c6424d106fd1413c1edc Mon Sep 17 00:00:00 2001
|
||||
From 412bc857ee5cc43671f2c003af50c6393ebb6592 Mon Sep 17 00:00:00 2001
|
||||
From: Aleix Pol <aleixpol@kde.org>
|
||||
Date: Tue, 21 Sep 2021 00:10:26 +0200
|
||||
Subject: [PATCH 05/19] QQuickLoader: Do not incubate if the source arrives
|
||||
Subject: [PATCH 05/20] QQuickLoader: Do not incubate if the source arrives
|
||||
after setActive(false)
|
||||
|
||||
Otherwise we end up in the crazy place of active being false but item
|
||||
|
|
@ -108,5 +108,5 @@ index 0f6c811adb..dddacbaa0b 100644
|
|||
|
||||
#include "tst_qquickloader.moc"
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 95064bee0366ed3aa9cc823ed73fba55093ced01 Mon Sep 17 00:00:00 2001
|
||||
From 3fc1e9fa7aee33fe804f53653ec593caa810beb0 Mon Sep 17 00:00:00 2001
|
||||
From: Aleix Pol <aleixpol@kde.org>
|
||||
Date: Thu, 23 Sep 2021 03:43:04 +0200
|
||||
Subject: [PATCH 06/19] QQmlDelegateModel: Refresh the view when a column is
|
||||
Subject: [PATCH 06/20] QQmlDelegateModel: Refresh the view when a column is
|
||||
added at 0
|
||||
|
||||
It can happen that a model reports n>0 rows but columns=0 (See
|
||||
|
|
@ -22,7 +22,7 @@ Signed-off-by: Aleix Pol <aleixpol@kde.org>
|
|||
create mode 100644 tests/auto/qml/qqmldelegatemodel/data/redrawUponColumnChange.qml
|
||||
|
||||
diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp
|
||||
index 312a621029..f5d586a4c2 100644
|
||||
index 2079a8ed04..a577cb2351 100644
|
||||
--- a/src/qmlmodels/qqmldelegatemodel.cpp
|
||||
+++ b/src/qmlmodels/qqmldelegatemodel.cpp
|
||||
@@ -389,6 +389,12 @@ void QQmlDelegateModelPrivate::connectToAbstractItemModel()
|
||||
|
|
@ -51,7 +51,7 @@ index 312a621029..f5d586a4c2 100644
|
|||
QObject::disconnect(aim, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)),
|
||||
q, SLOT(_q_dataChanged(QModelIndex,QModelIndex,QVector<int>)));
|
||||
QObject::disconnect(aim, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)),
|
||||
@@ -1960,6 +1972,38 @@ void QQmlDelegateModel::_q_rowsMoved(
|
||||
@@ -1973,6 +1985,38 @@ void QQmlDelegateModel::_q_rowsMoved(
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -122,7 +122,7 @@ index 0000000000..206133bb39
|
|||
+ }
|
||||
+}
|
||||
diff --git a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
|
||||
index 9bc359d243..120b1897a1 100644
|
||||
index 35f1e2c94d..1722447830 100644
|
||||
--- a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
|
||||
+++ b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
|
||||
@@ -27,6 +27,8 @@
|
||||
|
|
@ -134,16 +134,16 @@ index 9bc359d243..120b1897a1 100644
|
|||
#include <QtQml/qqmlcomponent.h>
|
||||
#include <QtQmlModels/private/qqmldelegatemodel_p.h>
|
||||
#include <QtQuick/qquickview.h>
|
||||
@@ -46,6 +48,7 @@ private slots:
|
||||
void valueWithoutCallingObjectFirst();
|
||||
@@ -47,6 +49,7 @@ private slots:
|
||||
void filterOnGroup_removeWhenCompleted();
|
||||
void qtbug_86017();
|
||||
void contextAccessedByHandler();
|
||||
+ void redrawUponColumnChange();
|
||||
};
|
||||
|
||||
class AbstractItemModel : public QAbstractItemModel
|
||||
@@ -164,6 +167,30 @@ void tst_QQmlDelegateModel::qtbug_86017()
|
||||
QCOMPARE(model->filterGroup(), "selected");
|
||||
@@ -186,6 +189,30 @@ void tst_QQmlDelegateModel::contextAccessedByHandler()
|
||||
QVERIFY(root->property("works").toBool());
|
||||
}
|
||||
|
||||
+void tst_QQmlDelegateModel::redrawUponColumnChange()
|
||||
|
|
@ -174,5 +174,5 @@ index 9bc359d243..120b1897a1 100644
|
|||
|
||||
#include "tst_qqmldelegatemodel.moc"
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From c580a46359307b03bb3e8d5a3ce844fcd167d92d Mon Sep 17 00:00:00 2001
|
||||
From aabe4e4cb74855205a5c7fa3f1dff4fea7fe05af Mon Sep 17 00:00:00 2001
|
||||
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
||||
Date: Sun, 10 Oct 2021 21:04:21 +0300
|
||||
Subject: [PATCH 07/19] Fix sweep step for tainted QObject JavaScript wrappers
|
||||
Subject: [PATCH 07/20] Fix sweep step for tainted QObject JavaScript wrappers
|
||||
|
||||
Currently, whenever the garbage collector runs, it will destroy all
|
||||
valid tainted wrappers.
|
||||
|
|
@ -115,5 +115,5 @@ index 5d635aa63b..824fd89e5b 100644
|
|||
// engine2 doesn't own the object as engine1 was the first to wrap it above.
|
||||
// Therefore, no effect here.
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 74db4a874a39b189d000d0b8507fccfbacf83294 Mon Sep 17 00:00:00 2001
|
||||
From 6b86df958de8c887e8685183e068bb200e357785 Mon Sep 17 00:00:00 2001
|
||||
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
||||
Date: Tue, 12 Oct 2021 13:13:01 +0200
|
||||
Subject: [PATCH 08/19] Fix distorted text with subpixel matrix translation
|
||||
Subject: [PATCH 08/20] Fix distorted text with subpixel matrix translation
|
||||
|
||||
We would pixel-align native text *before* applying the
|
||||
model-view matrix, which would cause GL_NEAREST artifacts to
|
||||
|
|
@ -479,5 +479,5 @@ index 0000000000..c60fc4d8b0
|
|||
+ }
|
||||
+}
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From b92f401a758890d26ef0d00d15c33af5c81f9038 Mon Sep 17 00:00:00 2001
|
||||
From 783cb960224ecd984bb585b5633bacc3ba9b6391 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Agocs <laszlo.agocs@qt.io>
|
||||
Date: Mon, 11 Oct 2021 15:37:33 +0200
|
||||
Subject: [PATCH 09/19] Revert "Fix for possible crash in
|
||||
Subject: [PATCH 09/20] Revert "Fix for possible crash in
|
||||
QSGDefaultLayer::grab"
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
|
|
@ -67,5 +67,5 @@ index 4deb6c70a3..c0a1ccab78 100644
|
|||
protected:
|
||||
void releaseResources() override;
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 695e1217f2e568feb3ddec91b2cf70df251964e5 Mon Sep 17 00:00:00 2001
|
||||
From b03b25f417d1db2a43e2df39a6fb355f993a341d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= <jan-arve.saether@qt.io>
|
||||
Date: Thu, 3 Sep 2020 10:51:01 +0200
|
||||
Subject: [PATCH 10/19] Fix TapHandler so that it actually registers a tap
|
||||
Subject: [PATCH 10/20] Fix TapHandler so that it actually registers a tap
|
||||
|
||||
This bug caused all quick examples that used the
|
||||
shared\LauncherList.qml to be broken.
|
||||
|
|
@ -69,5 +69,5 @@ index b51f53b74f..89081b4e84 100644
|
|||
|
||||
void QQuickSinglePointHandler::handlePointerEventImpl(QQuickPointerEvent *event)
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From d46164fdd36d748d427716e473e8f006d391f088 Mon Sep 17 00:00:00 2001
|
||||
From da454326a35facfe70b0f672b3d42fed9804607b Mon Sep 17 00:00:00 2001
|
||||
From: Albert Astals Cid <aacid@kde.org>
|
||||
Date: Tue, 16 Nov 2021 22:43:37 +0100
|
||||
Subject: [PATCH 11/19] Revert "Fix TapHandler so that it actually registers a
|
||||
Subject: [PATCH 11/20] Revert "Fix TapHandler so that it actually registers a
|
||||
tap"
|
||||
|
||||
This reverts commit 36e8ccd434f948e4f11a8f9d59139ec072e41ff5.
|
||||
|
|
@ -57,5 +57,5 @@ index 89081b4e84..b51f53b74f 100644
|
|||
|
||||
void QQuickSinglePointHandler::handlePointerEventImpl(QQuickPointerEvent *event)
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 01322ea1a58b441071be7c66754d62ac50f49c4e Mon Sep 17 00:00:00 2001
|
||||
From a3344d5b32e36e513de18eb3685652cd29d5ef93 Mon Sep 17 00:00:00 2001
|
||||
From: Marc Mutz <marc.mutz@qt.io>
|
||||
Date: Tue, 21 Dec 2021 09:20:17 +0100
|
||||
Subject: [PATCH 12/19] QQmlJs::FixedPoolArray: fix UB (precondition violation)
|
||||
Subject: [PATCH 12/20] QQmlJs::FixedPoolArray: fix UB (precondition violation)
|
||||
in allocate()
|
||||
|
||||
Says ubsan:
|
||||
|
|
@ -32,5 +32,5 @@ index b65b994d6c..15a8cd6878 100644
|
|||
}
|
||||
}
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From f5de08d116481630ad0843990ffdf141fd6ce69e Mon Sep 17 00:00:00 2001
|
||||
From 757782a0a62b90b223e6e008287b4cafc91beff1 Mon Sep 17 00:00:00 2001
|
||||
From: Ulf Hermann <ulf.hermann@qt.io>
|
||||
Date: Thu, 3 Feb 2022 10:02:06 +0100
|
||||
Subject: [PATCH 13/19] V4: Do not call dtor of an object we continue to use
|
||||
Subject: [PATCH 13/20] V4: Do not call dtor of an object we continue to use
|
||||
|
||||
After destroyObject(), the QObjectWrapper is still alive. We might use
|
||||
its heap object again. Furthermore, the Heap::QObjectWrapper dtor does
|
||||
|
|
@ -47,5 +47,5 @@ index 9899c9274e..272b85069f 100644
|
|||
|
||||
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From b485b9ca8983499a55d7e06a3ac3f0ac45a61b99 Mon Sep 17 00:00:00 2001
|
||||
From b4b283555f446ecfecb3f73f620c9ced2b261031 Mon Sep 17 00:00:00 2001
|
||||
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
||||
Date: Sat, 29 Jan 2022 21:59:33 +0200
|
||||
Subject: [PATCH 14/19] Make sure QQuickWidget and its offscreen window's
|
||||
Subject: [PATCH 14/20] Make sure QQuickWidget and its offscreen window's
|
||||
screens are always in sync
|
||||
|
||||
By default, the offscreen window is placed on the primary screen.
|
||||
|
|
@ -80,5 +80,5 @@ index 39780f8de3..223d91f579 100644
|
|||
case QEvent::Move:
|
||||
d->updatePosition();
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From aca0c736c99439a8f4d297bc57c1fa5a2d2a6e88 Mon Sep 17 00:00:00 2001
|
||||
From 731025928d89403dbe8cdc79c40dddeb8d68a7e1 Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Kosmale <fabian.kosmale@qt.io>
|
||||
Date: Wed, 4 May 2022 09:10:54 +0200
|
||||
Subject: [PATCH 15/19] QQuickItem: Guard against cycles in
|
||||
Subject: [PATCH 15/20] QQuickItem: Guard against cycles in
|
||||
nextPrevItemInTabFocusChain
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
|
|
@ -37,7 +37,7 @@ Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|||
create mode 100644 tests/auto/quick/qquickitem2/data/activeFocusOnTab_infiniteLoop3.qml
|
||||
|
||||
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
|
||||
index 3df899d63d..83e52b12e5 100644
|
||||
index 64123c82c4..aede212126 100644
|
||||
--- a/src/quick/items/qquickitem.cpp
|
||||
+++ b/src/quick/items/qquickitem.cpp
|
||||
@@ -59,6 +59,7 @@
|
||||
|
|
@ -88,10 +88,10 @@ index 0000000000..889e480f3b
|
|||
+ }
|
||||
+}
|
||||
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
|
||||
index f65650cf9c..eeff768bb4 100644
|
||||
index c8f251dbe1..c8ef36ee68 100644
|
||||
--- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
|
||||
+++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
|
||||
@@ -66,6 +66,7 @@ private slots:
|
||||
@@ -67,6 +67,7 @@ private slots:
|
||||
void activeFocusOnTab10();
|
||||
void activeFocusOnTab_infiniteLoop_data();
|
||||
void activeFocusOnTab_infiniteLoop();
|
||||
|
|
@ -99,7 +99,7 @@ index f65650cf9c..eeff768bb4 100644
|
|||
|
||||
void nextItemInFocusChain();
|
||||
void nextItemInFocusChain2();
|
||||
@@ -1055,6 +1056,17 @@ void tst_QQuickItem::activeFocusOnTab_infiniteLoop()
|
||||
@@ -1057,6 +1058,17 @@ void tst_QQuickItem::activeFocusOnTab_infiniteLoop()
|
||||
QCOMPARE(item, window->rootObject());
|
||||
}
|
||||
|
||||
|
|
@ -118,5 +118,5 @@ index f65650cf9c..eeff768bb4 100644
|
|||
{
|
||||
if (!qt_tab_all_widgets())
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From db0c06d98464d8d0cc6dfddfc502593951bac768 Mon Sep 17 00:00:00 2001
|
||||
From 920c4e95b85f7f06b58ac1016ca01ecb4043e755 Mon Sep 17 00:00:00 2001
|
||||
From: Marc Mutz <marc.mutz@kdab.com>
|
||||
Date: Tue, 16 Jul 2019 11:23:37 +0200
|
||||
Subject: [PATCH 16/19] QSGOpenGLDistanceFieldGlyphCache: fix multiplication
|
||||
Subject: [PATCH 16/20] QSGOpenGLDistanceFieldGlyphCache: fix multiplication
|
||||
result truncation
|
||||
|
||||
The type of the expression int * int is int, so truncation has already
|
||||
|
|
@ -39,5 +39,5 @@ index 53b6fe117f..f7cb8bede3 100644
|
|||
qWarning("qtdf table too small in font '%s'.",
|
||||
qPrintable(font.familyName()));
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 59019a226146d9d80a01db21c0c3d692027048aa Mon Sep 17 00:00:00 2001
|
||||
From 98e65ca71e389ad3e36aa3461ad4617815f9cd9a Mon Sep 17 00:00:00 2001
|
||||
From: Marc Mutz <marc.mutz@kdab.com>
|
||||
Date: Tue, 16 Jul 2019 11:31:01 +0200
|
||||
Subject: [PATCH 17/19] QSGOpenGLDistanceFieldGlyphCache: fix UB (ordering of
|
||||
Subject: [PATCH 17/20] QSGOpenGLDistanceFieldGlyphCache: fix UB (ordering of
|
||||
pointers not from the same array)
|
||||
|
||||
The code performed out of bounds checks by adding the size of the
|
||||
|
|
@ -64,5 +64,5 @@ index f7cb8bede3..219cdd5966 100644
|
|||
qPrintable(font.familyName()));
|
||||
return false;
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 955c47dd07d4337c279433b246421b92a4d16341 Mon Sep 17 00:00:00 2001
|
||||
From 79fa06279d26de7da111ddc88201324e55d68e8a Mon Sep 17 00:00:00 2001
|
||||
From: Shawn Rutledge <shawn.rutledge@qt.io>
|
||||
Date: Tue, 4 May 2021 10:12:39 +0200
|
||||
Subject: [PATCH 18/19] Fix Flickable wheel velocity calculation
|
||||
Subject: [PATCH 18/20] Fix Flickable wheel velocity calculation
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
|
@ -419,5 +419,5 @@ index 9e84261687..e69d6207a9 100644
|
|||
|
||||
Component.onCompleted: {
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From c47f3d7b227c9bc86ca1702ae3291a62c2116cfa Mon Sep 17 00:00:00 2001
|
||||
From e1ecf1c4e09b2f1d04f94971771019e59a50679f Mon Sep 17 00:00:00 2001
|
||||
From: Wolfgang Frisch <wfrisch@riseup.net>
|
||||
Date: Thu, 19 May 2022 00:55:50 +0200
|
||||
Subject: [PATCH 19/19] Fix Flickable with QTBUG-56075 patch applied
|
||||
Subject: [PATCH 19/20] Fix Flickable with QTBUG-56075 patch applied
|
||||
|
||||
---
|
||||
src/quick/items/qquickflickable.cpp | 2 ++
|
||||
|
|
@ -21,5 +21,5 @@ index efb2f11d02..2a5b16c31a 100644
|
|||
// FlickThreshold determines how far the "mouse" must have moved
|
||||
// before we perform a flick.
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
From b3aaf1482c48bbc0ca4f7c7934597c055afe4b6a Mon Sep 17 00:00:00 2001
|
||||
From: Tony Leinonen <tony.leinonen@qt.io>
|
||||
Date: Thu, 21 Oct 2021 14:44:02 +0300
|
||||
Subject: [PATCH 20/20] Reset currentChanges if currentChanges is active when
|
||||
refilling listView
|
||||
|
||||
currentIndex was not getting updated because itemViewChangeSet was left
|
||||
active from previous interaction. Clear the changes if they are still
|
||||
active on refill.
|
||||
|
||||
Task-number: QTBUG-92809
|
||||
Pick-to: 6.2 5.15
|
||||
Change-Id: I81558a5e0bfe0f880851fff85370bd5be60a5391
|
||||
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
|
||||
(cherry picked from commit 2d8033a4ffb9ca60adee29d375491d7ed2a82747)
|
||||
|
||||
* asturmlechner 2021-11-09: Other part of 2d8033a4 is in qtquickcontrols2
|
||||
but only consists of tests.
|
||||
---
|
||||
src/quick/items/qquickitemview.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
|
||||
index 010a0152e1..f8ad168a17 100644
|
||||
--- a/src/quick/items/qquickitemview.cpp
|
||||
+++ b/src/quick/items/qquickitemview.cpp
|
||||
@@ -1785,7 +1785,7 @@ void QQuickItemViewPrivate::refill(qreal from, qreal to)
|
||||
|
||||
do {
|
||||
bufferPause.stop();
|
||||
- if (currentChanges.hasPendingChanges() || bufferedChanges.hasPendingChanges()) {
|
||||
+ if (currentChanges.hasPendingChanges() || bufferedChanges.hasPendingChanges() || currentChanges.active) {
|
||||
currentChanges.reset();
|
||||
bufferedChanges.reset();
|
||||
releaseVisibleItems(reusableFlag);
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
|
@ -11,8 +11,8 @@
|
|||
|
||||
Summary: Qt5 - QtDeclarative component
|
||||
Name: qt5-%{qt_module}
|
||||
Version: 5.15.5
|
||||
Release: 2%{?dist}
|
||||
Version: 5.15.6
|
||||
Release: 1%{?dist}
|
||||
|
||||
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
|
||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||
|
|
@ -27,7 +27,7 @@ Source5: qv4global_p-multilib.h
|
|||
## upstream patches
|
||||
## repo: https://invent.kde.org/qt/qt/qtdeclarative
|
||||
## branch: kde/5.15
|
||||
## git format-patch v5.15.5-lts-lgpl
|
||||
## git format-patch v5.15.6-lts-lgpl
|
||||
Patch1: 0001-Document-that-StyledText-also-supports-nbsp-and-quot.patch
|
||||
Patch2: 0002-Support-apos-in-styled-text.patch
|
||||
Patch3: 0003-Remove-unused-QPointer-QQuickPointerMask.patch
|
||||
|
|
@ -36,7 +36,7 @@ Patch5: 0005-QQuickLoader-Do-not-incubate-if-the-source-arrives-a.patch
|
|||
Patch6: 0006-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch
|
||||
Patch7: 0007-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch
|
||||
Patch8: 0008-Fix-distorted-text-with-subpixel-matrix-translation.patch
|
||||
Patch9: 0009-Revert-Fix-for-possible-crash-in-QSGDefaultLayer-gra.patch
|
||||
Patch0: 0009-Revert-Fix-for-possible-crash-in-QSGDefaultLayer-gra.patch
|
||||
Patch10: 0010-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch
|
||||
Patch11: 0011-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch
|
||||
Patch12: 0012-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch
|
||||
|
|
@ -47,7 +47,7 @@ Patch16: 0016-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch
|
|||
Patch17: 0017-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch
|
||||
Patch18: 0018-Fix-Flickable-wheel-velocity-calculation.patch
|
||||
Patch19: 0019-Fix-Flickable-with-QTBUG-56075-patch-applied.patch
|
||||
|
||||
Patch20: 0020-Reset-currentChanges-if-currentChanges-is-active-whe.patch
|
||||
|
||||
## upstreamable patches
|
||||
Patch100: %{name}-gcc11.patch
|
||||
|
|
@ -230,6 +230,9 @@ make check -k -C tests ||:
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Sep 20 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.6-1
|
||||
- 5.15.6
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (qtdeclarative-everywhere-opensource-src-5.15.5.tar.xz) = b4b2754ae3566bbfa3e0162738ae6ea3b36d506841ce7e4b5651d0b0ca1c341ab19f653aebc23d13a17840d391280137c463c29fcf4866fc1f1c3adf8ebb5e5b
|
||||
SHA512 (qtdeclarative-everywhere-opensource-src-5.15.6.tar.xz) = a4824b6ec2de5e78819b726850767db6d4280208d6cc985219f4c33b6b0dcd6194557f32b577df97b0596d157190aa9c00e99bf6879554936a356fa7afe8a7d5
|
||||
|
|
|
|||
Loading…
Reference in New Issue