5.15.9 + sync with Fedora
Resolves: bz#2178624 Resolves: bz#2175728
This commit is contained in:
Jan Grulich
parent
4746511a91
commit
1b524ee434
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,3 +8,4 @@
|
|||||||
/qtdeclarative-everywhere-src-5.15.1.tar.xz
|
/qtdeclarative-everywhere-src-5.15.1.tar.xz
|
||||||
/qtdeclarative-everywhere-src-5.15.2.tar.xz
|
/qtdeclarative-everywhere-src-5.15.2.tar.xz
|
||||||
/qtdeclarative-everywhere-opensource-src-5.15.3.tar.xz
|
/qtdeclarative-everywhere-opensource-src-5.15.3.tar.xz
|
||||||
|
/qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz
|
||||||
|
|||||||
@ -1,39 +0,0 @@
|
|||||||
From a6ec2f93dba2a3e4ac07332c5adf4456348bf4a1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Albert Astals Cid <albert.astals.cid@kdab.com>
|
|
||||||
Date: Fri, 21 May 2021 13:30:41 +0200
|
|
||||||
Subject: [PATCH 01/20] Give a warning when StyledText encounters a non
|
|
||||||
supported entity
|
|
||||||
|
|
||||||
Pick-to: 6.1 5.15
|
|
||||||
Change-Id: Iea8bdf25542cd404ee71141467ac1f1398a7d0df
|
|
||||||
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
||||||
(cherry picked from commit 8cd43e370040e23fcbd03ad64969e683055bd7d0)
|
|
||||||
---
|
|
||||||
src/quick/util/qquickstyledtext.cpp | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp
|
|
||||||
index 660852ba83..d531fc9205 100644
|
|
||||||
--- a/src/quick/util/qquickstyledtext.cpp
|
|
||||||
+++ b/src/quick/util/qquickstyledtext.cpp
|
|
||||||
@@ -46,6 +46,8 @@
|
|
||||||
#include "qquickstyledtext_p.h"
|
|
||||||
#include <QQmlContext>
|
|
||||||
|
|
||||||
+Q_LOGGING_CATEGORY(lcStyledText, "qt.quick.styledtext")
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
QQuickStyledText supports few tags:
|
|
||||||
|
|
||||||
@@ -566,6 +568,8 @@ void QQuickStyledTextPrivate::parseEntity(const QChar *&ch, const QString &textI
|
|
||||||
textOut += QChar(34);
|
|
||||||
else if (entity == QLatin1String("nbsp"))
|
|
||||||
textOut += QChar(QChar::Nbsp);
|
|
||||||
+ else
|
|
||||||
+ qCWarning(lcStyledText) << "StyledText doesn't support entity" << entity;
|
|
||||||
return;
|
|
||||||
} else if (*ch == QLatin1Char(' ')) {
|
|
||||||
QStringRef entity(&textIn, entityStart - 1, entityLength + 1);
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
From d7d355175aa1e625e5b59b4494e37aeac9c849d5 Mon Sep 17 00:00:00 2001
|
From adc1d82fbac1f85791977ff42299e1f84f0f8db4 Mon Sep 17 00:00:00 2001
|
||||||
From: Albert Astals Cid <albert.astals.cid@kdab.com>
|
From: Albert Astals Cid <albert.astals.cid@kdab.com>
|
||||||
Date: Thu, 17 Jun 2021 16:32:28 +0200
|
Date: Thu, 17 Jun 2021 16:32:28 +0200
|
||||||
Subject: [PATCH 05/20] Remove unused QPointer<QQuickPointerMask>
|
Subject: [PATCH 01/19] Remove unused QPointer<QQuickPointerMask>
|
||||||
|
|
||||||
Change-Id: I009fa6bbd8599dc3bb2e810176fe20e70ed50851
|
Change-Id: I009fa6bbd8599dc3bb2e810176fe20e70ed50851
|
||||||
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
||||||
@ -31,5 +31,5 @@ index fba383e268..0d63618622 100644
|
|||||||
QPointF targetStartPos;
|
QPointF targetStartPos;
|
||||||
QPointF lastPos;
|
QPointF lastPos;
|
||||||
--
|
--
|
||||||
2.35.1
|
2.40.0
|
||||||
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
From 0eb5ff2e97713e12318c00bab9f3605abb8592c2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Antonio Rojas <arojas@archlinux.org>
|
|
||||||
Date: Sun, 23 May 2021 14:32:46 +0200
|
|
||||||
Subject: [PATCH 02/20] Add missing limits include to fix build with GCC 11
|
|
||||||
|
|
||||||
This is not required for Qt 6, since it is indirectly pulled via
|
|
||||||
qanystrigview.h, but it is for Qt 5 (where qanystrigview does
|
|
||||||
not exist) and, in any case, it is good to declare all used headers
|
|
||||||
and not rely on them being implicitly pulled.
|
|
||||||
|
|
||||||
Pick-to: 6.1 5.15
|
|
||||||
Change-Id: I97606ea493e723006759608b7d4c4f00632f340c
|
|
||||||
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
|
|
||||||
(cherry picked from commit 367293b18ab0d0a0432c1c8ce445fee052e5eee5)
|
|
||||||
---
|
|
||||||
src/qmldebug/qqmlprofilerevent_p.h | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h
|
|
||||||
index a7e37d1964..01b2f58f16 100644
|
|
||||||
--- a/src/qmldebug/qqmlprofilerevent_p.h
|
|
||||||
+++ b/src/qmldebug/qqmlprofilerevent_p.h
|
|
||||||
@@ -48,6 +48,7 @@
|
|
||||||
#include <QtCore/qmetatype.h>
|
|
||||||
|
|
||||||
#include <initializer_list>
|
|
||||||
+#include <limits>
|
|
||||||
#include <type_traits>
|
|
||||||
|
|
||||||
//
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
From 4fd8f31beb6ce07207cc8e934c7f4caa6abd8a54 Mon Sep 17 00:00:00 2001
|
From 3784ed7ea1ffe1f4be126b3425841aba44b369d8 Mon Sep 17 00:00:00 2001
|
||||||
From: Aleix Pol <aleixpol@kde.org>
|
From: Aleix Pol <aleixpol@kde.org>
|
||||||
Date: Thu, 23 Sep 2021 03:43:04 +0200
|
Date: Thu, 23 Sep 2021 03:43:04 +0200
|
||||||
Subject: [PATCH 08/20] QQmlDelegateModel: Refresh the view when a column is
|
Subject: [PATCH 02/19] QQmlDelegateModel: Refresh the view when a column is
|
||||||
added at 0
|
added at 0
|
||||||
|
|
||||||
It can happen that a model reports n>0 rows but columns=0 (See
|
It can happen that a model reports n>0 rows but columns=0 (See
|
||||||
@ -17,13 +17,12 @@ Signed-off-by: Aleix Pol <aleixpol@kde.org>
|
|||||||
src/qmlmodels/qqmldelegatemodel.cpp | 44 +++++++++++++++++++
|
src/qmlmodels/qqmldelegatemodel.cpp | 44 +++++++++++++++++++
|
||||||
src/qmlmodels/qqmldelegatemodel_p.h | 3 ++
|
src/qmlmodels/qqmldelegatemodel_p.h | 3 ++
|
||||||
.../data/redrawUponColumnChange.qml | 11 +++++
|
.../data/redrawUponColumnChange.qml | 11 +++++
|
||||||
.../qqmldelegatemodel/qqmldelegatemodel.pro | 2 +-
|
.../tst_qqmldelegatemodel.cpp | 27 ++++++++++++
|
||||||
.../tst_qqmldelegatemodel.cpp | 29 ++++++++++++
|
4 files changed, 85 insertions(+)
|
||||||
5 files changed, 88 insertions(+), 1 deletion(-)
|
|
||||||
create mode 100644 tests/auto/qml/qqmldelegatemodel/data/redrawUponColumnChange.qml
|
create mode 100644 tests/auto/qml/qqmldelegatemodel/data/redrawUponColumnChange.qml
|
||||||
|
|
||||||
diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp
|
diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp
|
||||||
index e6aff955fe..381726291d 100644
|
index 523c0df779..bc6b2447af 100644
|
||||||
--- a/src/qmlmodels/qqmldelegatemodel.cpp
|
--- a/src/qmlmodels/qqmldelegatemodel.cpp
|
||||||
+++ b/src/qmlmodels/qqmldelegatemodel.cpp
|
+++ b/src/qmlmodels/qqmldelegatemodel.cpp
|
||||||
@@ -389,6 +389,12 @@ void QQmlDelegateModelPrivate::connectToAbstractItemModel()
|
@@ -389,6 +389,12 @@ void QQmlDelegateModelPrivate::connectToAbstractItemModel()
|
||||||
@ -52,7 +51,7 @@ index e6aff955fe..381726291d 100644
|
|||||||
QObject::disconnect(aim, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)),
|
QObject::disconnect(aim, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)),
|
||||||
q, SLOT(_q_dataChanged(QModelIndex,QModelIndex,QVector<int>)));
|
q, SLOT(_q_dataChanged(QModelIndex,QModelIndex,QVector<int>)));
|
||||||
QObject::disconnect(aim, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)),
|
QObject::disconnect(aim, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)),
|
||||||
@@ -1958,6 +1970,38 @@ void QQmlDelegateModel::_q_rowsMoved(
|
@@ -1974,6 +1986,38 @@ void QQmlDelegateModel::_q_rowsMoved(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -122,24 +121,11 @@ index 0000000000..206133bb39
|
|||||||
+ text: display
|
+ text: display
|
||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
diff --git a/tests/auto/qml/qqmldelegatemodel/qqmldelegatemodel.pro b/tests/auto/qml/qqmldelegatemodel/qqmldelegatemodel.pro
|
|
||||||
index 7fdd3ab5f1..fbd72f6a44 100644
|
|
||||||
--- a/tests/auto/qml/qqmldelegatemodel/qqmldelegatemodel.pro
|
|
||||||
+++ b/tests/auto/qml/qqmldelegatemodel/qqmldelegatemodel.pro
|
|
||||||
@@ -2,7 +2,7 @@ CONFIG += testcase
|
|
||||||
TARGET = tst_qqmldelegatemodel
|
|
||||||
macos:CONFIG -= app_bundle
|
|
||||||
|
|
||||||
-QT += qml testlib core-private qml-private qmlmodels-private
|
|
||||||
+QT += qml quick testlib core-private qml-private qmlmodels-private
|
|
||||||
|
|
||||||
SOURCES += tst_qqmldelegatemodel.cpp
|
|
||||||
|
|
||||||
diff --git a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
|
diff --git a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
|
||||||
index 87f42c0c8a..1d338ac330 100644
|
index 35f1e2c94d..1722447830 100644
|
||||||
--- a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
|
--- a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
|
||||||
+++ b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
|
+++ b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
|
||||||
@@ -27,8 +27,12 @@
|
@@ -27,6 +27,8 @@
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include <QtTest/qtest.h>
|
#include <QtTest/qtest.h>
|
||||||
@ -147,21 +133,17 @@ index 87f42c0c8a..1d338ac330 100644
|
|||||||
+#include <QtGui/QStandardItemModel>
|
+#include <QtGui/QStandardItemModel>
|
||||||
#include <QtQml/qqmlcomponent.h>
|
#include <QtQml/qqmlcomponent.h>
|
||||||
#include <QtQmlModels/private/qqmldelegatemodel_p.h>
|
#include <QtQmlModels/private/qqmldelegatemodel_p.h>
|
||||||
+#include <QtQuick/qquickview.h>
|
#include <QtQuick/qquickview.h>
|
||||||
+#include <QtQuick/qquickitem.h>
|
@@ -47,6 +49,7 @@ private slots:
|
||||||
|
void filterOnGroup_removeWhenCompleted();
|
||||||
#include "../../shared/util.h"
|
void qtbug_86017();
|
||||||
|
void contextAccessedByHandler();
|
||||||
@@ -42,6 +46,7 @@ public:
|
|
||||||
private slots:
|
|
||||||
void valueWithoutCallingObjectFirst_data();
|
|
||||||
void valueWithoutCallingObjectFirst();
|
|
||||||
+ void redrawUponColumnChange();
|
+ void redrawUponColumnChange();
|
||||||
};
|
};
|
||||||
|
|
||||||
class AbstractItemModel : public QAbstractItemModel
|
class AbstractItemModel : public QAbstractItemModel
|
||||||
@@ -134,6 +139,30 @@ void tst_QQmlDelegateModel::valueWithoutCallingObjectFirst()
|
@@ -186,6 +189,30 @@ void tst_QQmlDelegateModel::contextAccessedByHandler()
|
||||||
QCOMPARE(model->variantValue(index, role), expectedValue);
|
QVERIFY(root->property("works").toBool());
|
||||||
}
|
}
|
||||||
|
|
||||||
+void tst_QQmlDelegateModel::redrawUponColumnChange()
|
+void tst_QQmlDelegateModel::redrawUponColumnChange()
|
||||||
@ -192,5 +174,5 @@ index 87f42c0c8a..1d338ac330 100644
|
|||||||
|
|
||||||
#include "tst_qqmldelegatemodel.moc"
|
#include "tst_qqmldelegatemodel.moc"
|
||||||
--
|
--
|
||||||
2.35.1
|
2.40.0
|
||||||
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
From 45621c00cae6b108b412e63388588be8bc4ccc44 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 03/20] Document that StyledText also supports and
|
|
||||||
"
|
|
||||||
|
|
||||||
Change-Id: I1715f8ae8ec8d0fbaf6dbe2b8663cc169da663cd
|
|
||||||
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
||||||
(cherry picked from commit 5848c081c094a66e024493fc1e5c2569e06f73b6)
|
|
||||||
---
|
|
||||||
src/quick/items/qquicktext.cpp | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
|
|
||||||
index b18d03a20a..43c29d1f58 100644
|
|
||||||
--- a/src/quick/items/qquicktext.cpp
|
|
||||||
+++ b/src/quick/items/qquicktext.cpp
|
|
||||||
@@ -2168,7 +2168,7 @@ void QQuickText::resetMaximumLineCount()
|
|
||||||
<img src="" align="top,middle,bottom" width="" height=""> - inline images
|
|
||||||
<ol type="">, <ul type=""> and <li> - ordered and unordered lists
|
|
||||||
<pre></pre> - preformatted
|
|
||||||
- > < &
|
|
||||||
+ > < & "
|
|
||||||
\endcode
|
|
||||||
|
|
||||||
\c Text.StyledText parser is strict, requiring tags to be correctly nested.
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
From 743ae2a4d59eccc4720390c4c757b081eb2c6bfa Mon Sep 17 00:00:00 2001
|
From 18b10527cc14a42a19b5d088845bfd2e96326bbb Mon Sep 17 00:00:00 2001
|
||||||
From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= <jan-arve.saether@qt.io>
|
From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= <jan-arve.saether@qt.io>
|
||||||
Date: Thu, 3 Sep 2020 10:51:01 +0200
|
Date: Thu, 3 Sep 2020 10:51:01 +0200
|
||||||
Subject: [PATCH 15/20] Fix TapHandler so that it actually registers a tap
|
Subject: [PATCH 03/19] Fix TapHandler so that it actually registers a tap
|
||||||
|
|
||||||
This bug caused all quick examples that used the
|
This bug caused all quick examples that used the
|
||||||
shared\LauncherList.qml to be broken.
|
shared\LauncherList.qml to be broken.
|
||||||
@ -69,5 +69,5 @@ index b51f53b74f..89081b4e84 100644
|
|||||||
|
|
||||||
void QQuickSinglePointHandler::handlePointerEventImpl(QQuickPointerEvent *event)
|
void QQuickSinglePointHandler::handlePointerEventImpl(QQuickPointerEvent *event)
|
||||||
--
|
--
|
||||||
2.35.1
|
2.40.0
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
From 84e0c1e0973ca7467089dc0227a2b9ac4aef52fa Mon Sep 17 00:00:00 2001
|
From 2842ffc4e6bc4f6a7578866fbbe58c8ceb1efb16 Mon Sep 17 00:00:00 2001
|
||||||
From: Albert Astals Cid <aacid@kde.org>
|
From: Albert Astals Cid <aacid@kde.org>
|
||||||
Date: Tue, 16 Nov 2021 22:43:37 +0100
|
Date: Tue, 16 Nov 2021 22:43:37 +0100
|
||||||
Subject: [PATCH 16/20] Revert "Fix TapHandler so that it actually registers a
|
Subject: [PATCH 04/19] Revert "Fix TapHandler so that it actually registers a
|
||||||
tap"
|
tap"
|
||||||
|
|
||||||
This reverts commit 36e8ccd434f948e4f11a8f9d59139ec072e41ff5.
|
This reverts commit 36e8ccd434f948e4f11a8f9d59139ec072e41ff5.
|
||||||
@ -57,5 +57,5 @@ index 89081b4e84..b51f53b74f 100644
|
|||||||
|
|
||||||
void QQuickSinglePointHandler::handlePointerEventImpl(QQuickPointerEvent *event)
|
void QQuickSinglePointHandler::handlePointerEventImpl(QQuickPointerEvent *event)
|
||||||
--
|
--
|
||||||
2.35.1
|
2.40.0
|
||||||
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
From bac7823a97ab901abc8da392ba23747feac4c933 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 04/20] Support ' in styled text
|
|
||||||
|
|
||||||
Pick-to: 6.1 5.15
|
|
||||||
Change-Id: I4a8db963e52a7899ab1796f9a560e8029cc1c929
|
|
||||||
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
||||||
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
|
||||||
(cherry picked from commit 96b528efcba1226d2980828d1255160bdceae4cf)
|
|
||||||
---
|
|
||||||
src/quick/items/qquicktext.cpp | 2 +-
|
|
||||||
src/quick/util/qquickstyledtext.cpp | 2 ++
|
|
||||||
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
|
|
||||||
index 43c29d1f58..459dea8f74 100644
|
|
||||||
--- a/src/quick/items/qquicktext.cpp
|
|
||||||
+++ b/src/quick/items/qquicktext.cpp
|
|
||||||
@@ -2168,7 +2168,7 @@ void QQuickText::resetMaximumLineCount()
|
|
||||||
<img src="" align="top,middle,bottom" width="" height=""> - inline images
|
|
||||||
<ol type="">, <ul type=""> and <li> - ordered and unordered lists
|
|
||||||
<pre></pre> - preformatted
|
|
||||||
- > < & "
|
|
||||||
+ > < & " '
|
|
||||||
\endcode
|
|
||||||
|
|
||||||
\c Text.StyledText parser is strict, requiring tags to be correctly nested.
|
|
||||||
diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp
|
|
||||||
index d531fc9205..a25af90414 100644
|
|
||||||
--- a/src/quick/util/qquickstyledtext.cpp
|
|
||||||
+++ b/src/quick/util/qquickstyledtext.cpp
|
|
||||||
@@ -564,6 +564,8 @@ void QQuickStyledTextPrivate::parseEntity(const QChar *&ch, const QString &textI
|
|
||||||
textOut += QChar(60);
|
|
||||||
else if (entity == QLatin1String("amp"))
|
|
||||||
textOut += QChar(38);
|
|
||||||
+ else if (entity == QLatin1String("apos"))
|
|
||||||
+ textOut += QChar(39);
|
|
||||||
else if (entity == QLatin1String("quot"))
|
|
||||||
textOut += QChar(34);
|
|
||||||
else if (entity == QLatin1String("nbsp"))
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
From 02105099301450c890e1caba977ef44efdc43da7 Mon Sep 17 00:00:00 2001
|
From 2d50aedb262fd387775575f684eb9e2485d84134 Mon Sep 17 00:00:00 2001
|
||||||
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
||||||
Date: Sat, 29 Jan 2022 21:59:33 +0200
|
Date: Sat, 29 Jan 2022 21:59:33 +0200
|
||||||
Subject: [PATCH 20/20] Make sure QQuickWidget and its offscreen window's
|
Subject: [PATCH 05/19] Make sure QQuickWidget and its offscreen window's
|
||||||
screens are always in sync
|
screens are always in sync
|
||||||
|
|
||||||
By default, the offscreen window is placed on the primary screen.
|
By default, the offscreen window is placed on the primary screen.
|
||||||
@ -80,5 +80,5 @@ index 39780f8de3..223d91f579 100644
|
|||||||
case QEvent::Move:
|
case QEvent::Move:
|
||||||
d->updatePosition();
|
d->updatePosition();
|
||||||
--
|
--
|
||||||
2.35.1
|
2.40.0
|
||||||
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
From 3c42d4d3dce95b67d65541c5612384eab0c3e27b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dmitry Shachnev <mitya57@gmail.com>
|
|
||||||
Date: Wed, 18 Aug 2021 22:50:29 +0300
|
|
||||||
Subject: [PATCH 06/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
|
|
||||||
|
|
||||||
- <limits.h> (aka <climits>) is needed for UINT_MAX macro constant.
|
|
||||||
- <limits> is needed for std::numeric_limits.
|
|
||||||
|
|
||||||
Without this fix, qtdeclarative failed to build on some platforms:
|
|
||||||
|
|
||||||
In file included from jsruntime/qv4regexp_p.h:62,
|
|
||||||
from jsruntime/qv4regexp.cpp:40:
|
|
||||||
../3rdparty/masm/yarr/Yarr.h:46:44: error: ‘numeric_limits’ is not a member of ‘std’
|
|
||||||
46 | static const unsigned offsetNoMatch = std::numeric_limits<unsigned>::max();
|
|
||||||
| ^~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
Pick-to: 5.15 6.2
|
|
||||||
Change-Id: I7cc9f7bc6624a52c8659f09034ab16064da5fd2f
|
|
||||||
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
|
|
||||||
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
||||||
(cherry picked from commit db58b8518e157b765bf2e01e6382a9eed4751f27)
|
|
||||||
---
|
|
||||||
src/3rdparty/masm/yarr/Yarr.h | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/src/3rdparty/masm/yarr/Yarr.h b/src/3rdparty/masm/yarr/Yarr.h
|
|
||||||
index ccf78f9880..2955ea7e72 100644
|
|
||||||
--- a/src/3rdparty/masm/yarr/Yarr.h
|
|
||||||
+++ b/src/3rdparty/masm/yarr/Yarr.h
|
|
||||||
@@ -28,6 +28,7 @@
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <limits.h>
|
|
||||||
+#include <limits>
|
|
||||||
#include "YarrErrorCode.h"
|
|
||||||
|
|
||||||
namespace JSC { namespace Yarr {
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
122
0006-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch
Normal file
122
0006-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch
Normal file
@ -0,0 +1,122 @@
|
|||||||
|
From 9a3d7bc6cf8eea575e597ff1af03d87f7fbdc9aa 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 06/19] QQuickItem: Guard against cycles in
|
||||||
|
nextPrevItemInTabFocusChain
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
nextPrevItemInTabFocusChain already had a check to prevent running into
|
||||||
|
cycles, it would however only detect if we reached the original item. If
|
||||||
|
our cycle instead would loop between reachable items without ever
|
||||||
|
returning to the initial one, as in the diagram below, then we would
|
||||||
|
never terminate the loop.
|
||||||
|
|
||||||
|
/-->other item<---next item
|
||||||
|
initial-item \ ^
|
||||||
|
\ |
|
||||||
|
--->different item
|
||||||
|
|
||||||
|
To prevent this from happening, we keep track of all items we've seen so
|
||||||
|
far. One last complications arises due to the fact that we do visit the
|
||||||
|
parent twice under some cicrcumstances, but we already have the skip
|
||||||
|
variable to indicate that case – we simply skip the duplicate check if
|
||||||
|
it is set to true.
|
||||||
|
|
||||||
|
Pick-to: 6.2 6.3
|
||||||
|
Fixes: QTBUG-87190
|
||||||
|
Change-Id: I1449a7ebf8f325f00c296e8a8db4360faf1049e4
|
||||||
|
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
||||||
|
(cherry picked from commit e74bcf751495d9fe27efd195bc04e2a6ae6732a4)
|
||||||
|
---
|
||||||
|
src/quick/items/qquickitem.cpp | 7 ++++++-
|
||||||
|
.../data/activeFocusOnTab_infiniteLoop3.qml | 13 +++++++++++++
|
||||||
|
tests/auto/quick/qquickitem2/tst_qquickitem.cpp | 12 ++++++++++++
|
||||||
|
3 files changed, 31 insertions(+), 1 deletion(-)
|
||||||
|
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 33da9762d3..ec55fb2998 100644
|
||||||
|
--- a/src/quick/items/qquickitem.cpp
|
||||||
|
+++ b/src/quick/items/qquickitem.cpp
|
||||||
|
@@ -59,6 +59,7 @@
|
||||||
|
#include <QtCore/private/qnumeric_p.h>
|
||||||
|
#include <QtGui/qpa/qplatformtheme.h>
|
||||||
|
#include <QtCore/qloggingcategory.h>
|
||||||
|
+#include <QtCore/private/qduplicatetracker_p.h>
|
||||||
|
|
||||||
|
#include <private/qqmlglobal_p.h>
|
||||||
|
#include <private/qqmlengine_p.h>
|
||||||
|
@@ -2526,6 +2527,7 @@ QQuickItem* QQuickItemPrivate::nextPrevItemInTabFocusChain(QQuickItem *item, boo
|
||||||
|
QQuickItem *current = item;
|
||||||
|
qCDebug(DBG_FOCUS) << "QQuickItemPrivate::nextPrevItemInTabFocusChain: startItem:" << startItem;
|
||||||
|
qCDebug(DBG_FOCUS) << "QQuickItemPrivate::nextPrevItemInTabFocusChain: firstFromItem:" << firstFromItem;
|
||||||
|
+ QDuplicateTracker<QQuickItem *> cycleDetector;
|
||||||
|
do {
|
||||||
|
qCDebug(DBG_FOCUS) << "QQuickItemPrivate::nextPrevItemInTabFocusChain: current:" << current;
|
||||||
|
qCDebug(DBG_FOCUS) << "QQuickItemPrivate::nextPrevItemInTabFocusChain: from:" << from;
|
||||||
|
@@ -2592,7 +2594,10 @@ QQuickItem* QQuickItemPrivate::nextPrevItemInTabFocusChain(QQuickItem *item, boo
|
||||||
|
// traversed all of the chain (by compare the [current] item with [startItem])
|
||||||
|
// Since the [startItem] might be promoted to its parent if it is invisible,
|
||||||
|
// we still have to check [current] item with original start item
|
||||||
|
- if ((current == startItem || current == originalStartItem) && from == firstFromItem) {
|
||||||
|
+ // We might also run into a cycle before we reach firstFromItem again
|
||||||
|
+ // but note that we have to ignore current if we are meant to skip it
|
||||||
|
+ if (((current == startItem || current == originalStartItem) && from == firstFromItem) ||
|
||||||
|
+ (!skip && cycleDetector.hasSeen(current))) {
|
||||||
|
// wrapped around, avoid endless loops
|
||||||
|
if (item == contentItem) {
|
||||||
|
qCDebug(DBG_FOCUS) << "QQuickItemPrivate::nextPrevItemInTabFocusChain: looped, return contentItem";
|
||||||
|
diff --git a/tests/auto/quick/qquickitem2/data/activeFocusOnTab_infiniteLoop3.qml b/tests/auto/quick/qquickitem2/data/activeFocusOnTab_infiniteLoop3.qml
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..889e480f3b
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/tests/auto/quick/qquickitem2/data/activeFocusOnTab_infiniteLoop3.qml
|
||||||
|
@@ -0,0 +1,13 @@
|
||||||
|
+import QtQuick 2.6
|
||||||
|
+
|
||||||
|
+Item {
|
||||||
|
+ visible: true
|
||||||
|
+ Item {
|
||||||
|
+ visible: false
|
||||||
|
+ Item {
|
||||||
|
+ objectName: "hiddenChild"
|
||||||
|
+ activeFocusOnTab: true
|
||||||
|
+ focus: true
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
|
||||||
|
index c8f251dbe1..c8ef36ee68 100644
|
||||||
|
--- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
|
||||||
|
+++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
|
||||||
|
@@ -67,6 +67,7 @@ private slots:
|
||||||
|
void activeFocusOnTab10();
|
||||||
|
void activeFocusOnTab_infiniteLoop_data();
|
||||||
|
void activeFocusOnTab_infiniteLoop();
|
||||||
|
+ void activeFocusOnTab_infiniteLoopControls();
|
||||||
|
|
||||||
|
void nextItemInFocusChain();
|
||||||
|
void nextItemInFocusChain2();
|
||||||
|
@@ -1057,6 +1058,17 @@ void tst_QQuickItem::activeFocusOnTab_infiniteLoop()
|
||||||
|
QCOMPARE(item, window->rootObject());
|
||||||
|
}
|
||||||
|
|
||||||
|
+
|
||||||
|
+void tst_QQuickItem::activeFocusOnTab_infiniteLoopControls()
|
||||||
|
+{
|
||||||
|
+ auto source = testFileUrl("activeFocusOnTab_infiniteLoop3.qml");
|
||||||
|
+ QScopedPointer<QQuickView>window(new QQuickView());
|
||||||
|
+ window->setSource(source);
|
||||||
|
+ window->show();
|
||||||
|
+ QVERIFY(window->errors().isEmpty());
|
||||||
|
+ QTest::keyClick(window.get(), Qt::Key_Tab); // should not hang
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void tst_QQuickItem::nextItemInFocusChain()
|
||||||
|
{
|
||||||
|
if (!qt_tab_all_widgets())
|
||||||
|
--
|
||||||
|
2.40.0
|
||||||
|
|
||||||
60
0007-Don-t-convert-QByteArray-in-startDrag.patch
Normal file
60
0007-Don-t-convert-QByteArray-in-startDrag.patch
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
From c257eb6a0eeb159c670c9cf6b37d3009ec8879e5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Fushan Wen <qydwhotmail@gmail.com>
|
||||||
|
Date: Tue, 1 Nov 2022 22:35:24 +0800
|
||||||
|
Subject: [PATCH 07/19] Don't convert QByteArray in `startDrag`
|
||||||
|
|
||||||
|
QMimeData::setData expects the provided data to contain the correctly
|
||||||
|
encoded QByteArray, so if the variant contains a QByteArray, then take
|
||||||
|
it as is to avoid data loss.
|
||||||
|
|
||||||
|
If the variant is not already a byte array, then we ideally would make
|
||||||
|
sure that the mime type (i.e. the key of the map) and the QVariant's
|
||||||
|
type are compatible (image/png with a QImage works; text/plain with a
|
||||||
|
QImage does not). This changes behavior and needs to be a follow-up
|
||||||
|
commit.
|
||||||
|
|
||||||
|
Fixes: QTBUG-71922
|
||||||
|
Change-Id: I9b9f10fd332e1f9568f6835a69a1c359457f823c
|
||||||
|
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
||||||
|
(cherry picked from commit 062f9bf57657b54dc708015ec5fed3c89e5cc3ca)
|
||||||
|
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
||||||
|
|
||||||
|
|
||||||
|
(cherry picked from commit 22de23c4bb9ac5e2c545e9de3149a7d4f8edd5ee)
|
||||||
|
---
|
||||||
|
src/quick/items/qquickdrag.cpp | 12 +++++++++---
|
||||||
|
1 file changed, 9 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
|
||||||
|
index 8321fcfeed..3b50370355 100644
|
||||||
|
--- a/src/quick/items/qquickdrag.cpp
|
||||||
|
+++ b/src/quick/items/qquickdrag.cpp
|
||||||
|
@@ -481,7 +481,9 @@ void QQuickDragAttached::setKeys(const QStringList &keys)
|
||||||
|
\qmlattachedproperty stringlist QtQuick::Drag::mimeData
|
||||||
|
\since 5.2
|
||||||
|
|
||||||
|
- This property holds a map of mimeData that is used during startDrag.
|
||||||
|
+ This property holds a map from mime type to data that is used during startDrag.
|
||||||
|
+ The mime data needs to be a \c string, or an \c ArrayBuffer with the data encoded
|
||||||
|
+ according to the mime type.
|
||||||
|
*/
|
||||||
|
|
||||||
|
QVariantMap QQuickDragAttached::mimeData() const
|
||||||
|
@@ -766,8 +768,12 @@ Qt::DropAction QQuickDragAttachedPrivate::startDrag(Qt::DropActions supportedAct
|
||||||
|
QDrag *drag = new QDrag(source ? source : q);
|
||||||
|
QMimeData *mimeData = new QMimeData();
|
||||||
|
|
||||||
|
- for (auto it = externalMimeData.cbegin(), end = externalMimeData.cend(); it != end; ++it)
|
||||||
|
- mimeData->setData(it.key(), it.value().toString().toUtf8());
|
||||||
|
+ for (auto it = externalMimeData.cbegin(), end = externalMimeData.cend(); it != end; ++it) {
|
||||||
|
+ if (it.value().typeId() == QMetaType::QByteArray)
|
||||||
|
+ mimeData->setData(it.key(), it.value().toByteArray());
|
||||||
|
+ else
|
||||||
|
+ mimeData->setData(it.key(), it.value().toString().toUtf8());
|
||||||
|
+ }
|
||||||
|
|
||||||
|
drag->setMimeData(mimeData);
|
||||||
|
if (pixmapLoader.isReady()) {
|
||||||
|
--
|
||||||
|
2.40.0
|
||||||
|
|
||||||
@ -1,112 +0,0 @@
|
|||||||
From 31179b578276f10841fcb60a876ea757f9ca82ff Mon Sep 17 00:00:00 2001
|
|
||||||
From: Aleix Pol <aleixpol@kde.org>
|
|
||||||
Date: Tue, 21 Sep 2021 00:10:26 +0200
|
|
||||||
Subject: [PATCH 07/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
|
|
||||||
being non-null and forces us to workaround within the apps.
|
|
||||||
|
|
||||||
Change-Id: I88c27c4b00ccec8b8e0c05a8e10b44fcabfc2e30
|
|
||||||
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
||||||
(cherry picked from commit e78c068700fa74ab3aca6a23ab2450563b1c3a5c)
|
|
||||||
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
||||||
---
|
|
||||||
src/quick/items/qquickloader.cpp | 3 +++
|
|
||||||
.../data/loader-async-race-rect.qml | 10 ++++++++++
|
|
||||||
.../qquickloader/data/loader-async-race.qml | 14 ++++++++++++++
|
|
||||||
.../quick/qquickloader/tst_qquickloader.cpp | 19 +++++++++++++++++++
|
|
||||||
4 files changed, 46 insertions(+)
|
|
||||||
create mode 100644 tests/auto/quick/qquickloader/data/loader-async-race-rect.qml
|
|
||||||
create mode 100644 tests/auto/quick/qquickloader/data/loader-async-race.qml
|
|
||||||
|
|
||||||
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
|
|
||||||
index cb4f79a3c2..7fbe66fdda 100644
|
|
||||||
--- a/src/quick/items/qquickloader.cpp
|
|
||||||
+++ b/src/quick/items/qquickloader.cpp
|
|
||||||
@@ -737,6 +737,9 @@ void QQuickLoaderPrivate::_q_sourceLoaded()
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if (!active)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
QQmlContext *creationContext = component->creationContext();
|
|
||||||
if (!creationContext) creationContext = qmlContext(q);
|
|
||||||
itemContext = new QQmlContext(creationContext);
|
|
||||||
diff --git a/tests/auto/quick/qquickloader/data/loader-async-race-rect.qml b/tests/auto/quick/qquickloader/data/loader-async-race-rect.qml
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..a56dcea5ad
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/auto/quick/qquickloader/data/loader-async-race-rect.qml
|
|
||||||
@@ -0,0 +1,10 @@
|
|
||||||
+import QtQuick 2.15
|
|
||||||
+
|
|
||||||
+Rectangle {
|
|
||||||
+ anchors.fill: parent
|
|
||||||
+ color: "blue"
|
|
||||||
+ Item {
|
|
||||||
+ Item {
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
diff --git a/tests/auto/quick/qquickloader/data/loader-async-race.qml b/tests/auto/quick/qquickloader/data/loader-async-race.qml
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..8ba625c5c1
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/auto/quick/qquickloader/data/loader-async-race.qml
|
|
||||||
@@ -0,0 +1,14 @@
|
|
||||||
+import QtQuick 2.15
|
|
||||||
+
|
|
||||||
+Item {
|
|
||||||
+ id: root
|
|
||||||
+ Component.onCompleted: {
|
|
||||||
+ myloader.active = false
|
|
||||||
+ }
|
|
||||||
+ Loader {
|
|
||||||
+ id: myloader
|
|
||||||
+ anchors.fill: parent
|
|
||||||
+ asynchronous: true
|
|
||||||
+ source: "loader-async-race-rect.qml"
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
diff --git a/tests/auto/quick/qquickloader/tst_qquickloader.cpp b/tests/auto/quick/qquickloader/tst_qquickloader.cpp
|
|
||||||
index 0f6c811adb..dddacbaa0b 100644
|
|
||||||
--- a/tests/auto/quick/qquickloader/tst_qquickloader.cpp
|
|
||||||
+++ b/tests/auto/quick/qquickloader/tst_qquickloader.cpp
|
|
||||||
@@ -132,6 +132,7 @@ private slots:
|
|
||||||
void statusChangeOnlyEmittedOnce();
|
|
||||||
|
|
||||||
void setSourceAndCheckStatus();
|
|
||||||
+ void asyncLoaderRace();
|
|
||||||
};
|
|
||||||
|
|
||||||
Q_DECLARE_METATYPE(QList<QQmlError>)
|
|
||||||
@@ -1496,6 +1497,24 @@ void tst_QQuickLoader::setSourceAndCheckStatus()
|
|
||||||
QCOMPARE(loader->status(), QQuickLoader::Null);
|
|
||||||
}
|
|
||||||
|
|
||||||
+void tst_QQuickLoader::asyncLoaderRace()
|
|
||||||
+{
|
|
||||||
+ QQmlApplicationEngine engine;
|
|
||||||
+ auto url = testFileUrl("loader-async-race.qml");
|
|
||||||
+ engine.load(url);
|
|
||||||
+ auto root = engine.rootObjects().at(0);
|
|
||||||
+ QVERIFY(root);
|
|
||||||
+
|
|
||||||
+ QQuickLoader *loader = root->findChild<QQuickLoader *>();
|
|
||||||
+ QCOMPARE(loader->active(), false);
|
|
||||||
+ QCOMPARE(loader->status(), QQuickLoader::Null);
|
|
||||||
+ QCOMPARE(loader->item(), nullptr);
|
|
||||||
+
|
|
||||||
+ QSignalSpy spy(loader, &QQuickLoader::itemChanged);
|
|
||||||
+ QVERIFY(!spy.wait(100));
|
|
||||||
+ QCOMPARE(loader->item(), nullptr);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
QTEST_MAIN(tst_QQuickLoader)
|
|
||||||
|
|
||||||
#include "tst_qquickloader.moc"
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
From cbb5f2d37a07b75f9d340fd1e1f34a6d1e078eba Mon Sep 17 00:00:00 2001
|
||||||
|
From: Hannah von Reth <vonreth@kde.org>
|
||||||
|
Date: Sat, 5 Nov 2022 18:48:41 +0100
|
||||||
|
Subject: [PATCH 08/19] Fix build after
|
||||||
|
95290f66b806a307b8da1f72f8fc2c69801933d0
|
||||||
|
|
||||||
|
---
|
||||||
|
src/quick/items/qquickdrag.cpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
|
||||||
|
index 3b50370355..383078b3b9 100644
|
||||||
|
--- a/src/quick/items/qquickdrag.cpp
|
||||||
|
+++ b/src/quick/items/qquickdrag.cpp
|
||||||
|
@@ -769,7 +769,7 @@ Qt::DropAction QQuickDragAttachedPrivate::startDrag(Qt::DropActions supportedAct
|
||||||
|
QMimeData *mimeData = new QMimeData();
|
||||||
|
|
||||||
|
for (auto it = externalMimeData.cbegin(), end = externalMimeData.cend(); it != end; ++it) {
|
||||||
|
- if (it.value().typeId() == QMetaType::QByteArray)
|
||||||
|
+ if (static_cast<QMetaType::Type>(it.value().type()) == QMetaType::QByteArray)
|
||||||
|
mimeData->setData(it.key(), it.value().toByteArray());
|
||||||
|
else
|
||||||
|
mimeData->setData(it.key(), it.value().toString().toUtf8());
|
||||||
|
--
|
||||||
|
2.40.0
|
||||||
|
|
||||||
@ -1,119 +0,0 @@
|
|||||||
From 00dd37619f35db3cddb2ac59198d3bde7ce73cd7 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 09/20] Fix sweep step for tainted QObject JavaScript wrappers
|
|
||||||
|
|
||||||
Currently, whenever the garbage collector runs, it will destroy all
|
|
||||||
valid tainted wrappers.
|
|
||||||
|
|
||||||
Only null or undefined wrappers will be preserved in the
|
|
||||||
m_multiplyWrappedQObjects map.
|
|
||||||
|
|
||||||
It seems like "!" was overlooked in
|
|
||||||
3b5d37ce3841c4bfdf1c629d33f0e33b881b47fb. Prior to that change, it
|
|
||||||
was "!it.value()->markBit()", so calling erase() in the then branch
|
|
||||||
did make sense. But with "!it.value().isNullOrUndefined()", erase()
|
|
||||||
will be called for every valid wrapper, which is the opposite what we
|
|
||||||
want.
|
|
||||||
|
|
||||||
Pick-to: 5.15 6.2
|
|
||||||
Change-Id: I2bf2630f538af8cbd4bfffcff29d67be6c278265
|
|
||||||
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
||||||
(cherry picked from commit e6b2f88d892dcf396580a61662f569bf69d6d9d1)
|
|
||||||
---
|
|
||||||
src/qml/memory/qv4mm.cpp | 2 +-
|
|
||||||
tests/auto/qml/qjsengine/tst_qjsengine.cpp | 39 ++++++++++++++++++++++
|
|
||||||
tests/auto/qml/qv4mm/tst_qv4mm.cpp | 6 ++--
|
|
||||||
3 files changed, 43 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp
|
|
||||||
index 06caf04e5a..da149a67c4 100644
|
|
||||||
--- a/src/qml/memory/qv4mm.cpp
|
|
||||||
+++ b/src/qml/memory/qv4mm.cpp
|
|
||||||
@@ -981,7 +981,7 @@ void MemoryManager::sweep(bool lastSweep, ClassDestroyStatsCallback classCountPt
|
|
||||||
|
|
||||||
if (MultiplyWrappedQObjectMap *multiplyWrappedQObjects = engine->m_multiplyWrappedQObjects) {
|
|
||||||
for (MultiplyWrappedQObjectMap::Iterator it = multiplyWrappedQObjects->begin(); it != multiplyWrappedQObjects->end();) {
|
|
||||||
- if (!it.value().isNullOrUndefined())
|
|
||||||
+ if (it.value().isNullOrUndefined())
|
|
||||||
it = multiplyWrappedQObjects->erase(it);
|
|
||||||
else
|
|
||||||
++it;
|
|
||||||
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
|
|
||||||
index 3b7d74df63..b75bf820d5 100644
|
|
||||||
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
|
|
||||||
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
|
|
||||||
@@ -102,6 +102,7 @@ private slots:
|
|
||||||
void valueConversion_RegularExpression();
|
|
||||||
void castWithMultipleInheritance();
|
|
||||||
void collectGarbage();
|
|
||||||
+ void collectGarbageNestedWrappersTwoEngines();
|
|
||||||
void gcWithNestedDataStructure();
|
|
||||||
void stacktrace();
|
|
||||||
void numberParsing_data();
|
|
||||||
@@ -1809,6 +1810,44 @@ void tst_QJSEngine::collectGarbage()
|
|
||||||
QVERIFY(ptr.isNull());
|
|
||||||
}
|
|
||||||
|
|
||||||
+class TestObjectContainer : public QObject
|
|
||||||
+{
|
|
||||||
+ Q_OBJECT
|
|
||||||
+ Q_PROPERTY(QObject *dummy MEMBER m_dummy CONSTANT)
|
|
||||||
+
|
|
||||||
+public:
|
|
||||||
+ TestObjectContainer() : m_dummy(new QObject(this)) {}
|
|
||||||
+
|
|
||||||
+private:
|
|
||||||
+ QObject *m_dummy;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+void tst_QJSEngine::collectGarbageNestedWrappersTwoEngines()
|
|
||||||
+{
|
|
||||||
+ QJSEngine engine1;
|
|
||||||
+ QJSEngine engine2;
|
|
||||||
+
|
|
||||||
+ TestObjectContainer container;
|
|
||||||
+ QQmlEngine::setObjectOwnership(&container, QQmlEngine::CppOwnership);
|
|
||||||
+
|
|
||||||
+ engine1.globalObject().setProperty("foobar", engine1.newQObject(&container));
|
|
||||||
+ engine2.globalObject().setProperty("foobar", engine2.newQObject(&container));
|
|
||||||
+
|
|
||||||
+ engine1.evaluate("foobar.dummy.baz = 42");
|
|
||||||
+ engine2.evaluate("foobar.dummy.baz = 43");
|
|
||||||
+
|
|
||||||
+ QCOMPARE(engine1.evaluate("foobar.dummy.baz").toInt(), 42);
|
|
||||||
+ QCOMPARE(engine2.evaluate("foobar.dummy.baz").toInt(), 43);
|
|
||||||
+
|
|
||||||
+ engine1.collectGarbage();
|
|
||||||
+ engine2.collectGarbage();
|
|
||||||
+
|
|
||||||
+ // The GC should not collect dummy object wrappers neither in engine1 nor engine2, we
|
|
||||||
+ // verify that by checking whether the baz property still has its previous value.
|
|
||||||
+ QCOMPARE(engine1.evaluate("foobar.dummy.baz").toInt(), 42);
|
|
||||||
+ QCOMPARE(engine2.evaluate("foobar.dummy.baz").toInt(), 43);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
void tst_QJSEngine::gcWithNestedDataStructure()
|
|
||||||
{
|
|
||||||
// The GC must be able to traverse deeply nested objects, otherwise this
|
|
||||||
diff --git a/tests/auto/qml/qv4mm/tst_qv4mm.cpp b/tests/auto/qml/qv4mm/tst_qv4mm.cpp
|
|
||||||
index 5d635aa63b..824fd89e5b 100644
|
|
||||||
--- a/tests/auto/qml/qv4mm/tst_qv4mm.cpp
|
|
||||||
+++ b/tests/auto/qml/qv4mm/tst_qv4mm.cpp
|
|
||||||
@@ -76,10 +76,10 @@ void tst_qv4mm::multiWrappedQObjects()
|
|
||||||
QCOMPARE(engine1.memoryManager->m_pendingFreedObjectWrapperValue.size(), 1);
|
|
||||||
QCOMPARE(engine2.memoryManager->m_pendingFreedObjectWrapperValue.size(), 0);
|
|
||||||
|
|
||||||
- // Moves the additional WeakValue from m_multiplyWrappedQObjects to
|
|
||||||
- // m_pendingFreedObjectWrapperValue. It's still alive after all.
|
|
||||||
+ // The additional WeakValue from m_multiplyWrappedQObjects hasn't been moved
|
|
||||||
+ // to m_pendingFreedObjectWrapperValue yet. It's still alive after all.
|
|
||||||
engine1.memoryManager->runGC();
|
|
||||||
- QCOMPARE(engine1.memoryManager->m_pendingFreedObjectWrapperValue.size(), 2);
|
|
||||||
+ QCOMPARE(engine1.memoryManager->m_pendingFreedObjectWrapperValue.size(), 1);
|
|
||||||
|
|
||||||
// engine2 doesn't own the object as engine1 was the first to wrap it above.
|
|
||||||
// Therefore, no effect here.
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
565
0009-Implement-accessibility-for-QQuickWidget.patch
Normal file
565
0009-Implement-accessibility-for-QQuickWidget.patch
Normal file
@ -0,0 +1,565 @@
|
|||||||
|
From 3f7ac5540c8796ec2bb2b595ca6648035a0f8b18 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io>
|
||||||
|
Date: Fri, 7 May 2021 10:07:50 +0200
|
||||||
|
Subject: [PATCH 09/19] Implement accessibility for QQuickWidget
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
The accessibility tree for the Qt Quick content should
|
||||||
|
be rooted at the QQuickWidget, and not at the offscreen
|
||||||
|
QQuickWindow.
|
||||||
|
|
||||||
|
For this to be the case, several things must happen:
|
||||||
|
- QQuickWindow must not report the child interfaces
|
||||||
|
- QQuickWidget must report the child interfaces
|
||||||
|
- The child interfaces must report the QQuickWidget as the parent
|
||||||
|
|
||||||
|
Create accessibility interfaces for QQuickWidget and
|
||||||
|
and QQuickWigetOffscreenWindow (which now gets a proper
|
||||||
|
subclass), where the QQuickWidget interface reports
|
||||||
|
the child interfaces and the QQuickWigetOffscreenWindow
|
||||||
|
reports no children
|
||||||
|
|
||||||
|
Change the code in QAccessibleQuickItem to use the
|
||||||
|
true (visible) window, where needed.
|
||||||
|
|
||||||
|
Fixes: QTBUG-67290
|
||||||
|
Change-Id: I387d0ef711138d248a8dd16eefc9839499b35eeb
|
||||||
|
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
|
||||||
|
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
||||||
|
(cherry picked from commit 41926e08d73ea6c4bbfc87a1dd52d2cdbc435c27)
|
||||||
|
---
|
||||||
|
src/quick/accessible/qaccessiblequickitem.cpp | 29 +++--
|
||||||
|
src/quick/accessible/qaccessiblequickview_p.h | 2 +-
|
||||||
|
src/quickwidgets/qaccessiblequickwidget.cpp | 110 ++++++++++++++++++
|
||||||
|
src/quickwidgets/qaccessiblequickwidget.h | 84 +++++++++++++
|
||||||
|
.../qaccessiblequickwidgetfactory.cpp | 60 ++++++++++
|
||||||
|
.../qaccessiblequickwidgetfactory_p.h | 66 +++++++++++
|
||||||
|
src/quickwidgets/qquickwidget.cpp | 18 ++-
|
||||||
|
src/quickwidgets/qquickwidget_p.h | 8 ++
|
||||||
|
src/quickwidgets/quickwidgets.pro | 8 +-
|
||||||
|
9 files changed, 368 insertions(+), 17 deletions(-)
|
||||||
|
create mode 100644 src/quickwidgets/qaccessiblequickwidget.cpp
|
||||||
|
create mode 100644 src/quickwidgets/qaccessiblequickwidget.h
|
||||||
|
create mode 100644 src/quickwidgets/qaccessiblequickwidgetfactory.cpp
|
||||||
|
create mode 100644 src/quickwidgets/qaccessiblequickwidgetfactory_p.h
|
||||||
|
|
||||||
|
diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp
|
||||||
|
index ae1954ae8d..0692ce634d 100644
|
||||||
|
--- a/src/quick/accessible/qaccessiblequickitem.cpp
|
||||||
|
+++ b/src/quick/accessible/qaccessiblequickitem.cpp
|
||||||
|
@@ -46,6 +46,7 @@
|
||||||
|
#include "QtQuick/private/qquicktextinput_p.h"
|
||||||
|
#include "QtQuick/private/qquickaccessibleattached_p.h"
|
||||||
|
#include "QtQuick/qquicktextdocument.h"
|
||||||
|
+#include "QtQuick/qquickrendercontrol.h"
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
#if QT_CONFIG(accessibility)
|
||||||
|
@@ -57,7 +58,19 @@ QAccessibleQuickItem::QAccessibleQuickItem(QQuickItem *item)
|
||||||
|
|
||||||
|
QWindow *QAccessibleQuickItem::window() const
|
||||||
|
{
|
||||||
|
- return item()->window();
|
||||||
|
+ QQuickWindow *window = item()->window();
|
||||||
|
+
|
||||||
|
+ // For QQuickWidget the above window will be the offscreen QQuickWindow,
|
||||||
|
+ // which is not a part of the accessibility tree. Detect this case and
|
||||||
|
+ // return the window for the QQuickWidget instead.
|
||||||
|
+ if (window && !window->handle()) {
|
||||||
|
+ if (QQuickRenderControl *renderControl = QQuickWindowPrivate::get(window)->renderControl) {
|
||||||
|
+ if (QWindow *renderWindow = renderControl->renderWindow(nullptr))
|
||||||
|
+ return renderWindow;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return window;
|
||||||
|
}
|
||||||
|
|
||||||
|
int QAccessibleQuickItem::childCount() const
|
||||||
|
@@ -113,19 +126,15 @@ QAccessibleInterface *QAccessibleQuickItem::childAt(int x, int y) const
|
||||||
|
QAccessibleInterface *QAccessibleQuickItem::parent() const
|
||||||
|
{
|
||||||
|
QQuickItem *parent = item()->parentItem();
|
||||||
|
- QQuickWindow *window = item()->window();
|
||||||
|
- QQuickItem *ci = window ? window->contentItem() : nullptr;
|
||||||
|
+ QQuickWindow *itemWindow = item()->window();
|
||||||
|
+ QQuickItem *ci = itemWindow ? itemWindow->contentItem() : nullptr;
|
||||||
|
while (parent && !QQuickItemPrivate::get(parent)->isAccessible && parent != ci)
|
||||||
|
parent = parent->parentItem();
|
||||||
|
|
||||||
|
if (parent) {
|
||||||
|
if (parent == ci) {
|
||||||
|
- // Jump out to the scene widget if the parent is the root item.
|
||||||
|
- // There are two root items, QQuickWindow::rootItem and
|
||||||
|
- // QQuickView::declarativeRoot. The former is the true root item,
|
||||||
|
- // but is not a part of the accessibility tree. Check if we hit
|
||||||
|
- // it here and return an interface for the scene instead.
|
||||||
|
- return QAccessible::queryAccessibleInterface(window);
|
||||||
|
+ // Jump out to the window if the parent is the root item
|
||||||
|
+ return QAccessible::queryAccessibleInterface(window());
|
||||||
|
} else {
|
||||||
|
while (parent && !parent->d_func()->isAccessible)
|
||||||
|
parent = parent->parentItem();
|
||||||
|
@@ -193,7 +202,7 @@ QAccessible::State QAccessibleQuickItem::state() const
|
||||||
|
QRect viewRect_ = viewRect();
|
||||||
|
QRect itemRect = rect();
|
||||||
|
|
||||||
|
- if (viewRect_.isNull() || itemRect.isNull() || !item()->window() || !item()->window()->isVisible() ||!item()->isVisible() || qFuzzyIsNull(item()->opacity()))
|
||||||
|
+ if (viewRect_.isNull() || itemRect.isNull() || !window() || !window()->isVisible() ||!item()->isVisible() || qFuzzyIsNull(item()->opacity()))
|
||||||
|
state.invisible = true;
|
||||||
|
if (!viewRect_.intersects(itemRect))
|
||||||
|
state.offscreen = true;
|
||||||
|
diff --git a/src/quick/accessible/qaccessiblequickview_p.h b/src/quick/accessible/qaccessiblequickview_p.h
|
||||||
|
index 39ffcaf39c..8baa01330c 100644
|
||||||
|
--- a/src/quick/accessible/qaccessiblequickview_p.h
|
||||||
|
+++ b/src/quick/accessible/qaccessiblequickview_p.h
|
||||||
|
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
#if QT_CONFIG(accessibility)
|
||||||
|
|
||||||
|
-class QAccessibleQuickWindow : public QAccessibleObject
|
||||||
|
+class Q_QUICK_EXPORT QAccessibleQuickWindow : public QAccessibleObject
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
QAccessibleQuickWindow(QQuickWindow *object);
|
||||||
|
diff --git a/src/quickwidgets/qaccessiblequickwidget.cpp b/src/quickwidgets/qaccessiblequickwidget.cpp
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..6f04d6693f
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/quickwidgets/qaccessiblequickwidget.cpp
|
||||||
|
@@ -0,0 +1,110 @@
|
||||||
|
+/****************************************************************************
|
||||||
|
+**
|
||||||
|
+** Copyright (C) 2021 The Qt Company Ltd.
|
||||||
|
+** Contact: https://www.qt.io/licensing/
|
||||||
|
+**
|
||||||
|
+** This file is part of the QtQuick module of the Qt Toolkit.
|
||||||
|
+**
|
||||||
|
+** $QT_BEGIN_LICENSE:LGPL$
|
||||||
|
+** Commercial License Usage
|
||||||
|
+** Licensees holding valid commercial Qt licenses may use this file in
|
||||||
|
+** accordance with the commercial license agreement provided with the
|
||||||
|
+** Software or, alternatively, in accordance with the terms contained in
|
||||||
|
+** a written agreement between you and The Qt Company. For licensing terms
|
||||||
|
+** and conditions see https://www.qt.io/terms-conditions. For further
|
||||||
|
+** information use the contact form at https://www.qt.io/contact-us.
|
||||||
|
+**
|
||||||
|
+** GNU Lesser General Public License Usage
|
||||||
|
+** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||||
|
+** General Public License version 3 as published by the Free Software
|
||||||
|
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||||
|
+** packaging of this file. Please review the following information to
|
||||||
|
+** ensure the GNU Lesser General Public License version 3 requirements
|
||||||
|
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||||
|
+**
|
||||||
|
+** GNU General Public License Usage
|
||||||
|
+** Alternatively, this file may be used under the terms of the GNU
|
||||||
|
+** General Public License version 2.0 or (at your option) the GNU General
|
||||||
|
+** Public license version 3 or any later version approved by the KDE Free
|
||||||
|
+** Qt Foundation. The licenses are as published by the Free Software
|
||||||
|
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||||
|
+** included in the packaging of this file. Please review the following
|
||||||
|
+** information to ensure the GNU General Public License requirements will
|
||||||
|
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||||
|
+** https://www.gnu.org/licenses/gpl-3.0.html.
|
||||||
|
+**
|
||||||
|
+** $QT_END_LICENSE$
|
||||||
|
+**
|
||||||
|
+****************************************************************************/
|
||||||
|
+
|
||||||
|
+#include "qaccessiblequickwidget.h"
|
||||||
|
+
|
||||||
|
+#include "qquickwidget_p.h"
|
||||||
|
+
|
||||||
|
+QT_BEGIN_NAMESPACE
|
||||||
|
+
|
||||||
|
+#if QT_CONFIG(accessibility)
|
||||||
|
+
|
||||||
|
+QAccessibleQuickWidget::QAccessibleQuickWidget(QQuickWidget* widget)
|
||||||
|
+: QAccessibleWidget(widget)
|
||||||
|
+, m_accessibleWindow(QQuickWidgetPrivate::get(widget)->offscreenWindow)
|
||||||
|
+{
|
||||||
|
+ // NOTE: m_accessibleWindow is a QAccessibleQuickWindow, and not a
|
||||||
|
+ // QAccessibleQuickWidgetOffscreenWindow (defined below). This means
|
||||||
|
+ // it will return the Quick item child interfaces, which is what's needed here
|
||||||
|
+ // (unlike QAccessibleQuickWidgetOffscreenWindow, which will report 0 children).
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+QAccessibleInterface *QAccessibleQuickWidget::child(int index) const
|
||||||
|
+{
|
||||||
|
+ return m_accessibleWindow.child(index);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+int QAccessibleQuickWidget::childCount() const
|
||||||
|
+{
|
||||||
|
+ return m_accessibleWindow.childCount();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+int QAccessibleQuickWidget::indexOfChild(const QAccessibleInterface *iface) const
|
||||||
|
+{
|
||||||
|
+ return m_accessibleWindow.indexOfChild(iface);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+QAccessibleInterface *QAccessibleQuickWidget::childAt(int x, int y) const
|
||||||
|
+{
|
||||||
|
+ return m_accessibleWindow.childAt(x, y);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+QAccessibleQuickWidgetOffscreenWindow::QAccessibleQuickWidgetOffscreenWindow(QQuickWindow *window)
|
||||||
|
+:QAccessibleQuickWindow(window)
|
||||||
|
+{
|
||||||
|
+
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+QAccessibleInterface *QAccessibleQuickWidgetOffscreenWindow::child(int index) const
|
||||||
|
+{
|
||||||
|
+ Q_UNUSED(index);
|
||||||
|
+ return nullptr;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+int QAccessibleQuickWidgetOffscreenWindow::childCount() const
|
||||||
|
+{
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+int QAccessibleQuickWidgetOffscreenWindow::indexOfChild(const QAccessibleInterface *iface) const
|
||||||
|
+{
|
||||||
|
+ Q_UNUSED(iface);
|
||||||
|
+ return -1;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+QAccessibleInterface *QAccessibleQuickWidgetOffscreenWindow::QAccessibleQuickWidgetOffscreenWindow::childAt(int x, int y) const
|
||||||
|
+{
|
||||||
|
+ Q_UNUSED(x);
|
||||||
|
+ Q_UNUSED(y);
|
||||||
|
+ return nullptr;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+#endif // accessibility
|
||||||
|
+
|
||||||
|
+QT_END_NAMESPACE
|
||||||
|
diff --git a/src/quickwidgets/qaccessiblequickwidget.h b/src/quickwidgets/qaccessiblequickwidget.h
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..1f52c78c46
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/quickwidgets/qaccessiblequickwidget.h
|
||||||
|
@@ -0,0 +1,84 @@
|
||||||
|
+/****************************************************************************
|
||||||
|
+**
|
||||||
|
+** Copyright (C) 2021 The Qt Company Ltd.
|
||||||
|
+** Contact: https://www.qt.io/licensing/
|
||||||
|
+**
|
||||||
|
+** This file is part of the QtQuick module of the Qt Toolkit.
|
||||||
|
+**
|
||||||
|
+** $QT_BEGIN_LICENSE:LGPL$
|
||||||
|
+** Commercial License Usage
|
||||||
|
+** Licensees holding valid commercial Qt licenses may use this file in
|
||||||
|
+** accordance with the commercial license agreement provided with the
|
||||||
|
+** Software or, alternatively, in accordance with the terms contained in
|
||||||
|
+** a written agreement between you and The Qt Company. For licensing terms
|
||||||
|
+** and conditions see https://www.qt.io/terms-conditions. For further
|
||||||
|
+** information use the contact form at https://www.qt.io/contact-us.
|
||||||
|
+**
|
||||||
|
+** GNU Lesser General Public License Usage
|
||||||
|
+** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||||
|
+** General Public License version 3 as published by the Free Software
|
||||||
|
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||||
|
+** packaging of this file. Please review the following information to
|
||||||
|
+** ensure the GNU Lesser General Public License version 3 requirements
|
||||||
|
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||||
|
+**
|
||||||
|
+** GNU General Public License Usage
|
||||||
|
+** Alternatively, this file may be used under the terms of the GNU
|
||||||
|
+** General Public License version 2.0 or (at your option) the GNU General
|
||||||
|
+** Public license version 3 or any later version approved by the KDE Free
|
||||||
|
+** Qt Foundation. The licenses are as published by the Free Software
|
||||||
|
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||||
|
+** included in the packaging of this file. Please review the following
|
||||||
|
+** information to ensure the GNU General Public License requirements will
|
||||||
|
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||||
|
+** https://www.gnu.org/licenses/gpl-3.0.html.
|
||||||
|
+**
|
||||||
|
+** $QT_END_LICENSE$
|
||||||
|
+**
|
||||||
|
+****************************************************************************/
|
||||||
|
+
|
||||||
|
+#ifndef QACCESSIBLEQUICKWIDGET_H
|
||||||
|
+#define QACCESSIBLEQUICKWIDGET_H
|
||||||
|
+
|
||||||
|
+#include "qquickwidget.h"
|
||||||
|
+#include <QtWidgets/qaccessiblewidget.h>
|
||||||
|
+
|
||||||
|
+#include <private/qaccessiblequickview_p.h>
|
||||||
|
+
|
||||||
|
+QT_BEGIN_NAMESPACE
|
||||||
|
+
|
||||||
|
+#if QT_CONFIG(accessibility)
|
||||||
|
+
|
||||||
|
+// These classes implement the QQuickWiget accessibility switcharoo,
|
||||||
|
+// where the child items of the QQuickWidgetOffscreenWindow are reported
|
||||||
|
+// as child accessible interfaces of the QAccessibleQuickWidget.
|
||||||
|
+class QAccessibleQuickWidget: public QAccessibleWidget
|
||||||
|
+{
|
||||||
|
+public:
|
||||||
|
+ QAccessibleQuickWidget(QQuickWidget* widget);
|
||||||
|
+
|
||||||
|
+ QAccessibleInterface *child(int index) const override;
|
||||||
|
+ int childCount() const override;
|
||||||
|
+ int indexOfChild(const QAccessibleInterface *iface) const override;
|
||||||
|
+ QAccessibleInterface *childAt(int x, int y) const override;
|
||||||
|
+
|
||||||
|
+private:
|
||||||
|
+ QAccessibleQuickWindow m_accessibleWindow;
|
||||||
|
+ Q_DISABLE_COPY(QAccessibleQuickWidget)
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+class QAccessibleQuickWidgetOffscreenWindow: public QAccessibleQuickWindow
|
||||||
|
+{
|
||||||
|
+public:
|
||||||
|
+ QAccessibleQuickWidgetOffscreenWindow(QQuickWindow *window);
|
||||||
|
+ QAccessibleInterface *child(int index) const override;
|
||||||
|
+ int childCount() const override;
|
||||||
|
+ int indexOfChild(const QAccessibleInterface *iface) const override;
|
||||||
|
+ QAccessibleInterface *childAt(int x, int y) const override;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+#endif // accessibility
|
||||||
|
+
|
||||||
|
+QT_END_NAMESPACE
|
||||||
|
+
|
||||||
|
+#endif
|
||||||
|
diff --git a/src/quickwidgets/qaccessiblequickwidgetfactory.cpp b/src/quickwidgets/qaccessiblequickwidgetfactory.cpp
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..3756d0c27c
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/quickwidgets/qaccessiblequickwidgetfactory.cpp
|
||||||
|
@@ -0,0 +1,60 @@
|
||||||
|
+/****************************************************************************
|
||||||
|
+**
|
||||||
|
+** Copyright (C) 2021 The Qt Company Ltd.
|
||||||
|
+** Contact: https://www.qt.io/licensing/
|
||||||
|
+**
|
||||||
|
+** This file is part of the QtQuick module of the Qt Toolkit.
|
||||||
|
+**
|
||||||
|
+** $QT_BEGIN_LICENSE:LGPL$
|
||||||
|
+** Commercial License Usage
|
||||||
|
+** Licensees holding valid commercial Qt licenses may use this file in
|
||||||
|
+** accordance with the commercial license agreement provided with the
|
||||||
|
+** Software or, alternatively, in accordance with the terms contained in
|
||||||
|
+** a written agreement between you and The Qt Company. For licensing terms
|
||||||
|
+** and conditions see https://www.qt.io/terms-conditions. For further
|
||||||
|
+** information use the contact form at https://www.qt.io/contact-us.
|
||||||
|
+**
|
||||||
|
+** GNU Lesser General Public License Usage
|
||||||
|
+** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||||
|
+** General Public License version 3 as published by the Free Software
|
||||||
|
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||||
|
+** packaging of this file. Please review the following information to
|
||||||
|
+** ensure the GNU Lesser General Public License version 3 requirements
|
||||||
|
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||||
|
+**
|
||||||
|
+** GNU General Public License Usage
|
||||||
|
+** Alternatively, this file may be used under the terms of the GNU
|
||||||
|
+** General Public License version 2.0 or (at your option) the GNU General
|
||||||
|
+** Public license version 3 or any later version approved by the KDE Free
|
||||||
|
+** Qt Foundation. The licenses are as published by the Free Software
|
||||||
|
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||||
|
+** included in the packaging of this file. Please review the following
|
||||||
|
+** information to ensure the GNU General Public License requirements will
|
||||||
|
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||||
|
+** https://www.gnu.org/licenses/gpl-3.0.html.
|
||||||
|
+**
|
||||||
|
+** $QT_END_LICENSE$
|
||||||
|
+**
|
||||||
|
+****************************************************************************/
|
||||||
|
+
|
||||||
|
+#include "qaccessiblequickwidgetfactory_p.h"
|
||||||
|
+#include "qaccessiblequickwidget.h"
|
||||||
|
+
|
||||||
|
+QT_BEGIN_NAMESPACE
|
||||||
|
+
|
||||||
|
+#if QT_CONFIG(accessibility)
|
||||||
|
+
|
||||||
|
+QAccessibleInterface *qAccessibleQuickWidgetFactory(const QString &classname, QObject *object)
|
||||||
|
+{
|
||||||
|
+ if (classname == QLatin1String("QQuickWidget")) {
|
||||||
|
+ return new QAccessibleQuickWidget(qobject_cast<QQuickWidget *>(object));
|
||||||
|
+ } else if (classname == QLatin1String("QQuickWidgetOffscreenWindow")) {
|
||||||
|
+ return new QAccessibleQuickWidgetOffscreenWindow(qobject_cast<QQuickWindow *>(object));
|
||||||
|
+ }
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+#endif // accessibility
|
||||||
|
+
|
||||||
|
+QT_END_NAMESPACE
|
||||||
|
+
|
||||||
|
diff --git a/src/quickwidgets/qaccessiblequickwidgetfactory_p.h b/src/quickwidgets/qaccessiblequickwidgetfactory_p.h
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..8c63b09f81
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/quickwidgets/qaccessiblequickwidgetfactory_p.h
|
||||||
|
@@ -0,0 +1,66 @@
|
||||||
|
+/****************************************************************************
|
||||||
|
+**
|
||||||
|
+** Copyright (C) 2021 The Qt Company Ltd.
|
||||||
|
+** Contact: https://www.qt.io/licensing/
|
||||||
|
+**
|
||||||
|
+** This file is part of the QtQuick module of the Qt Toolkit.
|
||||||
|
+**
|
||||||
|
+** $QT_BEGIN_LICENSE:LGPL$
|
||||||
|
+** Commercial License Usage
|
||||||
|
+** Licensees holding valid commercial Qt licenses may use this file in
|
||||||
|
+** accordance with the commercial license agreement provided with the
|
||||||
|
+** Software or, alternatively, in accordance with the terms contained in
|
||||||
|
+** a written agreement between you and The Qt Company. For licensing terms
|
||||||
|
+** and conditions see https://www.qt.io/terms-conditions. For further
|
||||||
|
+** information use the contact form at https://www.qt.io/contact-us.
|
||||||
|
+**
|
||||||
|
+** GNU Lesser General Public License Usage
|
||||||
|
+** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||||
|
+** General Public License version 3 as published by the Free Software
|
||||||
|
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||||
|
+** packaging of this file. Please review the following information to
|
||||||
|
+** ensure the GNU Lesser General Public License version 3 requirements
|
||||||
|
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||||
|
+**
|
||||||
|
+** GNU General Public License Usage
|
||||||
|
+** Alternatively, this file may be used under the terms of the GNU
|
||||||
|
+** General Public License version 2.0 or (at your option) the GNU General
|
||||||
|
+** Public license version 3 or any later version approved by the KDE Free
|
||||||
|
+** Qt Foundation. The licenses are as published by the Free Software
|
||||||
|
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||||
|
+** included in the packaging of this file. Please review the following
|
||||||
|
+** information to ensure the GNU General Public License requirements will
|
||||||
|
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||||
|
+** https://www.gnu.org/licenses/gpl-3.0.html.
|
||||||
|
+**
|
||||||
|
+** $QT_END_LICENSE$
|
||||||
|
+**
|
||||||
|
+****************************************************************************/
|
||||||
|
+
|
||||||
|
+#include <QtGui/qaccessible.h>
|
||||||
|
+
|
||||||
|
+#ifndef QACCESSIBLEQUICKWIDGETFACTORY_H
|
||||||
|
+#define QACCESSIBLEQUICKWIDGETFACTORY_H
|
||||||
|
+
|
||||||
|
+//
|
||||||
|
+// W A R N I N G
|
||||||
|
+// -------------
|
||||||
|
+//
|
||||||
|
+// This file is not part of the Qt API. It exists purely as an
|
||||||
|
+// implementation detail. This header file may change from version to
|
||||||
|
+// version without notice, or even be removed.
|
||||||
|
+//
|
||||||
|
+// We mean it.
|
||||||
|
+//
|
||||||
|
+
|
||||||
|
+QT_BEGIN_NAMESPACE
|
||||||
|
+
|
||||||
|
+#if QT_CONFIG(accessibility)
|
||||||
|
+
|
||||||
|
+QAccessibleInterface *qAccessibleQuickWidgetFactory(const QString &classname, QObject *object);
|
||||||
|
+
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+QT_END_NAMESPACE
|
||||||
|
+
|
||||||
|
+#endif
|
||||||
|
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
|
||||||
|
index 223d91f579..9c97b43518 100644
|
||||||
|
--- a/src/quickwidgets/qquickwidget.cpp
|
||||||
|
+++ b/src/quickwidgets/qquickwidget.cpp
|
||||||
|
@@ -39,6 +39,7 @@
|
||||||
|
|
||||||
|
#include "qquickwidget.h"
|
||||||
|
#include "qquickwidget_p.h"
|
||||||
|
+#include "qaccessiblequickwidgetfactory_p.h"
|
||||||
|
|
||||||
|
#include "private/qquickwindow_p.h"
|
||||||
|
#include "private/qquickitem_p.h"
|
||||||
|
@@ -75,9 +76,16 @@
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
+QQuickWidgetOffscreenWindow::QQuickWidgetOffscreenWindow(QQuickWindowPrivate &dd, QQuickRenderControl *control)
|
||||||
|
+:QQuickWindow(dd, control)
|
||||||
|
+{
|
||||||
|
+ setTitle(QString::fromLatin1("Offscreen"));
|
||||||
|
+ setObjectName(QString::fromLatin1("QQuickOffScreenWindow"));
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
// override setVisble to prevent accidental offscreen window being created
|
||||||
|
// by base class.
|
||||||
|
-class QQuickOffcreenWindowPrivate: public QQuickWindowPrivate {
|
||||||
|
+class QQuickWidgetOffscreenWindowPrivate: public QQuickWindowPrivate {
|
||||||
|
public:
|
||||||
|
void setVisible(bool visible) override {
|
||||||
|
Q_Q(QWindow);
|
||||||
|
@@ -105,10 +113,8 @@ void QQuickWidgetPrivate::init(QQmlEngine* e)
|
||||||
|
Q_Q(QQuickWidget);
|
||||||
|
|
||||||
|
renderControl = new QQuickWidgetRenderControl(q);
|
||||||
|
- offscreenWindow = new QQuickWindow(*new QQuickOffcreenWindowPrivate(),renderControl);
|
||||||
|
+ offscreenWindow = new QQuickWidgetOffscreenWindow(*new QQuickWidgetOffscreenWindowPrivate(), renderControl);
|
||||||
|
offscreenWindow->setScreen(q->screen());
|
||||||
|
- offscreenWindow->setTitle(QString::fromLatin1("Offscreen"));
|
||||||
|
- offscreenWindow->setObjectName(QString::fromLatin1("QQuickOffScreenWindow"));
|
||||||
|
// Do not call create() on offscreenWindow.
|
||||||
|
|
||||||
|
// Check if the Software Adaptation is being used
|
||||||
|
@@ -139,6 +145,10 @@ void QQuickWidgetPrivate::init(QQmlEngine* e)
|
||||||
|
QWidget::connect(offscreenWindow, &QQuickWindow::focusObjectChanged, q, &QQuickWidget::propagateFocusObjectChanged);
|
||||||
|
QObject::connect(renderControl, SIGNAL(renderRequested()), q, SLOT(triggerUpdate()));
|
||||||
|
QObject::connect(renderControl, SIGNAL(sceneChanged()), q, SLOT(triggerUpdate()));
|
||||||
|
+
|
||||||
|
+#if QT_CONFIG(accessibility)
|
||||||
|
+ QAccessible::installFactory(&qAccessibleQuickWidgetFactory);
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void QQuickWidgetPrivate::ensureEngine() const
|
||||||
|
diff --git a/src/quickwidgets/qquickwidget_p.h b/src/quickwidgets/qquickwidget_p.h
|
||||||
|
index 881f7f9220..1a946bcc71 100644
|
||||||
|
--- a/src/quickwidgets/qquickwidget_p.h
|
||||||
|
+++ b/src/quickwidgets/qquickwidget_p.h
|
||||||
|
@@ -148,6 +148,14 @@ public:
|
||||||
|
bool forceFullUpdate;
|
||||||
|
};
|
||||||
|
|
||||||
|
+class QQuickWidgetOffscreenWindow: public QQuickWindow
|
||||||
|
+{
|
||||||
|
+ Q_OBJECT
|
||||||
|
+
|
||||||
|
+public:
|
||||||
|
+ QQuickWidgetOffscreenWindow(QQuickWindowPrivate &dd, QQuickRenderControl *control);
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
#endif // QQuickWidget_P_H
|
||||||
|
diff --git a/src/quickwidgets/quickwidgets.pro b/src/quickwidgets/quickwidgets.pro
|
||||||
|
index 2438e577ae..f46deb54ac 100644
|
||||||
|
--- a/src/quickwidgets/quickwidgets.pro
|
||||||
|
+++ b/src/quickwidgets/quickwidgets.pro
|
||||||
|
@@ -7,9 +7,13 @@ DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES QT_NO_FO
|
||||||
|
HEADERS += \
|
||||||
|
qquickwidget.h \
|
||||||
|
qquickwidget_p.h \
|
||||||
|
- qtquickwidgetsglobal.h
|
||||||
|
+ qtquickwidgetsglobal.h \
|
||||||
|
+ qaccessiblequickwidget.h \
|
||||||
|
+ qaccessiblequickwidgetfactory_p.h
|
||||||
|
|
||||||
|
SOURCES += \
|
||||||
|
- qquickwidget.cpp
|
||||||
|
+ qquickwidget.cpp \
|
||||||
|
+ qaccessiblequickwidget.cpp \
|
||||||
|
+ qaccessiblequickwidgetfactory.cpp
|
||||||
|
|
||||||
|
load(qt_module)
|
||||||
|
--
|
||||||
|
2.40.0
|
||||||
|
|
||||||
@ -1,483 +0,0 @@
|
|||||||
From 55f07163f84badcc9aa0805f1523ef43a7225778 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 10/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
|
|
||||||
show up when the text was positioned at a subpixel offset in
|
|
||||||
some cases. Instead, we pixel-align the coordinates after mapping
|
|
||||||
them to the view frustum, but before applying the projection to the
|
|
||||||
screen.
|
|
||||||
|
|
||||||
To make it easier to modify the buffer layout for the shaders the
|
|
||||||
next time, this also adds some constants for offsets.
|
|
||||||
|
|
||||||
[ChangeLog][Text] Fixed an issue where text using NativeRendering
|
|
||||||
would look slightly skewed if it was inside a parent that had
|
|
||||||
been positioned at a subpixel offset.
|
|
||||||
|
|
||||||
Pick-to: 5.15 6.2
|
|
||||||
Fixes: QTBUG-96112
|
|
||||||
Fixes: QTBUG-83626
|
|
||||||
Task-number: QTBUG-55638
|
|
||||||
Change-Id: Ifb785ad5830093df94afc75a7bc288e24ca7aa38
|
|
||||||
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
|
||||||
(cherry picked from commit b21948f5e811ce1b7abf065bc48af61a231e86f4)
|
|
||||||
---
|
|
||||||
.../scenegraph/qsgdefaultglyphnode_p.cpp | 46 ++++++----
|
|
||||||
.../scenegraph/shaders_ng/24bittextmask.frag | 5 +-
|
|
||||||
.../scenegraph/shaders_ng/32bitcolortext.frag | 5 +-
|
|
||||||
.../scenegraph/shaders_ng/8bittextmask.frag | 3 +-
|
|
||||||
.../scenegraph/shaders_ng/8bittextmask_a.frag | 3 +-
|
|
||||||
.../scenegraph/shaders_ng/outlinedtext.frag | 5 +-
|
|
||||||
.../scenegraph/shaders_ng/outlinedtext.vert | 9 +-
|
|
||||||
.../scenegraph/shaders_ng/outlinedtext_a.frag | 5 +-
|
|
||||||
.../scenegraph/shaders_ng/styledtext.frag | 3 +-
|
|
||||||
.../scenegraph/shaders_ng/styledtext.vert | 7 +-
|
|
||||||
.../scenegraph/shaders_ng/styledtext_a.frag | 3 +-
|
|
||||||
src/quick/scenegraph/shaders_ng/textmask.frag | 3 +-
|
|
||||||
src/quick/scenegraph/shaders_ng/textmask.vert | 7 +-
|
|
||||||
...text_nativerendering_subpixelpositions.qml | 91 +++++++++++++++++++
|
|
||||||
14 files changed, 155 insertions(+), 40 deletions(-)
|
|
||||||
create mode 100644 tests/manual/scenegraph_lancelot/data/text/text_nativerendering_subpixelpositions.qml
|
|
||||||
|
|
||||||
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
|
|
||||||
index 3c60f830de..0fd6581dc4 100644
|
|
||||||
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
|
|
||||||
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
|
|
||||||
@@ -428,6 +428,18 @@ QSGTextMaskRhiShader::QSGTextMaskRhiShader(QFontEngine::GlyphFormat glyphFormat)
|
|
||||||
QStringLiteral(":/qt-project.org/scenegraph/shaders_ng/textmask.frag.qsb"));
|
|
||||||
}
|
|
||||||
|
|
||||||
+enum UbufOffset {
|
|
||||||
+ ModelViewMatrixOffset = 0,
|
|
||||||
+ ProjectionMatrixOffset = ModelViewMatrixOffset + 64,
|
|
||||||
+ ColorOffset = ProjectionMatrixOffset + 64,
|
|
||||||
+ TextureScaleOffset = ColorOffset + 16,
|
|
||||||
+ DprOffset = TextureScaleOffset + 8,
|
|
||||||
+
|
|
||||||
+ // + 1 float padding (vec4 must be aligned to 16)
|
|
||||||
+ StyleColorOffset = DprOffset + 4 + 4,
|
|
||||||
+ ShiftOffset = StyleColorOffset + 16
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
bool QSGTextMaskRhiShader::updateUniformData(RenderState &state,
|
|
||||||
QSGMaterial *newMaterial, QSGMaterial *oldMaterial)
|
|
||||||
{
|
|
||||||
@@ -443,11 +455,14 @@ bool QSGTextMaskRhiShader::updateUniformData(RenderState &state,
|
|
||||||
|
|
||||||
bool changed = false;
|
|
||||||
QByteArray *buf = state.uniformData();
|
|
||||||
- Q_ASSERT(buf->size() >= 92);
|
|
||||||
+ Q_ASSERT(buf->size() >= DprOffset + 4);
|
|
||||||
|
|
||||||
if (state.isMatrixDirty()) {
|
|
||||||
- const QMatrix4x4 m = state.combinedMatrix();
|
|
||||||
- memcpy(buf->data(), m.constData(), 64);
|
|
||||||
+ const QMatrix4x4 mv = state.modelViewMatrix();
|
|
||||||
+ memcpy(buf->data() + ModelViewMatrixOffset, mv.constData(), 64);
|
|
||||||
+ const QMatrix4x4 p = state.projectionMatrix();
|
|
||||||
+ memcpy(buf->data() + ProjectionMatrixOffset, p.constData(), 64);
|
|
||||||
+
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -456,13 +471,13 @@ bool QSGTextMaskRhiShader::updateUniformData(RenderState &state,
|
|
||||||
if (updated || !oldMat || oldRtex != newRtex) {
|
|
||||||
const QVector2D textureScale = QVector2D(1.0f / mat->rhiGlyphCache()->width(),
|
|
||||||
1.0f / mat->rhiGlyphCache()->height());
|
|
||||||
- memcpy(buf->data() + 64 + 16, &textureScale, 8);
|
|
||||||
+ memcpy(buf->data() + TextureScaleOffset, &textureScale, 8);
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!oldMat) {
|
|
||||||
float dpr = state.devicePixelRatio();
|
|
||||||
- memcpy(buf->data() + 64 + 16 + 8, &dpr, 4);
|
|
||||||
+ memcpy(buf->data() + DprOffset, &dpr, 4);
|
|
||||||
}
|
|
||||||
|
|
||||||
// move texture uploads/copies onto the renderer's soon-to-be-committed list
|
|
||||||
@@ -510,11 +525,11 @@ bool QSG8BitTextMaskRhiShader::updateUniformData(RenderState &state,
|
|
||||||
QSGTextMaskMaterial *oldMat = static_cast<QSGTextMaskMaterial *>(oldMaterial);
|
|
||||||
|
|
||||||
QByteArray *buf = state.uniformData();
|
|
||||||
- Q_ASSERT(buf->size() >= 80);
|
|
||||||
+ Q_ASSERT(buf->size() >= ColorOffset + 16);
|
|
||||||
|
|
||||||
if (oldMat == nullptr || mat->color() != oldMat->color() || state.isOpacityDirty()) {
|
|
||||||
const QVector4D color = qsg_premultiply(mat->color(), state.opacity());
|
|
||||||
- memcpy(buf->data() + 64, &color, 16);
|
|
||||||
+ memcpy(buf->data() + ColorOffset, &color, 16);
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -553,12 +568,12 @@ bool QSG24BitTextMaskRhiShader::updateUniformData(RenderState &state,
|
|
||||||
QSGTextMaskMaterial *oldMat = static_cast<QSGTextMaskMaterial *>(oldMaterial);
|
|
||||||
|
|
||||||
QByteArray *buf = state.uniformData();
|
|
||||||
- Q_ASSERT(buf->size() >= 92);
|
|
||||||
+ Q_ASSERT(buf->size() >= ColorOffset + 16);
|
|
||||||
|
|
||||||
if (oldMat == nullptr || mat->color() != oldMat->color() || state.isOpacityDirty()) {
|
|
||||||
// shader takes vec4 but uses alpha only; coloring happens via the blend constant
|
|
||||||
const QVector4D color = qsg_premultiply(mat->color(), state.opacity());
|
|
||||||
- memcpy(buf->data() + 64, &color, 16);
|
|
||||||
+ memcpy(buf->data() + ColorOffset, &color, 16);
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -608,12 +623,12 @@ bool QSG32BitColorTextRhiShader::updateUniformData(RenderState &state,
|
|
||||||
QSGTextMaskMaterial *oldMat = static_cast<QSGTextMaskMaterial *>(oldMaterial);
|
|
||||||
|
|
||||||
QByteArray *buf = state.uniformData();
|
|
||||||
- Q_ASSERT(buf->size() >= 92);
|
|
||||||
+ Q_ASSERT(buf->size() >= ColorOffset + 16);
|
|
||||||
|
|
||||||
if (oldMat == nullptr || mat->color() != oldMat->color() || state.isOpacityDirty()) {
|
|
||||||
// shader takes vec4 but uses alpha only
|
|
||||||
const QVector4D color(0, 0, 0, mat->color().w() * state.opacity());
|
|
||||||
- memcpy(buf->data() + 64, &color, 16);
|
|
||||||
+ memcpy(buf->data() + ColorOffset, &color, 16);
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -649,20 +664,17 @@ bool QSGStyledTextRhiShader::updateUniformData(RenderState &state,
|
|
||||||
QSGStyledTextMaterial *oldMat = static_cast<QSGStyledTextMaterial *>(oldMaterial);
|
|
||||||
|
|
||||||
QByteArray *buf = state.uniformData();
|
|
||||||
- Q_ASSERT(buf->size() >= 120);
|
|
||||||
-
|
|
||||||
- // matrix..dpr + 1 float padding (vec4 must be aligned to 16)
|
|
||||||
- const int startOffset = 64 + 16 + 8 + 4 + 4;
|
|
||||||
+ Q_ASSERT(buf->size() >= ShiftOffset + 8);
|
|
||||||
|
|
||||||
if (oldMat == nullptr || mat->styleColor() != oldMat->styleColor() || state.isOpacityDirty()) {
|
|
||||||
const QVector4D styleColor = qsg_premultiply(mat->styleColor(), state.opacity());
|
|
||||||
- memcpy(buf->data() + startOffset, &styleColor, 16);
|
|
||||||
+ memcpy(buf->data() + StyleColorOffset, &styleColor, 16);
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (oldMat == nullptr || oldMat->styleShift() != mat->styleShift()) {
|
|
||||||
const QVector2D v = mat->styleShift();
|
|
||||||
- memcpy(buf->data() + startOffset + 16, &v, 8);
|
|
||||||
+ memcpy(buf->data() + ShiftOffset, &v, 8);
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/src/quick/scenegraph/shaders_ng/24bittextmask.frag b/src/quick/scenegraph/shaders_ng/24bittextmask.frag
|
|
||||||
index bc3826a924..ed8da4cd30 100644
|
|
||||||
--- a/src/quick/scenegraph/shaders_ng/24bittextmask.frag
|
|
||||||
+++ b/src/quick/scenegraph/shaders_ng/24bittextmask.frag
|
|
||||||
@@ -6,8 +6,9 @@ layout(location = 0) out vec4 fragColor;
|
|
||||||
layout(binding = 1) uniform sampler2D _qt_texture;
|
|
||||||
|
|
||||||
layout(std140, binding = 0) uniform buf {
|
|
||||||
- mat4 matrix;
|
|
||||||
- vec4 color; // only alpha is used, but must be vec4 due to layout compat
|
|
||||||
+ mat4 modelViewMatrix;
|
|
||||||
+ mat4 projectionMatrix;
|
|
||||||
+ vec4 color;
|
|
||||||
vec2 textureScale;
|
|
||||||
float dpr;
|
|
||||||
} ubuf;
|
|
||||||
diff --git a/src/quick/scenegraph/shaders_ng/32bitcolortext.frag b/src/quick/scenegraph/shaders_ng/32bitcolortext.frag
|
|
||||||
index 63e445f90b..4198a4d339 100644
|
|
||||||
--- a/src/quick/scenegraph/shaders_ng/32bitcolortext.frag
|
|
||||||
+++ b/src/quick/scenegraph/shaders_ng/32bitcolortext.frag
|
|
||||||
@@ -6,8 +6,9 @@ layout(location = 0) out vec4 fragColor;
|
|
||||||
layout(binding = 1) uniform sampler2D _qt_texture;
|
|
||||||
|
|
||||||
layout(std140, binding = 0) uniform buf {
|
|
||||||
- mat4 matrix;
|
|
||||||
- vec4 color; // only alpha is used, but must be vec4 due to layout compat
|
|
||||||
+ mat4 modelViewMatrix;
|
|
||||||
+ mat4 projectionMatrix;
|
|
||||||
+ vec4 color;
|
|
||||||
vec2 textureScale;
|
|
||||||
float dpr;
|
|
||||||
} ubuf;
|
|
||||||
diff --git a/src/quick/scenegraph/shaders_ng/8bittextmask.frag b/src/quick/scenegraph/shaders_ng/8bittextmask.frag
|
|
||||||
index 6304e821ff..a06743876d 100644
|
|
||||||
--- a/src/quick/scenegraph/shaders_ng/8bittextmask.frag
|
|
||||||
+++ b/src/quick/scenegraph/shaders_ng/8bittextmask.frag
|
|
||||||
@@ -6,7 +6,8 @@ layout(location = 0) out vec4 fragColor;
|
|
||||||
layout(binding = 1) uniform sampler2D _qt_texture;
|
|
||||||
|
|
||||||
layout(std140, binding = 0) uniform buf {
|
|
||||||
- mat4 matrix;
|
|
||||||
+ mat4 modelViewMatrix;
|
|
||||||
+ mat4 projectionMatrix;
|
|
||||||
vec4 color;
|
|
||||||
vec2 textureScale;
|
|
||||||
float dpr;
|
|
||||||
diff --git a/src/quick/scenegraph/shaders_ng/8bittextmask_a.frag b/src/quick/scenegraph/shaders_ng/8bittextmask_a.frag
|
|
||||||
index 0d0fa1cd3a..f725cbc5e7 100644
|
|
||||||
--- a/src/quick/scenegraph/shaders_ng/8bittextmask_a.frag
|
|
||||||
+++ b/src/quick/scenegraph/shaders_ng/8bittextmask_a.frag
|
|
||||||
@@ -6,7 +6,8 @@ layout(location = 0) out vec4 fragColor;
|
|
||||||
layout(binding = 1) uniform sampler2D _qt_texture;
|
|
||||||
|
|
||||||
layout(std140, binding = 0) uniform buf {
|
|
||||||
- mat4 matrix;
|
|
||||||
+ mat4 modelViewMatrix;
|
|
||||||
+ mat4 projectionMatrix;
|
|
||||||
vec4 color;
|
|
||||||
vec2 textureScale;
|
|
||||||
float dpr;
|
|
||||||
diff --git a/src/quick/scenegraph/shaders_ng/outlinedtext.frag b/src/quick/scenegraph/shaders_ng/outlinedtext.frag
|
|
||||||
index 947d161a50..e2f82d3845 100644
|
|
||||||
--- a/src/quick/scenegraph/shaders_ng/outlinedtext.frag
|
|
||||||
+++ b/src/quick/scenegraph/shaders_ng/outlinedtext.frag
|
|
||||||
@@ -11,11 +11,12 @@ layout(location = 0) out vec4 fragColor;
|
|
||||||
layout(binding = 1) uniform sampler2D _qt_texture;
|
|
||||||
|
|
||||||
layout(std140, binding = 0) uniform buf {
|
|
||||||
- // must match styledtext
|
|
||||||
- mat4 matrix;
|
|
||||||
+ mat4 modelViewMatrix;
|
|
||||||
+ mat4 projectionMatrix;
|
|
||||||
vec4 color;
|
|
||||||
vec2 textureScale;
|
|
||||||
float dpr;
|
|
||||||
+ // the above must stay compatible with textmask/8bittextmask
|
|
||||||
vec4 styleColor;
|
|
||||||
vec2 shift;
|
|
||||||
} ubuf;
|
|
||||||
diff --git a/src/quick/scenegraph/shaders_ng/outlinedtext.vert b/src/quick/scenegraph/shaders_ng/outlinedtext.vert
|
|
||||||
index 023f9dfdc2..4068e42f28 100644
|
|
||||||
--- a/src/quick/scenegraph/shaders_ng/outlinedtext.vert
|
|
||||||
+++ b/src/quick/scenegraph/shaders_ng/outlinedtext.vert
|
|
||||||
@@ -10,11 +10,12 @@ layout(location = 3) out vec2 sCoordLeft;
|
|
||||||
layout(location = 4) out vec2 sCoordRight;
|
|
||||||
|
|
||||||
layout(std140, binding = 0) uniform buf {
|
|
||||||
- // must match styledtext
|
|
||||||
- mat4 matrix;
|
|
||||||
+ mat4 modelViewMatrix;
|
|
||||||
+ mat4 projectionMatrix;
|
|
||||||
vec4 color;
|
|
||||||
vec2 textureScale;
|
|
||||||
float dpr;
|
|
||||||
+ // the above must stay compatible with textmask/8bittextmask
|
|
||||||
vec4 styleColor;
|
|
||||||
vec2 shift;
|
|
||||||
} ubuf;
|
|
||||||
@@ -28,6 +29,6 @@ void main()
|
|
||||||
sCoordDown = (tCoord - vec2(0.0, 1.0)) * ubuf.textureScale;
|
|
||||||
sCoordLeft = (tCoord - vec2(-1.0, 0.0)) * ubuf.textureScale;
|
|
||||||
sCoordRight = (tCoord - vec2(1.0, 0.0)) * ubuf.textureScale;
|
|
||||||
- vec3 dprSnapPos = floor(vCoord.xyz * ubuf.dpr + 0.5) / ubuf.dpr;
|
|
||||||
- gl_Position = ubuf.matrix * vec4(dprSnapPos, vCoord.w);
|
|
||||||
+ vec4 xformed = ubuf.modelViewMatrix * vCoord;
|
|
||||||
+ gl_Position = ubuf.projectionMatrix * vec4(floor(xformed.xyz * ubuf.dpr + 0.5) / ubuf.dpr, xformed.w);
|
|
||||||
}
|
|
||||||
diff --git a/src/quick/scenegraph/shaders_ng/outlinedtext_a.frag b/src/quick/scenegraph/shaders_ng/outlinedtext_a.frag
|
|
||||||
index 5b7bd9ca82..274d891a3c 100644
|
|
||||||
--- a/src/quick/scenegraph/shaders_ng/outlinedtext_a.frag
|
|
||||||
+++ b/src/quick/scenegraph/shaders_ng/outlinedtext_a.frag
|
|
||||||
@@ -11,11 +11,12 @@ layout(location = 0) out vec4 fragColor;
|
|
||||||
layout(binding = 1) uniform sampler2D _qt_texture;
|
|
||||||
|
|
||||||
layout(std140, binding = 0) uniform buf {
|
|
||||||
- // must match styledtext
|
|
||||||
- mat4 matrix;
|
|
||||||
+ mat4 modelViewMatrix;
|
|
||||||
+ mat4 projectionMatrix;
|
|
||||||
vec4 color;
|
|
||||||
vec2 textureScale;
|
|
||||||
float dpr;
|
|
||||||
+ // the above must stay compatible with textmask/8bittextmask
|
|
||||||
vec4 styleColor;
|
|
||||||
vec2 shift;
|
|
||||||
} ubuf;
|
|
||||||
diff --git a/src/quick/scenegraph/shaders_ng/styledtext.frag b/src/quick/scenegraph/shaders_ng/styledtext.frag
|
|
||||||
index 0b16396037..2e380dfeae 100644
|
|
||||||
--- a/src/quick/scenegraph/shaders_ng/styledtext.frag
|
|
||||||
+++ b/src/quick/scenegraph/shaders_ng/styledtext.frag
|
|
||||||
@@ -8,7 +8,8 @@ layout(location = 0) out vec4 fragColor;
|
|
||||||
layout(binding = 1) uniform sampler2D _qt_texture;
|
|
||||||
|
|
||||||
layout(std140, binding = 0) uniform buf {
|
|
||||||
- mat4 matrix;
|
|
||||||
+ mat4 modelViewMatrix;
|
|
||||||
+ mat4 projectionMatrix;
|
|
||||||
vec4 color;
|
|
||||||
vec2 textureScale;
|
|
||||||
float dpr;
|
|
||||||
diff --git a/src/quick/scenegraph/shaders_ng/styledtext.vert b/src/quick/scenegraph/shaders_ng/styledtext.vert
|
|
||||||
index beadf07c79..271dae8d8a 100644
|
|
||||||
--- a/src/quick/scenegraph/shaders_ng/styledtext.vert
|
|
||||||
+++ b/src/quick/scenegraph/shaders_ng/styledtext.vert
|
|
||||||
@@ -7,7 +7,8 @@ layout(location = 0) out vec2 sampleCoord;
|
|
||||||
layout(location = 1) out vec2 shiftedSampleCoord;
|
|
||||||
|
|
||||||
layout(std140, binding = 0) uniform buf {
|
|
||||||
- mat4 matrix;
|
|
||||||
+ mat4 modelViewMatrix;
|
|
||||||
+ mat4 projectionMatrix;
|
|
||||||
vec4 color;
|
|
||||||
vec2 textureScale;
|
|
||||||
float dpr;
|
|
||||||
@@ -22,6 +23,6 @@ void main()
|
|
||||||
{
|
|
||||||
sampleCoord = tCoord * ubuf.textureScale;
|
|
||||||
shiftedSampleCoord = (tCoord - ubuf.shift) * ubuf.textureScale;
|
|
||||||
- vec3 dprSnapPos = floor(vCoord.xyz * ubuf.dpr + 0.5) / ubuf.dpr;
|
|
||||||
- gl_Position = ubuf.matrix * vec4(dprSnapPos, vCoord.w);
|
|
||||||
+ vec4 xformed = ubuf.modelViewMatrix * vCoord;
|
|
||||||
+ gl_Position = ubuf.projectionMatrix * vec4(floor(xformed.xyz * ubuf.dpr + 0.5) / ubuf.dpr, xformed.w);
|
|
||||||
}
|
|
||||||
diff --git a/src/quick/scenegraph/shaders_ng/styledtext_a.frag b/src/quick/scenegraph/shaders_ng/styledtext_a.frag
|
|
||||||
index b673137895..62e162c851 100644
|
|
||||||
--- a/src/quick/scenegraph/shaders_ng/styledtext_a.frag
|
|
||||||
+++ b/src/quick/scenegraph/shaders_ng/styledtext_a.frag
|
|
||||||
@@ -8,7 +8,8 @@ layout(location = 0) out vec4 fragColor;
|
|
||||||
layout(binding = 1) uniform sampler2D _qt_texture;
|
|
||||||
|
|
||||||
layout(std140, binding = 0) uniform buf {
|
|
||||||
- mat4 matrix;
|
|
||||||
+ mat4 modelViewMatrix;
|
|
||||||
+ mat4 projectionMatrix;
|
|
||||||
vec4 color;
|
|
||||||
vec2 textureScale;
|
|
||||||
float dpr;
|
|
||||||
diff --git a/src/quick/scenegraph/shaders_ng/textmask.frag b/src/quick/scenegraph/shaders_ng/textmask.frag
|
|
||||||
index 518d5c965f..ed8da4cd30 100644
|
|
||||||
--- a/src/quick/scenegraph/shaders_ng/textmask.frag
|
|
||||||
+++ b/src/quick/scenegraph/shaders_ng/textmask.frag
|
|
||||||
@@ -6,7 +6,8 @@ layout(location = 0) out vec4 fragColor;
|
|
||||||
layout(binding = 1) uniform sampler2D _qt_texture;
|
|
||||||
|
|
||||||
layout(std140, binding = 0) uniform buf {
|
|
||||||
- mat4 matrix;
|
|
||||||
+ mat4 modelViewMatrix;
|
|
||||||
+ mat4 projectionMatrix;
|
|
||||||
vec4 color;
|
|
||||||
vec2 textureScale;
|
|
||||||
float dpr;
|
|
||||||
diff --git a/src/quick/scenegraph/shaders_ng/textmask.vert b/src/quick/scenegraph/shaders_ng/textmask.vert
|
|
||||||
index 9d80d5dadb..e0b3c01bce 100644
|
|
||||||
--- a/src/quick/scenegraph/shaders_ng/textmask.vert
|
|
||||||
+++ b/src/quick/scenegraph/shaders_ng/textmask.vert
|
|
||||||
@@ -6,7 +6,8 @@ layout(location = 1) in vec2 tCoord;
|
|
||||||
layout(location = 0) out vec2 sampleCoord;
|
|
||||||
|
|
||||||
layout(std140, binding = 0) uniform buf {
|
|
||||||
- mat4 matrix;
|
|
||||||
+ mat4 modelViewMatrix;
|
|
||||||
+ mat4 projectionMatrix;
|
|
||||||
vec4 color;
|
|
||||||
vec2 textureScale;
|
|
||||||
float dpr;
|
|
||||||
@@ -17,6 +18,6 @@ out gl_PerVertex { vec4 gl_Position; };
|
|
||||||
void main()
|
|
||||||
{
|
|
||||||
sampleCoord = tCoord * ubuf.textureScale;
|
|
||||||
- vec3 dprSnapPos = floor(vCoord.xyz * ubuf.dpr + 0.5) / ubuf.dpr;
|
|
||||||
- gl_Position = ubuf.matrix * vec4(dprSnapPos, vCoord.w);
|
|
||||||
+ vec4 xformed = ubuf.modelViewMatrix * vCoord;
|
|
||||||
+ gl_Position = ubuf.projectionMatrix * vec4(floor(xformed.xyz * ubuf.dpr + 0.5) / ubuf.dpr, xformed.w);
|
|
||||||
}
|
|
||||||
diff --git a/tests/manual/scenegraph_lancelot/data/text/text_nativerendering_subpixelpositions.qml b/tests/manual/scenegraph_lancelot/data/text/text_nativerendering_subpixelpositions.qml
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..c60fc4d8b0
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/manual/scenegraph_lancelot/data/text/text_nativerendering_subpixelpositions.qml
|
|
||||||
@@ -0,0 +1,91 @@
|
|
||||||
+import QtQuick 2.0
|
|
||||||
+
|
|
||||||
+//vary font style, native rendering at non-integer offsets
|
|
||||||
+
|
|
||||||
+Item {
|
|
||||||
+ id: topLevel
|
|
||||||
+ width: 320
|
|
||||||
+ height: 580
|
|
||||||
+
|
|
||||||
+ Repeater {
|
|
||||||
+ model: [Text.Normal, Text.Outline, Text.Raised, Text.Sunken]
|
|
||||||
+ Text {
|
|
||||||
+ y: 20 * index
|
|
||||||
+ clip: true
|
|
||||||
+ renderType: Text.NativeRendering
|
|
||||||
+ width: parent.width
|
|
||||||
+ wrapMode: Text.Wrap
|
|
||||||
+ font.pointSize: 10
|
|
||||||
+ style: modelData
|
|
||||||
+ styleColor: "green"
|
|
||||||
+ text: "The quick fox jumps in style " + modelData
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ Repeater {
|
|
||||||
+ model: [Text.Normal, Text.Outline, Text.Raised, Text.Sunken]
|
|
||||||
+ Text {
|
|
||||||
+ y: 100.5 + 20 * index
|
|
||||||
+ clip: true
|
|
||||||
+ renderType: Text.NativeRendering
|
|
||||||
+ width: parent.width
|
|
||||||
+ wrapMode: Text.Wrap
|
|
||||||
+ font.pointSize: 10
|
|
||||||
+ style: modelData
|
|
||||||
+ styleColor: "green"
|
|
||||||
+ text: "The quick fox jumps in style " + modelData
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ Repeater {
|
|
||||||
+ model: [Text.Normal, Text.Outline, Text.Raised, Text.Sunken]
|
|
||||||
+ Text {
|
|
||||||
+ y: 200.5 + 20 * index
|
|
||||||
+ x: 0.5
|
|
||||||
+ clip: true
|
|
||||||
+ renderType: Text.NativeRendering
|
|
||||||
+ width: parent.width
|
|
||||||
+ wrapMode: Text.Wrap
|
|
||||||
+ font.pointSize: 10
|
|
||||||
+ style: modelData
|
|
||||||
+ styleColor: "green"
|
|
||||||
+ text: "The quick fox jumps in style " + modelData
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ Repeater {
|
|
||||||
+ model: [Text.Normal, Text.Outline, Text.Raised, Text.Sunken]
|
|
||||||
+ Text {
|
|
||||||
+ y: 300.5 + 20 * index
|
|
||||||
+ x: 0.5
|
|
||||||
+ clip: true
|
|
||||||
+ renderType: Text.NativeRendering
|
|
||||||
+ width: parent.width
|
|
||||||
+ wrapMode: Text.Wrap
|
|
||||||
+ font.pointSize: 10
|
|
||||||
+ style: modelData
|
|
||||||
+ styleColor: "green"
|
|
||||||
+ text: "The quick fox jumps in style " + modelData
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ Repeater {
|
|
||||||
+ model: [Text.Normal, Text.Outline, Text.Raised, Text.Sunken]
|
|
||||||
+ Rectangle {
|
|
||||||
+ y: 400.5 + 20 * index
|
|
||||||
+ x: 0.5
|
|
||||||
+ width: topLevel.width
|
|
||||||
+ height: topLevel.height
|
|
||||||
+ clip: true
|
|
||||||
+ Text {
|
|
||||||
+ renderType: Text.NativeRendering
|
|
||||||
+ width: parent.width
|
|
||||||
+ wrapMode: Text.Wrap
|
|
||||||
+ font.pointSize: 10
|
|
||||||
+ style: modelData
|
|
||||||
+ styleColor: "green"
|
|
||||||
+ text: "The quick fox jumps in style " + modelData
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
@ -0,0 +1,46 @@
|
|||||||
|
From bdb3af04019b9134d6e815f4fe54317db63d0152 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Fushan Wen <qydwhotmail@gmail.com>
|
||||||
|
Date: Sat, 5 Nov 2022 01:44:30 +0800
|
||||||
|
Subject: [PATCH 10/19] Send ObjectShow event for visible components after
|
||||||
|
initialized
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Currently ObjectShow event is only sent when the visible property
|
||||||
|
changes from false to true, but for items with the notification
|
||||||
|
accessible role, a screen reader like Orca needs to receive an
|
||||||
|
ObjectShow event to read the notification, so also send the event after
|
||||||
|
a component is initialized.
|
||||||
|
|
||||||
|
See also: https://gitlab.gnome.org/GNOME/orca/-/merge_requests/134
|
||||||
|
|
||||||
|
Pick-to: 6.4
|
||||||
|
Change-Id: I626594b65ffe4d0582dcee9f489df0c2c63e53b7
|
||||||
|
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
|
||||||
|
(cherry picked from commit 9a4f2d23ecec2c7ff19f83cff28df6b97e3fda98)
|
||||||
|
---
|
||||||
|
src/quick/items/qquickitem.cpp | 7 +++++++
|
||||||
|
1 file changed, 7 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
|
||||||
|
index ec55fb2998..499fb61d1b 100644
|
||||||
|
--- a/src/quick/items/qquickitem.cpp
|
||||||
|
+++ b/src/quick/items/qquickitem.cpp
|
||||||
|
@@ -5125,6 +5125,13 @@ void QQuickItem::componentComplete()
|
||||||
|
d->addToDirtyList();
|
||||||
|
QQuickWindowPrivate::get(d->window)->dirtyItem(this);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+#if QT_CONFIG(accessibility)
|
||||||
|
+ if (d->isAccessible && d->effectiveVisible) {
|
||||||
|
+ QAccessibleEvent ev(this, QAccessible::ObjectShow);
|
||||||
|
+ QAccessible::updateAccessibility(&ev);
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
QQuickStateGroup *QQuickItemPrivate::_states()
|
||||||
|
--
|
||||||
|
2.40.0
|
||||||
|
|
||||||
113
0011-QQuickItem-avoid-emitting-signals-during-destruction.patch
Normal file
113
0011-QQuickItem-avoid-emitting-signals-during-destruction.patch
Normal file
@ -0,0 +1,113 @@
|
|||||||
|
From 19afcf36b92dc36e83b613e4b9ee383f6beb02dc Mon Sep 17 00:00:00 2001
|
||||||
|
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
||||||
|
Date: Wed, 9 Nov 2022 15:34:11 +0100
|
||||||
|
Subject: [PATCH 11/19] QQuickItem: avoid emitting signals during destruction
|
||||||
|
|
||||||
|
If a QQuickItem is in the QQuickItem destructor, then it is both unsafe
|
||||||
|
and unnecessary to emit property change notifications. Connected code
|
||||||
|
can no longer rely on the state of the emitting object - if it was
|
||||||
|
originally a subclass of QQuickItem, then those subclass destructors
|
||||||
|
will already have run. And the QQuickItem destructor will also have
|
||||||
|
partially run, leaving the object in an undefined state.
|
||||||
|
|
||||||
|
Add a flag that we set to true at the top of ~QQuickItem, and don't emit
|
||||||
|
visibleChildrenChanged, parentChanged, visibleChanged, and
|
||||||
|
childrenChanged for items that are partially destroyed already.
|
||||||
|
|
||||||
|
[ChangeLog][Qt Quick][QQuickItem] QQuickItem no longer emits change
|
||||||
|
notifications for the parent, children, visible, and visibleChildren
|
||||||
|
properties while it is being destroyed.
|
||||||
|
|
||||||
|
Task-number: QTBUG-107850
|
||||||
|
Change-Id: I36ea98842c89ad89fcc1c4a328d138f66f2a0446
|
||||||
|
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
||||||
|
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
||||||
|
(cherry picked from commit 74873324bdf3399753f9fcaf7461c0e00df628b1)
|
||||||
|
---
|
||||||
|
src/quick/items/qquickitem.cpp | 21 +++++++++++++--------
|
||||||
|
src/quick/items/qquickitem_p.h | 1 +
|
||||||
|
2 files changed, 14 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
|
||||||
|
index 499fb61d1b..5ee2a440a3 100644
|
||||||
|
--- a/src/quick/items/qquickitem.cpp
|
||||||
|
+++ b/src/quick/items/qquickitem.cpp
|
||||||
|
@@ -2327,6 +2327,7 @@ QQuickItem::QQuickItem(QQuickItemPrivate &dd, QQuickItem *parent)
|
||||||
|
QQuickItem::~QQuickItem()
|
||||||
|
{
|
||||||
|
Q_D(QQuickItem);
|
||||||
|
+ d->inDestructor = true;
|
||||||
|
|
||||||
|
if (d->windowRefCount > 1)
|
||||||
|
d->windowRefCount = 1; // Make sure window is set to null in next call to derefWindow().
|
||||||
|
@@ -2694,9 +2695,8 @@ void QQuickItem::setParentItem(QQuickItem *parentItem)
|
||||||
|
|
||||||
|
const bool wasVisible = isVisible();
|
||||||
|
op->removeChild(this);
|
||||||
|
- if (wasVisible) {
|
||||||
|
+ if (wasVisible && !op->inDestructor)
|
||||||
|
emit oldParentItem->visibleChildrenChanged();
|
||||||
|
- }
|
||||||
|
} else if (d->window) {
|
||||||
|
QQuickWindowPrivate::get(d->window)->parentlessItems.remove(this);
|
||||||
|
}
|
||||||
|
@@ -2773,8 +2773,9 @@ void QQuickItem::setParentItem(QQuickItem *parentItem)
|
||||||
|
|
||||||
|
d->itemChange(ItemParentHasChanged, d->parentItem);
|
||||||
|
|
||||||
|
- emit parentChanged(d->parentItem);
|
||||||
|
- if (isVisible() && d->parentItem)
|
||||||
|
+ if (!d->inDestructor)
|
||||||
|
+ emit parentChanged(d->parentItem);
|
||||||
|
+ if (isVisible() && d->parentItem && !QQuickItemPrivate::get(d->parentItem)->inDestructor)
|
||||||
|
emit d->parentItem->visibleChildrenChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2970,7 +2971,8 @@ void QQuickItemPrivate::removeChild(QQuickItem *child)
|
||||||
|
|
||||||
|
itemChange(QQuickItem::ItemChildRemovedChange, child);
|
||||||
|
|
||||||
|
- emit q->childrenChanged();
|
||||||
|
+ if (!inDestructor)
|
||||||
|
+ emit q->childrenChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
void QQuickItemPrivate::refWindow(QQuickWindow *c)
|
||||||
|
@@ -3199,6 +3201,7 @@ QQuickItemPrivate::QQuickItemPrivate()
|
||||||
|
, touchEnabled(false)
|
||||||
|
#endif
|
||||||
|
, hasCursorHandler(false)
|
||||||
|
+ , inDestructor(false)
|
||||||
|
, dirtyAttributes(0)
|
||||||
|
, nextDirtyItem(nullptr)
|
||||||
|
, prevDirtyItem(nullptr)
|
||||||
|
@@ -6118,9 +6121,11 @@ bool QQuickItemPrivate::setEffectiveVisibleRecur(bool newEffectiveVisible)
|
||||||
|
QAccessible::updateAccessibility(&ev);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
- emit q->visibleChanged();
|
||||||
|
- if (childVisibilityChanged)
|
||||||
|
- emit q->visibleChildrenChanged();
|
||||||
|
+ if (!inDestructor) {
|
||||||
|
+ emit q->visibleChanged();
|
||||||
|
+ if (childVisibilityChanged)
|
||||||
|
+ emit q->visibleChildrenChanged();
|
||||||
|
+ }
|
||||||
|
|
||||||
|
return true; // effective visibility DID change
|
||||||
|
}
|
||||||
|
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
|
||||||
|
index 841d91bb40..ade8fb61f2 100644
|
||||||
|
--- a/src/quick/items/qquickitem_p.h
|
||||||
|
+++ b/src/quick/items/qquickitem_p.h
|
||||||
|
@@ -472,6 +472,7 @@ public:
|
||||||
|
bool replayingPressEvent:1;
|
||||||
|
bool touchEnabled:1;
|
||||||
|
bool hasCursorHandler:1;
|
||||||
|
+ quint32 inDestructor:1; // has entered ~QQuickItem
|
||||||
|
|
||||||
|
enum DirtyType {
|
||||||
|
TransformOrigin = 0x00000001,
|
||||||
|
--
|
||||||
|
2.40.0
|
||||||
|
|
||||||
@ -1,71 +0,0 @@
|
|||||||
From ffa77919e72951c7accf84ad09dc669d166aedf8 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 11/20] Revert "Fix for possible crash in
|
|
||||||
QSGDefaultLayer::grab"
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
This reverts commit 1c5de027d0c31d1d6697bd0557128d92207763d8.
|
|
||||||
|
|
||||||
The fix here is not correct. Calling a QSGRhiLayer function from the gui
|
|
||||||
thread is very wrong and can cause a set of unexpected issues. The
|
|
||||||
Address Sanitizer catches this by recognizing that the render thread is
|
|
||||||
trying to do something with an object destroyed in the meantime on the
|
|
||||||
main thread in the layer->setItem(null) call.
|
|
||||||
|
|
||||||
The issue the original fix is trying to address needs to be addressed in
|
|
||||||
some different form.
|
|
||||||
|
|
||||||
Fixes: QTBUG-94975
|
|
||||||
Pick-to: 6.2 6.1 5.15
|
|
||||||
Change-Id: I46f904026281201fc6d233ed7d3bdc7080934afe
|
|
||||||
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
|
|
||||||
(cherry picked from commit a5f0361622eb08eab6c3474d5fc249d1962e3d1e)
|
|
||||||
---
|
|
||||||
src/quick/items/qquickshadereffectsource.cpp | 8 --------
|
|
||||||
src/quick/items/qquickshadereffectsource_p.h | 1 -
|
|
||||||
2 files changed, 9 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/quick/items/qquickshadereffectsource.cpp b/src/quick/items/qquickshadereffectsource.cpp
|
|
||||||
index 4f61d61309..b298ed74da 100644
|
|
||||||
--- a/src/quick/items/qquickshadereffectsource.cpp
|
|
||||||
+++ b/src/quick/items/qquickshadereffectsource.cpp
|
|
||||||
@@ -344,7 +344,6 @@ void QQuickShaderEffectSource::setSourceItem(QQuickItem *item)
|
|
||||||
d->refFromEffectItem(m_hideSource);
|
|
||||||
d->addItemChangeListener(this, QQuickItemPrivate::Geometry);
|
|
||||||
connect(m_sourceItem, SIGNAL(destroyed(QObject*)), this, SLOT(sourceItemDestroyed(QObject*)));
|
|
||||||
- connect(m_sourceItem, SIGNAL(parentChanged(QQuickItem*)), this, SLOT(sourceItemParentChanged(QQuickItem*)));
|
|
||||||
} else {
|
|
||||||
qWarning("ShaderEffectSource: sourceItem and ShaderEffectSource must both be children of the same window.");
|
|
||||||
m_sourceItem = nullptr;
|
|
||||||
@@ -364,13 +363,6 @@ void QQuickShaderEffectSource::sourceItemDestroyed(QObject *item)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
-void QQuickShaderEffectSource::sourceItemParentChanged(QQuickItem *parent)
|
|
||||||
-{
|
|
||||||
- if (!parent && m_texture)
|
|
||||||
- m_texture->setItem(0);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-
|
|
||||||
/*!
|
|
||||||
\qmlproperty rect QtQuick::ShaderEffectSource::sourceRect
|
|
||||||
|
|
||||||
diff --git a/src/quick/items/qquickshadereffectsource_p.h b/src/quick/items/qquickshadereffectsource_p.h
|
|
||||||
index 4deb6c70a3..c0a1ccab78 100644
|
|
||||||
--- a/src/quick/items/qquickshadereffectsource_p.h
|
|
||||||
+++ b/src/quick/items/qquickshadereffectsource_p.h
|
|
||||||
@@ -173,7 +173,6 @@ Q_SIGNALS:
|
|
||||||
private Q_SLOTS:
|
|
||||||
void sourceItemDestroyed(QObject *item);
|
|
||||||
void invalidateSceneGraph();
|
|
||||||
- void sourceItemParentChanged(QQuickItem *parent);
|
|
||||||
|
|
||||||
protected:
|
|
||||||
void releaseResources() override;
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
@ -1,58 +0,0 @@
|
|||||||
From c3804f86e0a75c0c8402127a5b01bc7a858e6492 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
||||||
Date: Wed, 17 Mar 2021 16:52:21 +0100
|
|
||||||
Subject: [PATCH 12/20] QQuickItemAnimation: close potential memory leak
|
|
||||||
|
|
||||||
Fix static analyzer warning bff6cb4333f531d5a72f7bf6dc1485f6.
|
|
||||||
|
|
||||||
If ownership of viaData is not passed to the viaAction, then the object
|
|
||||||
might be leaked. Use std::unique_ptr to make ownership transfer explicit
|
|
||||||
and implicitly delete unowned objects.
|
|
||||||
|
|
||||||
Pick-to: 6.1 5.15
|
|
||||||
Change-Id: I89f2a6b630941a98a74db302bc1ab08055c71974
|
|
||||||
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
||||||
(cherry picked from commit 78aea267209c34abeb4895712dc76c923aa46165)
|
|
||||||
---
|
|
||||||
src/quick/items/qquickitemanimation.cpp | 11 ++++-------
|
|
||||||
1 file changed, 4 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp
|
|
||||||
index 23694e2de3..dfb56ccc00 100644
|
|
||||||
--- a/src/quick/items/qquickitemanimation.cpp
|
|
||||||
+++ b/src/quick/items/qquickitemanimation.cpp
|
|
||||||
@@ -230,8 +230,8 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &act
|
|
||||||
{
|
|
||||||
Q_D(QQuickParentAnimation);
|
|
||||||
|
|
||||||
- QQuickParentAnimationData *data = new QQuickParentAnimationData;
|
|
||||||
- QQuickParentAnimationData *viaData = new QQuickParentAnimationData;
|
|
||||||
+ std::unique_ptr<QQuickParentAnimationData> data(new QQuickParentAnimationData);
|
|
||||||
+ std::unique_ptr<QQuickParentAnimationData> viaData(new QQuickParentAnimationData);
|
|
||||||
|
|
||||||
bool hasExplicit = false;
|
|
||||||
if (d->target && d->newParent) {
|
|
||||||
@@ -377,8 +377,8 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &act
|
|
||||||
QParallelAnimationGroupJob *ag = new QParallelAnimationGroupJob;
|
|
||||||
|
|
||||||
if (d->via)
|
|
||||||
- viaAction->setAnimAction(viaData);
|
|
||||||
- targetAction->setAnimAction(data);
|
|
||||||
+ viaAction->setAnimAction(viaData.release());
|
|
||||||
+ targetAction->setAnimAction(data.release());
|
|
||||||
|
|
||||||
//take care of any child animations
|
|
||||||
bool valid = d->defaultProperty.isValid();
|
|
||||||
@@ -405,9 +405,6 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &act
|
|
||||||
topLevelGroup->appendAnimation(d->via ? viaAction : targetAction);
|
|
||||||
}
|
|
||||||
return initInstance(topLevelGroup);
|
|
||||||
- } else {
|
|
||||||
- delete data;
|
|
||||||
- delete viaData;
|
|
||||||
}
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
57
0012-a11y-track-item-enabled-state.patch
Normal file
57
0012-a11y-track-item-enabled-state.patch
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
From 5ed173f4ba070bca6c9ec3335b84cc322885b01d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Harald Sitter <sitter@kde.org>
|
||||||
|
Date: Mon, 28 Nov 2022 14:59:33 +0100
|
||||||
|
Subject: [PATCH 12/19] a11y: track item enabled state
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
disabled items are neither enabled nor focusable
|
||||||
|
|
||||||
|
Change-Id: I4f286c7b85605d5ad6fa787d1f5cfcce1297d268
|
||||||
|
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
||||||
|
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
|
||||||
|
(cherry picked from commit 20fd2902a6d7bdb4a3306005d2718ca5a8fef96d)
|
||||||
|
---
|
||||||
|
src/quick/accessible/qaccessiblequickitem.cpp | 4 ++++
|
||||||
|
src/quick/items/qquickitem.cpp | 9 +++++++++
|
||||||
|
2 files changed, 13 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp
|
||||||
|
index 0692ce634d..a8df58d450 100644
|
||||||
|
--- a/src/quick/accessible/qaccessiblequickitem.cpp
|
||||||
|
+++ b/src/quick/accessible/qaccessiblequickitem.cpp
|
||||||
|
@@ -215,6 +215,10 @@ QAccessible::State QAccessibleQuickItem::state() const
|
||||||
|
if (role() == QAccessible::EditableText)
|
||||||
|
if (auto ti = qobject_cast<QQuickTextInput *>(item()))
|
||||||
|
state.passwordEdit = ti->echoMode() != QQuickTextInput::Normal;
|
||||||
|
+ if (!item()->isEnabled()) {
|
||||||
|
+ state.focusable = false;
|
||||||
|
+ state.disabled = true;
|
||||||
|
+ }
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
|
||||||
|
index 5ee2a440a3..c370d6e5c3 100644
|
||||||
|
--- a/src/quick/items/qquickitem.cpp
|
||||||
|
+++ b/src/quick/items/qquickitem.cpp
|
||||||
|
@@ -6174,6 +6174,15 @@ void QQuickItemPrivate::setEffectiveEnableRecur(QQuickItem *scope, bool newEffec
|
||||||
|
}
|
||||||
|
|
||||||
|
itemChange(QQuickItem::ItemEnabledHasChanged, effectiveEnable);
|
||||||
|
+#if QT_CONFIG(accessibility)
|
||||||
|
+ if (isAccessible) {
|
||||||
|
+ QAccessible::State changedState;
|
||||||
|
+ changedState.disabled = true;
|
||||||
|
+ changedState.focusable = true;
|
||||||
|
+ QAccessibleStateChangeEvent ev(q, changedState);
|
||||||
|
+ QAccessible::updateAccessibility(&ev);
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
emit q->enabledChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.40.0
|
||||||
|
|
||||||
87
0013-Make-QaccessibleQuickWidget-private-API.patch
Normal file
87
0013-Make-QaccessibleQuickWidget-private-API.patch
Normal file
@ -0,0 +1,87 @@
|
|||||||
|
From a8fa6c930597b633367777044f4c0328012f6bd5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Fabian Kosmale <fabian.kosmale@qt.io>
|
||||||
|
Date: Tue, 1 Jun 2021 16:40:44 +0200
|
||||||
|
Subject: [PATCH 13/19] Make QaccessibleQuickWidget private API
|
||||||
|
|
||||||
|
Its base class is private API, so it should be private API, too.
|
||||||
|
|
||||||
|
Change-Id: Ic80f841fee19ed0305c60ad5f8e9349a05f09e5e
|
||||||
|
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
||||||
|
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
||||||
|
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
||||||
|
(cherry picked from commit a4fa74d3e7581cb5c6bb82223ee17257f66fa41d)
|
||||||
|
---
|
||||||
|
src/quickwidgets/qaccessiblequickwidget.cpp | 2 +-
|
||||||
|
...ssiblequickwidget.h => qaccessiblequickwidget_p.h} | 11 +++++++++++
|
||||||
|
src/quickwidgets/qaccessiblequickwidgetfactory.cpp | 2 +-
|
||||||
|
src/quickwidgets/quickwidgets.pro | 2 +-
|
||||||
|
4 files changed, 14 insertions(+), 3 deletions(-)
|
||||||
|
rename src/quickwidgets/{qaccessiblequickwidget.h => qaccessiblequickwidget_p.h} (92%)
|
||||||
|
|
||||||
|
diff --git a/src/quickwidgets/qaccessiblequickwidget.cpp b/src/quickwidgets/qaccessiblequickwidget.cpp
|
||||||
|
index 6f04d6693f..8a1c901880 100644
|
||||||
|
--- a/src/quickwidgets/qaccessiblequickwidget.cpp
|
||||||
|
+++ b/src/quickwidgets/qaccessiblequickwidget.cpp
|
||||||
|
@@ -37,7 +37,7 @@
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
-#include "qaccessiblequickwidget.h"
|
||||||
|
+#include "qaccessiblequickwidget_p.h"
|
||||||
|
|
||||||
|
#include "qquickwidget_p.h"
|
||||||
|
|
||||||
|
diff --git a/src/quickwidgets/qaccessiblequickwidget.h b/src/quickwidgets/qaccessiblequickwidget_p.h
|
||||||
|
similarity index 92%
|
||||||
|
rename from src/quickwidgets/qaccessiblequickwidget.h
|
||||||
|
rename to src/quickwidgets/qaccessiblequickwidget_p.h
|
||||||
|
index 1f52c78c46..7c2ab930e0 100644
|
||||||
|
--- a/src/quickwidgets/qaccessiblequickwidget.h
|
||||||
|
+++ b/src/quickwidgets/qaccessiblequickwidget_p.h
|
||||||
|
@@ -40,6 +40,17 @@
|
||||||
|
#ifndef QACCESSIBLEQUICKWIDGET_H
|
||||||
|
#define QACCESSIBLEQUICKWIDGET_H
|
||||||
|
|
||||||
|
+//
|
||||||
|
+// W A R N I N G
|
||||||
|
+// -------------
|
||||||
|
+//
|
||||||
|
+// This file is not part of the Qt API. It exists purely as an
|
||||||
|
+// implementation detail. This header file may change from version to
|
||||||
|
+// version without notice, or even be removed.
|
||||||
|
+//
|
||||||
|
+// We mean it.
|
||||||
|
+//
|
||||||
|
+
|
||||||
|
#include "qquickwidget.h"
|
||||||
|
#include <QtWidgets/qaccessiblewidget.h>
|
||||||
|
|
||||||
|
diff --git a/src/quickwidgets/qaccessiblequickwidgetfactory.cpp b/src/quickwidgets/qaccessiblequickwidgetfactory.cpp
|
||||||
|
index 3756d0c27c..7ba88a1769 100644
|
||||||
|
--- a/src/quickwidgets/qaccessiblequickwidgetfactory.cpp
|
||||||
|
+++ b/src/quickwidgets/qaccessiblequickwidgetfactory.cpp
|
||||||
|
@@ -38,7 +38,7 @@
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include "qaccessiblequickwidgetfactory_p.h"
|
||||||
|
-#include "qaccessiblequickwidget.h"
|
||||||
|
+#include "qaccessiblequickwidget_p.h"
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
diff --git a/src/quickwidgets/quickwidgets.pro b/src/quickwidgets/quickwidgets.pro
|
||||||
|
index f46deb54ac..85d156b8a3 100644
|
||||||
|
--- a/src/quickwidgets/quickwidgets.pro
|
||||||
|
+++ b/src/quickwidgets/quickwidgets.pro
|
||||||
|
@@ -8,7 +8,7 @@ HEADERS += \
|
||||||
|
qquickwidget.h \
|
||||||
|
qquickwidget_p.h \
|
||||||
|
qtquickwidgetsglobal.h \
|
||||||
|
- qaccessiblequickwidget.h \
|
||||||
|
+ qaccessiblequickwidget_p.h \
|
||||||
|
qaccessiblequickwidgetfactory_p.h
|
||||||
|
|
||||||
|
SOURCES += \
|
||||||
|
--
|
||||||
|
2.40.0
|
||||||
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
From 44ac7f39d874202163926f505a46179c084154b9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Maximilian Goldstein <max.goldstein@qt.io>
|
|
||||||
Date: Tue, 23 Feb 2021 16:10:44 +0100
|
|
||||||
Subject: [PATCH 13/20] qqmldelegatemodel: Fix out of bounds cache removal
|
|
||||||
|
|
||||||
Pick-to: 5.15 6.0 6.1
|
|
||||||
Task-number: QTBUG-91276
|
|
||||||
Change-Id: I1ddbb4a3326d61ff94e3881beb64a14dade11c46
|
|
||||||
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
||||||
(cherry picked from commit 31ad81d81e623a34cd71567b9507f16601f1c1d4)
|
|
||||||
---
|
|
||||||
src/qmlmodels/qqmldelegatemodel.cpp | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp
|
|
||||||
index 381726291d..53e511303e 100644
|
|
||||||
--- a/src/qmlmodels/qqmldelegatemodel.cpp
|
|
||||||
+++ b/src/qmlmodels/qqmldelegatemodel.cpp
|
|
||||||
@@ -1621,7 +1621,7 @@ void QQmlDelegateModelPrivate::itemsRemoved(
|
|
||||||
removed[i] = 0;
|
|
||||||
|
|
||||||
for (const Compositor::Remove &remove : removes) {
|
|
||||||
- for (; cacheIndex < remove.cacheIndex; ++cacheIndex)
|
|
||||||
+ for (; cacheIndex < remove.cacheIndex && cacheIndex < m_cache.size(); ++cacheIndex)
|
|
||||||
incrementIndexes(m_cache.at(cacheIndex), m_groupCount, removed);
|
|
||||||
|
|
||||||
for (int i = 1; i < m_groupCount; ++i) {
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
From f8f6b9d084decbad8ee90880493c413ac90c2911 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Andreas Hartmetz <andreas@ixgreen.de>
|
|
||||||
Date: Fri, 5 Mar 2021 12:41:06 +0100
|
|
||||||
Subject: [PATCH 14/20] QQuickWindow: don't leak old screenChanged connections
|
|
||||||
|
|
||||||
Connections could accumulate. Because the newest one was invoked
|
|
||||||
last due to how signal-slot invocations are ordered, rendering
|
|
||||||
was correct, but the stale connections caused unnecessary updates
|
|
||||||
(and wasted a small amount of memory).
|
|
||||||
This comes from a misunderstanding I had at the time about how
|
|
||||||
QMetaObject::Connection works. Destroying or overwriting one does
|
|
||||||
not affect the actual connection.
|
|
||||||
|
|
||||||
While at it, also modernize the connect().
|
|
||||||
|
|
||||||
Pick-to: 5.15 6.0 6.1
|
|
||||||
Change-Id: Idde81bdbff8947ed517bf2740d623a395c0acb74
|
|
||||||
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
||||||
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
||||||
(cherry picked from commit 9f8292d48913c5bc50377749c2b3e030cf16d703)
|
|
||||||
---
|
|
||||||
src/quick/items/qquickwindow.cpp | 7 +++----
|
|
||||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
|
|
||||||
index eea1e93f32..c956c85091 100644
|
|
||||||
--- a/src/quick/items/qquickwindow.cpp
|
|
||||||
+++ b/src/quick/items/qquickwindow.cpp
|
|
||||||
@@ -450,15 +450,14 @@ void QQuickWindow::physicalDpiChanged()
|
|
||||||
void QQuickWindow::handleScreenChanged(QScreen *screen)
|
|
||||||
{
|
|
||||||
Q_D(QQuickWindow);
|
|
||||||
+ disconnect(d->physicalDpiChangedConnection);
|
|
||||||
if (screen) {
|
|
||||||
physicalDpiChanged();
|
|
||||||
// When physical DPI changes on the same screen, either the resolution or the device pixel
|
|
||||||
// ratio changed. We must check what it is. Device pixel ratio does not have its own
|
|
||||||
// ...Changed() signal.
|
|
||||||
- d->physicalDpiChangedConnection = connect(screen, SIGNAL(physicalDotsPerInchChanged(qreal)),
|
|
||||||
- this, SLOT(physicalDpiChanged()));
|
|
||||||
- } else {
|
|
||||||
- disconnect(d->physicalDpiChangedConnection);
|
|
||||||
+ d->physicalDpiChangedConnection = connect(screen, &QScreen::physicalDotsPerInchChanged,
|
|
||||||
+ this, &QQuickWindow::physicalDpiChanged);
|
|
||||||
}
|
|
||||||
|
|
||||||
d->forcePolish();
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
113
0014-Qml-Don-t-crash-when-as-casting-to-type-with-errors.patch
Normal file
113
0014-Qml-Don-t-crash-when-as-casting-to-type-with-errors.patch
Normal file
@ -0,0 +1,113 @@
|
|||||||
|
From 7be5422134167fe6d9fd44ef683f407bbda1bce7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ulf Hermann <ulf.hermann@qt.io>
|
||||||
|
Date: Tue, 30 Nov 2021 14:39:48 +0100
|
||||||
|
Subject: [PATCH 14/19] 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.
|
||||||
|
|
||||||
|
Pick-to: 6.2
|
||||||
|
Fixes: QTBUG-98792
|
||||||
|
Change-Id: I2db8dea3a5a02ec1492f7f7a054fd3ad4c6ad69a
|
||||||
|
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
||||||
|
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
||||||
|
(cherry picked from commit e0cd201e91ae64b9c03e0128cd17656b00611fbb)
|
||||||
|
---
|
||||||
|
src/qml/qml/qqmltypewrapper.cpp | 6 ++++--
|
||||||
|
src/qml/types/qqmlconnections.cpp | 2 +-
|
||||||
|
tests/auto/qml/qqmllanguage/data/Broken.qml | 5 +++++
|
||||||
|
tests/auto/qml/qqmllanguage/data/asBroken.qml | 6 ++++++
|
||||||
|
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 16 ++++++++++++++++
|
||||||
|
5 files changed, 32 insertions(+), 3 deletions(-)
|
||||||
|
create mode 100644 tests/auto/qml/qqmllanguage/data/Broken.qml
|
||||||
|
create mode 100644 tests/auto/qml/qqmllanguage/data/asBroken.qml
|
||||||
|
|
||||||
|
diff --git a/src/qml/qml/qqmltypewrapper.cpp b/src/qml/qml/qqmltypewrapper.cpp
|
||||||
|
index 175de8b936..a6ba4b8cb3 100644
|
||||||
|
--- a/src/qml/qml/qqmltypewrapper.cpp
|
||||||
|
+++ b/src/qml/qml/qqmltypewrapper.cpp
|
||||||
|
@@ -419,8 +419,10 @@ ReturnedValue QQmlTypeWrapper::virtualInstanceOf(const Object *typeObject, const
|
||||||
|
return Encode(false);
|
||||||
|
|
||||||
|
QQmlRefPointer<QQmlTypeData> td = qenginepriv->typeLoader.getType(typeWrapper->d()->type().sourceUrl());
|
||||||
|
- ExecutableCompilationUnit *cu = td->compilationUnit();
|
||||||
|
- myQmlType = qenginepriv->metaObjectForType(cu->metaTypeId);
|
||||||
|
+ if (ExecutableCompilationUnit *cu = td->compilationUnit())
|
||||||
|
+ myQmlType = qenginepriv->metaObjectForType(cu->metaTypeId);
|
||||||
|
+ else
|
||||||
|
+ return Encode(false); // It seems myQmlType has some errors, so we could not compile it.
|
||||||
|
} else {
|
||||||
|
myQmlType = qenginepriv->metaObjectForType(myTypeId);
|
||||||
|
}
|
||||||
|
diff --git a/src/qml/types/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp
|
||||||
|
index 29ed62cd39..aba930dfe1 100644
|
||||||
|
--- a/src/qml/types/qqmlconnections.cpp
|
||||||
|
+++ b/src/qml/types/qqmlconnections.cpp
|
||||||
|
@@ -338,7 +338,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 "
|
||||||
|
- "signal of the target matches the name.").arg(propName);
|
||||||
|
+ "signal of the \"%2\" target matches the name.").arg(propName).arg(target->metaObject()->className());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff --git a/tests/auto/qml/qqmllanguage/data/Broken.qml b/tests/auto/qml/qqmllanguage/data/Broken.qml
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..e24d9112a8
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/tests/auto/qml/qqmllanguage/data/Broken.qml
|
||||||
|
@@ -0,0 +1,5 @@
|
||||||
|
+import QtQml 2.15
|
||||||
|
+
|
||||||
|
+QtObject {
|
||||||
|
+ notThere: 5
|
||||||
|
+}
|
||||||
|
diff --git a/tests/auto/qml/qqmllanguage/data/asBroken.qml b/tests/auto/qml/qqmllanguage/data/asBroken.qml
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..bd88d14c76
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/tests/auto/qml/qqmllanguage/data/asBroken.qml
|
||||||
|
@@ -0,0 +1,6 @@
|
||||||
|
+import QtQml 2.15
|
||||||
|
+
|
||||||
|
+QtObject {
|
||||||
|
+ id: self
|
||||||
|
+ 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
|
||||||
|
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
|
||||||
|
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
|
||||||
|
@@ -336,6 +336,7 @@ private slots:
|
||||||
|
void bareInlineComponent();
|
||||||
|
|
||||||
|
void hangOnWarning();
|
||||||
|
+ void objectAsBroken();
|
||||||
|
|
||||||
|
void ambiguousContainingType();
|
||||||
|
|
||||||
|
@@ -5876,6 +5877,21 @@ void tst_qqmllanguage::ambiguousContainingType()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+void tst_qqmllanguage::objectAsBroken()
|
||||||
|
+{
|
||||||
|
+ QQmlEngine engine;
|
||||||
|
+ QQmlComponent c(&engine, testFileUrl("asBroken.qml"));
|
||||||
|
+ QVERIFY2(c.isReady(), qPrintable(c.errorString()));
|
||||||
|
+ QScopedPointer<QObject> o(c.create());
|
||||||
|
+ QVERIFY(!o.isNull());
|
||||||
|
+ QVariant selfAsBroken = o->property("selfAsBroken");
|
||||||
|
+ QVERIFY(selfAsBroken.isValid());
|
||||||
|
+ // QCOMPARE(selfAsBroken.metaType(), QMetaType::fromType<std::nullptr_t>());
|
||||||
|
+
|
||||||
|
+ QQmlComponent b(&engine, testFileUrl("Broken.qml"));
|
||||||
|
+ QVERIFY(b.isError());
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
QTEST_MAIN(tst_qqmllanguage)
|
||||||
|
|
||||||
|
#include "tst_qqmllanguage.moc"
|
||||||
|
--
|
||||||
|
2.40.0
|
||||||
|
|
||||||
54
0015-Fix-missing-glyphs-when-using-NativeRendering.patch
Normal file
54
0015-Fix-missing-glyphs-when-using-NativeRendering.patch
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
From d54b978c0cba2bf75e145c9e1b00d2a9ab495d70 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
||||||
|
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 <qt_ci_bot@qt-project.org>
|
||||||
|
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
|
||||||
|
(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; i<glyphIndexes.size(); ++i) {
|
||||||
|
QPointF glyphPosition = glyphPositions.at(i) + position;
|
||||||
|
+ QFixedPoint fixedPointPosition = fixedPointPositions.at(i);
|
||||||
|
+
|
||||||
|
QFixed subPixelPosition;
|
||||||
|
if (supportsSubPixelPositions)
|
||||||
|
- subPixelPosition = fontD->fontEngine->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
|
||||||
|
|
||||||
@ -0,0 +1,32 @@
|
|||||||
|
From 70b44dd18b9727e9aae857297265a751700a297e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Fushan Wen <qydwhotmail@gmail.com>
|
||||||
|
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; i<glyphIndexes.size(); ++i) {
|
||||||
|
QPointF glyphPosition = glyphPositions.at(i) + position;
|
||||||
|
- QFixedPoint fixedPointPosition = fixedPointPositions.at(i);
|
||||||
|
-
|
||||||
|
QFixed subPixelPosition;
|
||||||
|
if (supportsSubPixelPositions)
|
||||||
|
- subPixelPosition = fontD->fontEngine->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
|
||||||
|
|
||||||
@ -0,0 +1,57 @@
|
|||||||
|
From c1e41d061329cc886a56477c8c2fd0e81add7780 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jaeyoon Jung <jaeyoon.jung@lge.com>
|
||||||
|
Date: Fri, 19 Feb 2021 08:11:57 +0900
|
||||||
|
Subject: [PATCH 17/19] QQmlImportDatabase: Make sure the newly added import
|
||||||
|
path be first
|
||||||
|
|
||||||
|
If it already exists in the import list, move it to the first place.
|
||||||
|
This is as per the description of QQmlEngine::addImportPath:
|
||||||
|
| The newly added path will be first in the importPathList().
|
||||||
|
|
||||||
|
Change-Id: I782d355c46ada2a46cff72e63326208f39028e01
|
||||||
|
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
||||||
|
(cherry picked from commit 3e413803c698d21f398daf0450c8f501204eb167)
|
||||||
|
---
|
||||||
|
src/qml/qml/qqmlimport.cpp | 9 ++++++---
|
||||||
|
tests/auto/qml/qqmlimport/tst_qqmlimport.cpp | 5 +++++
|
||||||
|
2 files changed, 11 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
|
||||||
|
index 10c6c41338..39bfcdc999 100644
|
||||||
|
--- a/src/qml/qml/qqmlimport.cpp
|
||||||
|
+++ b/src/qml/qml/qqmlimport.cpp
|
||||||
|
@@ -2120,9 +2120,12 @@ void QQmlImportDatabase::addImportPath(const QString& path)
|
||||||
|
cPath.replace(Backslash, Slash);
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (!cPath.isEmpty()
|
||||||
|
- && !fileImportPath.contains(cPath))
|
||||||
|
- fileImportPath.prepend(cPath);
|
||||||
|
+ if (!cPath.isEmpty()) {
|
||||||
|
+ if (fileImportPath.contains(cPath))
|
||||||
|
+ fileImportPath.move(fileImportPath.indexOf(cPath), 0);
|
||||||
|
+ else
|
||||||
|
+ fileImportPath.prepend(cPath);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
diff --git a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
|
||||||
|
index 9c865b3f73..1f788f7a7f 100644
|
||||||
|
--- a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
|
||||||
|
+++ b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
|
||||||
|
@@ -154,6 +154,11 @@ void tst_QQmlImport::importPathOrder()
|
||||||
|
engine.addImportPath(QT_QMLTEST_DATADIR);
|
||||||
|
expectedImportPaths.prepend(QT_QMLTEST_DATADIR);
|
||||||
|
QCOMPARE(expectedImportPaths, engine.importPathList());
|
||||||
|
+
|
||||||
|
+ // Add qml2Imports again to make it the first of the list
|
||||||
|
+ engine.addImportPath(qml2Imports);
|
||||||
|
+ expectedImportPaths.move(expectedImportPaths.indexOf(qml2Imports), 0);
|
||||||
|
+ QCOMPARE(expectedImportPaths, engine.importPathList());
|
||||||
|
}
|
||||||
|
|
||||||
|
Q_DECLARE_METATYPE(QQmlImports::ImportVersion)
|
||||||
|
--
|
||||||
|
2.40.0
|
||||||
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
From c6e595e7fbbe80c8db7ae33d8af05a4fd946a2f5 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 17/20] QQmlJs::FixedPoolArray: fix UB (precondition violation)
|
|
||||||
in allocate()
|
|
||||||
|
|
||||||
Says ubsan:
|
|
||||||
|
|
||||||
qqmljsfixedpoolarray_p.h:90:19: runtime error: null pointer passed as argument 2, which is declared to never be null
|
|
||||||
|
|
||||||
Fix, like in so many other places, by a size check.
|
|
||||||
|
|
||||||
Pick-to: 6.3 6.2 5.15
|
|
||||||
Change-Id: I9181d6ecb467c2dc726978ce7f93b35a6bf2f944
|
|
||||||
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
||||||
(cherry picked from commit d74e931f3fc2587ac6d1e2930acbbe54ea5be2b5)
|
|
||||||
---
|
|
||||||
src/qml/common/qqmljsfixedpoolarray_p.h | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/qml/common/qqmljsfixedpoolarray_p.h b/src/qml/common/qqmljsfixedpoolarray_p.h
|
|
||||||
index b65b994d6c..15a8cd6878 100644
|
|
||||||
--- a/src/qml/common/qqmljsfixedpoolarray_p.h
|
|
||||||
+++ b/src/qml/common/qqmljsfixedpoolarray_p.h
|
|
||||||
@@ -86,7 +86,7 @@ public:
|
|
||||||
if (QTypeInfo<T>::isComplex) {
|
|
||||||
for (int i = 0; i < count; ++i)
|
|
||||||
new (data + i) T(vector.at(i));
|
|
||||||
- } else {
|
|
||||||
+ } else if (count) {
|
|
||||||
memcpy(data, static_cast<const void*>(vector.constData()), count * sizeof(T));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
102
0018-QQuickState-when-handle-QJSValue-properties-correctl.patch
Normal file
102
0018-QQuickState-when-handle-QJSValue-properties-correctl.patch
Normal file
@ -0,0 +1,102 @@
|
|||||||
|
From 0e1bed3c3e27d44d86d6f68a8b93b96a4821575c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Fabian Kosmale <fabian.kosmale@qt.io>
|
||||||
|
Date: Wed, 20 Jul 2022 11:44:43 +0200
|
||||||
|
Subject: [PATCH 18/19] QQuickState::when: handle QJSValue properties correctly
|
||||||
|
|
||||||
|
If one assigns a binding whose evaluation results in a QJSValue, care
|
||||||
|
must be take to correctly convert it into a bool. Instead of directly
|
||||||
|
using QVariant::value<bool>, one needs to first extract the QJSValue,
|
||||||
|
and only convert it to bool afterwards.
|
||||||
|
This is necessary due to the custom binding evaluation we're doing to
|
||||||
|
avoid state oscillation.
|
||||||
|
Amends a8c729d83979fb0b9939044d246e73b1d578e65b.
|
||||||
|
|
||||||
|
Fixes: QTBUG-105000
|
||||||
|
Pick-to: 6.4 6.3 6.2 5.15
|
||||||
|
Change-Id: I4b093b48edecf9e0f09d2b54d10c2ff527f24ac3
|
||||||
|
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
||||||
|
(cherry picked from commit 2c31d25a44b1221c151681e1bb68ef78618e0166)
|
||||||
|
---
|
||||||
|
src/quick/util/qquickstategroup.cpp | 10 ++++++++--
|
||||||
|
.../quick/qquickstates/data/jsValueWhen.qml | 18 ++++++++++++++++++
|
||||||
|
.../quick/qquickstates/tst_qquickstates.cpp | 11 +++++++++++
|
||||||
|
3 files changed, 37 insertions(+), 2 deletions(-)
|
||||||
|
create mode 100644 tests/auto/quick/qquickstates/data/jsValueWhen.qml
|
||||||
|
|
||||||
|
diff --git a/src/quick/util/qquickstategroup.cpp b/src/quick/util/qquickstategroup.cpp
|
||||||
|
index 7cb3138618..f732b1eb4a 100644
|
||||||
|
--- a/src/quick/util/qquickstategroup.cpp
|
||||||
|
+++ b/src/quick/util/qquickstategroup.cpp
|
||||||
|
@@ -381,8 +381,14 @@ bool QQuickStateGroupPrivate::updateAutoState()
|
||||||
|
const auto potentialWhenBinding = QQmlPropertyPrivate::binding(whenProp);
|
||||||
|
// if there is a binding, the value in when might not be up-to-date at this point
|
||||||
|
// so we manually reevaluate the binding
|
||||||
|
- if (auto abstractBinding = dynamic_cast<QQmlBinding *>(potentialWhenBinding))
|
||||||
|
- whenValue = abstractBinding->evaluate().toBool();
|
||||||
|
+ if (auto abstractBinding = dynamic_cast<QQmlBinding *>(potentialWhenBinding)) {
|
||||||
|
+ QVariant evalResult = abstractBinding->evaluate();
|
||||||
|
+ if (evalResult.userType() == qMetaTypeId<QJSValue>())
|
||||||
|
+ whenValue = evalResult.value<QJSValue>().toBool();
|
||||||
|
+ else
|
||||||
|
+ whenValue = evalResult.toBool();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (whenValue) {
|
||||||
|
if (stateChangeDebug())
|
||||||
|
qWarning() << "Setting auto state due to expression";
|
||||||
|
diff --git a/tests/auto/quick/qquickstates/data/jsValueWhen.qml b/tests/auto/quick/qquickstates/data/jsValueWhen.qml
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..6d5eb1600c
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/tests/auto/quick/qquickstates/data/jsValueWhen.qml
|
||||||
|
@@ -0,0 +1,18 @@
|
||||||
|
+import QtQuick 2.15
|
||||||
|
+
|
||||||
|
+Item {
|
||||||
|
+ id: root
|
||||||
|
+ property var prop: null
|
||||||
|
+ property bool works: false
|
||||||
|
+ states: [
|
||||||
|
+ State {
|
||||||
|
+ name: "mystate"
|
||||||
|
+ when: root.prop
|
||||||
|
+ PropertyChanges {
|
||||||
|
+ target: root
|
||||||
|
+ works: "works"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+ Component.onCompleted: root.prop = new Object
|
||||||
|
+}
|
||||||
|
diff --git a/tests/auto/quick/qquickstates/tst_qquickstates.cpp b/tests/auto/quick/qquickstates/tst_qquickstates.cpp
|
||||||
|
index aa55b42935..26e86672b0 100644
|
||||||
|
--- a/tests/auto/quick/qquickstates/tst_qquickstates.cpp
|
||||||
|
+++ b/tests/auto/quick/qquickstates/tst_qquickstates.cpp
|
||||||
|
@@ -188,6 +188,7 @@ private slots:
|
||||||
|
void revertListMemoryLeak();
|
||||||
|
void duplicateStateName();
|
||||||
|
void trivialWhen();
|
||||||
|
+ void jsValueWhen();
|
||||||
|
void noStateOsciallation();
|
||||||
|
void parentChangeCorrectReversal();
|
||||||
|
void revertNullObjectBinding();
|
||||||
|
@@ -1734,6 +1735,16 @@ void tst_qquickstates::trivialWhen()
|
||||||
|
QVERIFY(c.create());
|
||||||
|
}
|
||||||
|
|
||||||
|
+void tst_qquickstates::jsValueWhen()
|
||||||
|
+{
|
||||||
|
+ QQmlEngine engine;
|
||||||
|
+
|
||||||
|
+ QQmlComponent c(&engine, testFileUrl("jsValueWhen.qml"));
|
||||||
|
+ QScopedPointer<QObject> root(c.create());
|
||||||
|
+ QVERIFY(root);
|
||||||
|
+ QVERIFY(root->property("works").toBool());
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void tst_qquickstates::noStateOsciallation()
|
||||||
|
{
|
||||||
|
QQmlEngine engine;
|
||||||
|
--
|
||||||
|
2.40.0
|
||||||
|
|
||||||
@ -1,138 +0,0 @@
|
|||||||
From 9bb03b5dcc21275986df3d8b0efb6f28cdc583ec Mon Sep 17 00:00:00 2001
|
|
||||||
From: Wang Chuan <ouchuanm@outlook.com>
|
|
||||||
Date: Mon, 5 Apr 2021 11:41:48 +0800
|
|
||||||
Subject: [PATCH 18/20] QQuickTextInput: update cursor rectangle after padding
|
|
||||||
changed
|
|
||||||
|
|
||||||
The position of cursor delegate needs to be updated when we change
|
|
||||||
padding, otherwise it will be in a wrong position.
|
|
||||||
|
|
||||||
Fixes: QTBUG-91867
|
|
||||||
Pick-to: 5.12 5.15 6.0 6.1
|
|
||||||
Change-Id: I89ca84fe893ebf517ab67890196eede14a4055d7
|
|
||||||
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
||||||
(cherry picked from commit d98694c4023881673259ba040c10df7e71ec3d37)
|
|
||||||
---
|
|
||||||
src/quick/items/qquicktextinput.cpp | 5 ++++
|
|
||||||
.../checkCursorDelegateWhenPaddingChanged.qml | 16 ++++++++++
|
|
||||||
.../qquicktextinput/tst_qquicktextinput.cpp | 30 +++++++++++++++++++
|
|
||||||
3 files changed, 51 insertions(+)
|
|
||||||
create mode 100644 tests/auto/quick/qquicktextinput/data/checkCursorDelegateWhenPaddingChanged.qml
|
|
||||||
|
|
||||||
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
|
|
||||||
index 079bf58abe..7d0d05700a 100644
|
|
||||||
--- a/src/quick/items/qquicktextinput.cpp
|
|
||||||
+++ b/src/quick/items/qquicktextinput.cpp
|
|
||||||
@@ -2952,6 +2952,7 @@ void QQuickTextInputPrivate::setTopPadding(qreal value, bool reset)
|
|
||||||
}
|
|
||||||
if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding()))) {
|
|
||||||
updateLayout();
|
|
||||||
+ q->updateCursorRectangle();
|
|
||||||
emit q->topPaddingChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2966,6 +2967,7 @@ void QQuickTextInputPrivate::setLeftPadding(qreal value, bool reset)
|
|
||||||
}
|
|
||||||
if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding()))) {
|
|
||||||
updateLayout();
|
|
||||||
+ q->updateCursorRectangle();
|
|
||||||
emit q->leftPaddingChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2980,6 +2982,7 @@ void QQuickTextInputPrivate::setRightPadding(qreal value, bool reset)
|
|
||||||
}
|
|
||||||
if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding()))) {
|
|
||||||
updateLayout();
|
|
||||||
+ q->updateCursorRectangle();
|
|
||||||
emit q->rightPaddingChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2994,6 +2997,7 @@ void QQuickTextInputPrivate::setBottomPadding(qreal value, bool reset)
|
|
||||||
}
|
|
||||||
if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding()))) {
|
|
||||||
updateLayout();
|
|
||||||
+ q->updateCursorRectangle();
|
|
||||||
emit q->bottomPaddingChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -4712,6 +4716,7 @@ void QQuickTextInput::setPadding(qreal padding)
|
|
||||||
|
|
||||||
d->extra.value().padding = padding;
|
|
||||||
d->updateLayout();
|
|
||||||
+ updateCursorRectangle();
|
|
||||||
emit paddingChanged();
|
|
||||||
if (!d->extra.isAllocated() || !d->extra->explicitTopPadding)
|
|
||||||
emit topPaddingChanged();
|
|
||||||
diff --git a/tests/auto/quick/qquicktextinput/data/checkCursorDelegateWhenPaddingChanged.qml b/tests/auto/quick/qquicktextinput/data/checkCursorDelegateWhenPaddingChanged.qml
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..e6f07b4687
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/auto/quick/qquicktextinput/data/checkCursorDelegateWhenPaddingChanged.qml
|
|
||||||
@@ -0,0 +1,16 @@
|
|
||||||
+import QtQuick 2.12
|
|
||||||
+
|
|
||||||
+Rectangle {
|
|
||||||
+ width: 200
|
|
||||||
+ height: 200
|
|
||||||
+ TextInput {
|
|
||||||
+ objectName: "textInput"
|
|
||||||
+ leftPadding: 10
|
|
||||||
+ focus: true
|
|
||||||
+ cursorDelegate: Rectangle {
|
|
||||||
+ objectName: "cursorDelegate"
|
|
||||||
+ width: 5
|
|
||||||
+ color: "red"
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
|
|
||||||
index 2e64c80b85..ac502bcb28 100644
|
|
||||||
--- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
|
|
||||||
+++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
|
|
||||||
@@ -236,6 +236,7 @@ private slots:
|
|
||||||
void QTBUG_51115_readOnlyResetsSelection();
|
|
||||||
void QTBUG_77814_InsertRemoveNoSelection();
|
|
||||||
|
|
||||||
+ void checkCursorDelegateWhenPaddingChanged();
|
|
||||||
private:
|
|
||||||
void simulateKey(QWindow *, int key);
|
|
||||||
|
|
||||||
@@ -7054,6 +7055,35 @@ void tst_qquicktextinput::QTBUG_77814_InsertRemoveNoSelection()
|
|
||||||
QCOMPARE(textInput->selectedText(), QString());
|
|
||||||
}
|
|
||||||
|
|
||||||
+void tst_qquicktextinput::checkCursorDelegateWhenPaddingChanged()
|
|
||||||
+{
|
|
||||||
+ QQuickView view;
|
|
||||||
+ view.setSource(testFileUrl("checkCursorDelegateWhenPaddingChanged.qml"));
|
|
||||||
+ view.show();
|
|
||||||
+ QVERIFY(QTest::qWaitForWindowExposed(&view));
|
|
||||||
+
|
|
||||||
+ QQuickTextInput *textInput = view.rootObject()->findChild<QQuickTextInput *>("textInput");
|
|
||||||
+ QVERIFY(textInput);
|
|
||||||
+
|
|
||||||
+ QQuickItem *cursorDelegate = textInput->findChild<QQuickItem *>("cursorDelegate");
|
|
||||||
+ QVERIFY(cursorDelegate);
|
|
||||||
+
|
|
||||||
+ QCOMPARE(cursorDelegate->x(), textInput->leftPadding());
|
|
||||||
+ QCOMPARE(cursorDelegate->y(), textInput->topPadding());
|
|
||||||
+
|
|
||||||
+ textInput->setPadding(5);
|
|
||||||
+ QCOMPARE(cursorDelegate->x(), textInput->leftPadding());
|
|
||||||
+ QCOMPARE(cursorDelegate->y(), textInput->topPadding());
|
|
||||||
+
|
|
||||||
+ textInput->setTopPadding(10);
|
|
||||||
+ QCOMPARE(cursorDelegate->x(), textInput->leftPadding());
|
|
||||||
+ QCOMPARE(cursorDelegate->y(), textInput->topPadding());
|
|
||||||
+
|
|
||||||
+ textInput->setLeftPadding(10);
|
|
||||||
+ QCOMPARE(cursorDelegate->x(), textInput->leftPadding());
|
|
||||||
+ QCOMPARE(cursorDelegate->y(), textInput->topPadding());
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
QTEST_MAIN(tst_qquicktextinput)
|
|
||||||
|
|
||||||
#include "tst_qquicktextinput.moc"
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
162
0019-Models-Avoid-crashes-when-deleting-cache-items.patch
Normal file
162
0019-Models-Avoid-crashes-when-deleting-cache-items.patch
Normal file
@ -0,0 +1,162 @@
|
|||||||
|
From 89bf481b9b14f038c5e16421a7fce6dc6523785f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ulf Hermann <ulf.hermann@qt.io>
|
||||||
|
Date: Wed, 29 Mar 2023 16:36:03 +0200
|
||||||
|
Subject: [PATCH 19/19] Models: Avoid crashes when deleting cache items
|
||||||
|
|
||||||
|
Pick-to: 6.5 6.2 5.15
|
||||||
|
Fixes: QTBUG-91425
|
||||||
|
Change-Id: I58cf9ee29922f83fc6621f771b80ed557b31f106
|
||||||
|
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
||||||
|
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
||||||
|
(cherry picked from commit 0cfdecba54e4f40468c4c9a8a6668cc1bc0eff65)
|
||||||
|
|
||||||
|
* asturmlechner 2023-04-08: Resolve conflict with dev branch commit
|
||||||
|
c2d490a2385ea6f389340a296acaac0fa198c8b9 (qAsConst to std::as_const)
|
||||||
|
---
|
||||||
|
src/qmlmodels/qqmldelegatemodel.cpp | 23 ++++++---
|
||||||
|
.../qml/qqmldelegatemodel/data/deleteRace.qml | 50 +++++++++++++++++++
|
||||||
|
.../tst_qqmldelegatemodel.cpp | 12 +++++
|
||||||
|
3 files changed, 78 insertions(+), 7 deletions(-)
|
||||||
|
create mode 100644 tests/auto/qml/qqmldelegatemodel/data/deleteRace.qml
|
||||||
|
|
||||||
|
diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp
|
||||||
|
index bc6b2447af..551e0ede95 100644
|
||||||
|
--- a/src/qmlmodels/qqmldelegatemodel.cpp
|
||||||
|
+++ b/src/qmlmodels/qqmldelegatemodel.cpp
|
||||||
|
@@ -1883,10 +1883,15 @@ void QQmlDelegateModelPrivate::emitChanges()
|
||||||
|
for (int i = 1; i < m_groupCount; ++i)
|
||||||
|
QQmlDelegateModelGroupPrivate::get(m_groups[i])->emitModelUpdated(reset);
|
||||||
|
|
||||||
|
- auto cacheCopy = m_cache; // deliberate; emitChanges may alter m_cache
|
||||||
|
- for (QQmlDelegateModelItem *cacheItem : qAsConst(cacheCopy)) {
|
||||||
|
- if (cacheItem->attached)
|
||||||
|
- cacheItem->attached->emitChanges();
|
||||||
|
+ // emitChanges may alter m_cache and delete items
|
||||||
|
+ QVarLengthArray<QPointer<QQmlDelegateModelAttached>> attachedObjects;
|
||||||
|
+ attachedObjects.reserve(m_cache.length());
|
||||||
|
+ for (const QQmlDelegateModelItem *cacheItem : qAsConst(m_cache))
|
||||||
|
+ attachedObjects.append(cacheItem->attached);
|
||||||
|
+
|
||||||
|
+ for (const QPointer<QQmlDelegateModelAttached> &attached : qAsConst(attachedObjects)) {
|
||||||
|
+ if (attached && attached->m_cacheItem)
|
||||||
|
+ attached->emitChanges();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2707,20 +2712,24 @@ void QQmlDelegateModelAttached::emitChanges()
|
||||||
|
m_previousGroups = m_cacheItem->groups;
|
||||||
|
|
||||||
|
int indexChanges = 0;
|
||||||
|
- for (int i = 1; i < m_cacheItem->metaType->groupCount; ++i) {
|
||||||
|
+ const int groupCount = m_cacheItem->metaType->groupCount;
|
||||||
|
+ for (int i = 1; i < groupCount; ++i) {
|
||||||
|
if (m_previousIndex[i] != m_currentIndex[i]) {
|
||||||
|
m_previousIndex[i] = m_currentIndex[i];
|
||||||
|
indexChanges |= (1 << i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Don't access m_cacheItem anymore once we've started sending signals.
|
||||||
|
+ // We don't own it and someone might delete it.
|
||||||
|
+
|
||||||
|
int notifierId = 0;
|
||||||
|
const QMetaObject *meta = metaObject();
|
||||||
|
- for (int i = 1; i < m_cacheItem->metaType->groupCount; ++i, ++notifierId) {
|
||||||
|
+ for (int i = 1; i < groupCount; ++i, ++notifierId) {
|
||||||
|
if (groupChanges & (1 << i))
|
||||||
|
QMetaObject::activate(this, meta, notifierId, nullptr);
|
||||||
|
}
|
||||||
|
- for (int i = 1; i < m_cacheItem->metaType->groupCount; ++i, ++notifierId) {
|
||||||
|
+ for (int i = 1; i < groupCount; ++i, ++notifierId) {
|
||||||
|
if (indexChanges & (1 << i))
|
||||||
|
QMetaObject::activate(this, meta, notifierId, nullptr);
|
||||||
|
}
|
||||||
|
diff --git a/tests/auto/qml/qqmldelegatemodel/data/deleteRace.qml b/tests/auto/qml/qqmldelegatemodel/data/deleteRace.qml
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..23874970e7
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/tests/auto/qml/qqmldelegatemodel/data/deleteRace.qml
|
||||||
|
@@ -0,0 +1,50 @@
|
||||||
|
+import QtQuick 2.15
|
||||||
|
+import QtQml.Models 2.15
|
||||||
|
+
|
||||||
|
+Item {
|
||||||
|
+ DelegateModel {
|
||||||
|
+ id: delegateModel
|
||||||
|
+ model: ListModel {
|
||||||
|
+ id: sourceModel
|
||||||
|
+
|
||||||
|
+ ListElement { title: "foo" }
|
||||||
|
+ ListElement { title: "bar" }
|
||||||
|
+
|
||||||
|
+ function clear() {
|
||||||
|
+ if (count > 0)
|
||||||
|
+ remove(0, count);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ groups: [
|
||||||
|
+ DelegateModelGroup { name: "selectedItems" }
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+ delegate: Text {
|
||||||
|
+ height: DelegateModel.inSelectedItems ? implicitHeight * 2 : implicitHeight
|
||||||
|
+ Component.onCompleted: {
|
||||||
|
+ if (index === 0)
|
||||||
|
+ DelegateModel.inSelectedItems = true;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ Component.onCompleted: {
|
||||||
|
+ items.create(0)
|
||||||
|
+ items.create(1)
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ListView {
|
||||||
|
+ anchors.fill: parent
|
||||||
|
+ model: delegateModel
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ Timer {
|
||||||
|
+ running: true
|
||||||
|
+ interval: 10
|
||||||
|
+ onTriggered: sourceModel.clear()
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ property int count: delegateModel.items.count
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
diff --git a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
|
||||||
|
index 1722447830..f473cff75f 100644
|
||||||
|
--- a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
|
||||||
|
+++ b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
|
||||||
|
@@ -50,6 +50,7 @@ private slots:
|
||||||
|
void qtbug_86017();
|
||||||
|
void contextAccessedByHandler();
|
||||||
|
void redrawUponColumnChange();
|
||||||
|
+ void deleteRace();
|
||||||
|
};
|
||||||
|
|
||||||
|
class AbstractItemModel : public QAbstractItemModel
|
||||||
|
@@ -213,6 +214,17 @@ void tst_QQmlDelegateModel::redrawUponColumnChange()
|
||||||
|
QCOMPARE(item->property("text").toString(), "Coconut");
|
||||||
|
}
|
||||||
|
|
||||||
|
+void tst_QQmlDelegateModel::deleteRace()
|
||||||
|
+{
|
||||||
|
+ QQmlEngine engine;
|
||||||
|
+ QQmlComponent c(&engine, testFileUrl("deleteRace.qml"));
|
||||||
|
+ QVERIFY2(c.isReady(), qPrintable(c.errorString()));
|
||||||
|
+ QScopedPointer<QObject> o(c.create());
|
||||||
|
+ QVERIFY(!o.isNull());
|
||||||
|
+ QTRY_COMPARE(o->property("count").toInt(), 2);
|
||||||
|
+ QTRY_COMPARE(o->property("count").toInt(), 0);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
QTEST_MAIN(tst_QQmlDelegateModel)
|
||||||
|
|
||||||
|
#include "tst_qqmldelegatemodel.moc"
|
||||||
|
--
|
||||||
|
2.40.0
|
||||||
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
From c8a4894655eef230702e6cc889f3d40fbb5a9426 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 19/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
|
|
||||||
not actually do anything defined. What we want to do here is clear the
|
|
||||||
QObject pointer because we've just gotten rid of the QObject. There is a
|
|
||||||
method for that: Heap::QObjectWrapper::destroy().
|
|
||||||
|
|
||||||
Finally, the internalClass must never ever be nullptr. Assert on that
|
|
||||||
rather than checking it.
|
|
||||||
|
|
||||||
Pick-to: 5.15 6.2 6.3
|
|
||||||
Task-number: QTBUG-100431
|
|
||||||
Change-Id: I794a295c182b2ed4ba80673f58d6143c861b7391
|
|
||||||
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
|
|
||||||
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
||||||
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
||||||
(cherry picked from commit 6c197319f34b8098d034f1543eb5feb9d7be54c3)
|
|
||||||
---
|
|
||||||
src/qml/jsruntime/qv4qobjectwrapper.cpp | 5 ++---
|
|
||||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
|
|
||||||
index 9899c9274e..272b85069f 100644
|
|
||||||
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
|
|
||||||
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
|
|
||||||
@@ -1160,8 +1160,7 @@ void Heap::QObjectWrapper::markObjects(Heap::Base *that, QV4::MarkStack *markSta
|
|
||||||
void QObjectWrapper::destroyObject(bool lastCall)
|
|
||||||
{
|
|
||||||
Heap::QObjectWrapper *h = d();
|
|
||||||
- if (!h->internalClass)
|
|
||||||
- return; // destroyObject already got called
|
|
||||||
+ Q_ASSERT(h->internalClass);
|
|
||||||
|
|
||||||
if (h->object()) {
|
|
||||||
QQmlData *ddata = QQmlData::get(h->object(), false);
|
|
||||||
@@ -1191,7 +1190,7 @@ void QObjectWrapper::destroyObject(bool lastCall)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- h->~Data();
|
|
||||||
+ h->destroy();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
44
qt-QTBUG-111935-fix-V4-jit.patch
Normal file
44
qt-QTBUG-111935-fix-V4-jit.patch
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
From e2bdde18d9758efdc6a0d7d106aad56995df1271 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ulf Hermann <ulf.hermann@qt.io>
|
||||||
|
Date: Wed, 15 Mar 2023 08:59:43 +0100
|
||||||
|
Subject: [PATCH] JIT: Add missing {STORE|LOAD}_ACC() to CreateCallContext
|
||||||
|
|
||||||
|
We cannot assume anything about the accumulator register after calling
|
||||||
|
PushCallContext::call(). Also add a note about not needing to re-load
|
||||||
|
the accumulator on ThrowException.
|
||||||
|
|
||||||
|
Pick-to: 6.5 6.2 5.15
|
||||||
|
Fixes: QTBUG-111935
|
||||||
|
Change-Id: I7196585e1d2697c215f4fe87d8d7ac9b98b622a3
|
||||||
|
---
|
||||||
|
src/qml/jit/qv4baselinejit.cpp | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/qml/jit/qv4baselinejit.cpp b/src/qml/jit/qv4baselinejit.cpp
|
||||||
|
index 14e183adb8..1d65169dce 100644
|
||||||
|
--- a/src/qml/jit/qv4baselinejit.cpp
|
||||||
|
+++ b/src/qml/jit/qv4baselinejit.cpp
|
||||||
|
@@ -506,6 +506,8 @@ void BaselineJIT::generate_ThrowException()
|
||||||
|
as->passEngineAsArg(0);
|
||||||
|
BASELINEJIT_GENERATE_RUNTIME_CALL(ThrowException, CallResultDestination::Ignore);
|
||||||
|
as->gotoCatchException();
|
||||||
|
+
|
||||||
|
+ // LOAD_ACC(); <- not needed here since it would be unreachable.
|
||||||
|
}
|
||||||
|
|
||||||
|
void BaselineJIT::generate_GetException() { as->getException(); }
|
||||||
|
@@ -513,9 +515,11 @@ void BaselineJIT::generate_SetException() { as->setException(); }
|
||||||
|
|
||||||
|
void BaselineJIT::generate_CreateCallContext()
|
||||||
|
{
|
||||||
|
+ STORE_ACC();
|
||||||
|
as->prepareCallWithArgCount(1);
|
||||||
|
as->passCppFrameAsArg(0);
|
||||||
|
BASELINEJIT_GENERATE_RUNTIME_CALL(PushCallContext, CallResultDestination::Ignore);
|
||||||
|
+ LOAD_ACC();
|
||||||
|
}
|
||||||
|
|
||||||
|
void BaselineJIT::generate_PushCatchContext(int index, int name) { as->pushCatchContext(index, name); }
|
||||||
|
--
|
||||||
|
2.39.2
|
||||||
|
|
||||||
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
Summary: Qt5 - QtDeclarative component
|
Summary: Qt5 - QtDeclarative component
|
||||||
Name: qt5-%{qt_module}
|
Name: qt5-%{qt_module}
|
||||||
Version: 5.15.3
|
Version: 5.15.9
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
|
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
|
||||||
@ -28,32 +28,34 @@ Source5: qv4global_p-multilib.h
|
|||||||
## upstream patches
|
## upstream patches
|
||||||
## repo: https://invent.kde.org/qt/qt/qtdeclarative
|
## repo: https://invent.kde.org/qt/qt/qtdeclarative
|
||||||
## branch: kde/5.15
|
## branch: kde/5.15
|
||||||
## git format-patch v5.15.3-lts-lgpl
|
## git format-patch v5.15.9-lts-lgpl
|
||||||
Patch1: 0001-Give-a-warning-when-StyledText-encounters-a-non-supp.patch
|
Patch1: 0001-Remove-unused-QPointer-QQuickPointerMask.patch
|
||||||
Patch2: 0002-Add-missing-limits-include-to-fix-build-with-GCC-11.patch
|
Patch2: 0002-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch
|
||||||
Patch3: 0003-Document-that-StyledText-also-supports-nbsp-and-quot.patch
|
Patch3: 0003-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch
|
||||||
Patch4: 0004-Support-apos-in-styled-text.patch
|
Patch4: 0004-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch
|
||||||
Patch5: 0005-Remove-unused-QPointer-QQuickPointerMask.patch
|
Patch5: 0005-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch
|
||||||
Patch6: 0006-Include-limits-in-Yarr.h-to-fix-build-with-GCC-11.patch
|
Patch6: 0006-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch
|
||||||
Patch7: 0007-QQuickLoader-Do-not-incubate-if-the-source-arrives-a.patch
|
Patch7: 0007-Don-t-convert-QByteArray-in-startDrag.patch
|
||||||
Patch8: 0008-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch
|
Patch8: 0008-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch
|
||||||
Patch9: 0009-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch
|
Patch9: 0009-Implement-accessibility-for-QQuickWidget.patch
|
||||||
Patch10: 0010-Fix-distorted-text-with-subpixel-matrix-translation.patch
|
Patch10: 0010-Send-ObjectShow-event-for-visible-components-after-i.patch
|
||||||
Patch11: 0011-Revert-Fix-for-possible-crash-in-QSGDefaultLayer-gra.patch
|
Patch11: 0011-QQuickItem-avoid-emitting-signals-during-destruction.patch
|
||||||
Patch12: 0012-QQuickItemAnimation-close-potential-memory-leak.patch
|
Patch12: 0012-a11y-track-item-enabled-state.patch
|
||||||
Patch13: 0013-qqmldelegatemodel-Fix-out-of-bounds-cache-removal.patch
|
Patch13: 0013-Make-QaccessibleQuickWidget-private-API.patch
|
||||||
Patch14: 0014-QQuickWindow-don-t-leak-old-screenChanged-connection.patch
|
Patch14: 0014-Qml-Don-t-crash-when-as-casting-to-type-with-errors.patch
|
||||||
Patch15: 0015-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch
|
Patch15: 0015-Fix-missing-glyphs-when-using-NativeRendering.patch
|
||||||
Patch16: 0016-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch
|
Patch16: 0016-Revert-Fix-missing-glyphs-when-using-NativeRendering.patch
|
||||||
Patch17: 0017-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch
|
Patch17: 0017-QQmlImportDatabase-Make-sure-the-newly-added-import-.patch
|
||||||
Patch18: 0018-QQuickTextInput-update-cursor-rectangle-after-paddin.patch
|
Patch18: 0018-QQuickState-when-handle-QJSValue-properties-correctl.patch
|
||||||
Patch19: 0019-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch
|
Patch19: 0019-Models-Avoid-crashes-when-deleting-cache-items.patch
|
||||||
Patch20: 0020-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch
|
|
||||||
|
|
||||||
## upstreamable patches
|
## upstreamable patches
|
||||||
Patch100: %{name}-gcc11.patch
|
Patch100: %{name}-gcc11.patch
|
||||||
# https://pagure.io/fedora-kde/SIG/issue/82
|
# https://pagure.io/fedora-kde/SIG/issue/82
|
||||||
Patch101: qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch
|
Patch101: qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch
|
||||||
|
# From: https://codereview.qt-project.org/c/qt/qtdeclarative/+/466808
|
||||||
|
# Cf. https://bugzilla.redhat.com/show_bug.cgi?id=2177696
|
||||||
|
Patch102: qt-QTBUG-111935-fix-V4-jit.patch
|
||||||
|
|
||||||
# filter qml provides
|
# filter qml provides
|
||||||
%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
|
%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
|
||||||
@ -251,6 +253,11 @@ make check -k -C tests ||:
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Apr 17 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.9-1
|
||||||
|
- 5.15.9 + sync with Fedora
|
||||||
|
Resolves: bz#2178624
|
||||||
|
Resolves: bz#2175728
|
||||||
|
|
||||||
* Fri Mar 25 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
|
* Fri Mar 25 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
|
||||||
- 5.15.3 + sync with Fedora
|
- 5.15.3 + sync with Fedora
|
||||||
Resolves: bz#2061355
|
Resolves: bz#2061355
|
||||||
|
|||||||
@ -44,46 +44,3 @@ index 2b4ca9e2..f2feba2a 100644
|
|||||||
|
|
||||||
if (d->hData.maxExtentDirty) {
|
if (d->hData.maxExtentDirty) {
|
||||||
d->maxExtent = d->maxExtentForAxis(d->hData, true);
|
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 a7aefbe4..afe5c5ac 100644
|
|
||||||
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
|
|
||||||
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
|
|
||||||
@@ -73,6 +73,8 @@ public:
|
|
||||||
tst_QQuickListView();
|
|
||||||
|
|
||||||
private slots:
|
|
||||||
+ // WARNING: please add new tests to tst_qquicklistview2; this file is too slow to work with.
|
|
||||||
+
|
|
||||||
void init();
|
|
||||||
void cleanupTestCase();
|
|
||||||
// Test QAbstractItemModel model types
|
|
||||||
@@ -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);
|
|
||||||
@@ -10109,6 +10113,8 @@ void tst_QQuickListView::animatedDelegate()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+// 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/quick.pro b/tests/auto/quick/quick.pro
|
|
||||||
index 45bcf8a9..00f7d64d 100644
|
|
||||||
--- a/tests/auto/quick/quick.pro
|
|
||||||
+++ b/tests/auto/quick/quick.pro
|
|
||||||
@@ -67,6 +67,7 @@ QUICKTESTS += \
|
|
||||||
qquickitem2 \
|
|
||||||
qquickitemlayer \
|
|
||||||
qquicklistview \
|
|
||||||
+ qquicklistview2 \
|
|
||||||
qquicktableview \
|
|
||||||
qquickloader \
|
|
||||||
qquickmousearea \
|
|
||||||
|
|||||||
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (qtdeclarative-everywhere-opensource-src-5.15.3.tar.xz) = c0f8dba5ba9e211071d64ec9de7395925d97424be899292a83fe961091c6695bfe68395fed4b34a746a69293765122a5ee53c119053f01b5fc511f0dbf577597
|
SHA512 (qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz) = ada3e32f42270899d92c46f0c0b8cd78028cf2e658ac60b3745c804ec494fb1fc6f31a670668074433b3e702f81524415ef132a757ca80151eb13d0a19352af7
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user