sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (c82f44bfe3132a8eef660b9151ecaed69d671bf2)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (c82f44bfe3132a8eef660b9151ecaed69d671bf2)
- Date: Mon, 2 Dec 2024 11:04:49 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
qt6/QT6_VERSIONS | 2
qt6/qt6base/DETAILS | 2
qt6/qt6base/HISTORY | 4
qt6/qt6base/patches/abstract.diff | 81 -----
qt6/qt6declarative/DETAILS | 2
qt6/qt6declarative/HISTORY | 4
qt6/qt6declarative/PRE_BUILD | 3
qt6/qt6declarative/patches/qml1.diff | 420 -------------------------------
qt6/qt6declarative/patches/qml2.diff | 473
-----------------------------------
qt6/sha5sum.txt | 56 ++--
qt6/updqt | 7
11 files changed, 38 insertions(+), 1016 deletions(-)
New commits:
commit c82f44bfe3132a8eef660b9151ecaed69d671bf2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
Revert "qt6declarative - upstream patches"
This reverts commit 2f8767c639b14817e6eeb0b9bfa48d895b3fc253.
commit 423d6ced6e6d3ce3d468849ad73de00509ab9f0e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
Revert "qt6base - upstream patch"
This reverts commit c25d89b201ed8607783b2753073989b37d007379.
commit 2fce28aef3a516fbecb85fe3cc22eec558fa03b6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qt6* => 6.8.1
diff --git a/qt6/QT6_VERSIONS b/qt6/QT6_VERSIONS
index 73937e6..6acbad8 100644
--- a/qt6/QT6_VERSIONS
+++ b/qt6/QT6_VERSIONS
@@ -1,6 +1,6 @@
# this script list the file name, source hash and url for all the Qt6 spells
# together with the file sha5sum.txt, it simplifies updating of all these
spells
-VERSION=6.8.0
+VERSION=6.8.1
# map spell name to qt name
SPELLX=${SPELL//6}
SPELLX=${SPELLX//-}-everywhere-src # for qt3d
diff --git a/qt6/qt6base/DETAILS b/qt6/qt6base/DETAILS
index 31bc47b..7543561 100755
--- a/qt6/qt6base/DETAILS
+++ b/qt6/qt6base/DETAILS
@@ -1,7 +1,7 @@
SPELL=qt6base
source $GRIMOIRE/$SECTION/QT6_VERSIONS
- PATCHLEVEL=1
+
SECURITY_PATCH=5
ENTERED=20210115
SHORT="Qt6 simplifies writing and maintaining GUI release-service"
diff --git a/qt6/qt6base/HISTORY b/qt6/qt6base/HISTORY
index e75efb1..3d1983b 100644
--- a/qt6/qt6base/HISTORY
+++ b/qt6/qt6base/HISTORY
@@ -1,7 +1,3 @@
-2024-10-12 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: PATCHLEVEL++
- * abstract.diff: upstream patch added
-
2024-09-24 Treeve Jelbert <treeve AT sourcemage.org>
* CVE-2024-39936-qtbase-6.7.patch: deleted
diff --git a/qt6/qt6base/patches/abstract.diff
b/qt6/qt6base/patches/abstract.diff
deleted file mode 100644
index 05e7fb2..0000000
--- a/qt6/qt6base/patches/abstract.diff
+++ /dev/null
@@ -1,81 +0,0 @@
-From 2ea3abed0125d81ca4f3bacb9650db7314657332 Mon Sep 17 00:00:00 2001
-From: Mitch Curtis <mitch.curtis AT qt.io>
-Date: Tue, 24 Sep 2024 10:40:37 +0800
-Subject: QAbstractItemModelPrivate: add resetting member
-
-This allows QQmlDelegateModel to know if a QAbstractItemModel subclass
-is in the process of a reset, which it can't know if beginResetModel
-was called in the model's constructor.
-
-As an added bonus, it also allows us to warn the user if they call
-endResetModel with a previous call to beginResetModel.
-
-Task-number: QTBUG-125053
-Task-number: QTBUG-127340
-Pick-to: 6.7 6.5
-Change-Id: I7d1fb983e9bf868c48472624ad945ae158115943
-Reviewed-by: Richard Moe Gustavsen <richard.gustavsen AT qt.io>
-(cherry picked from commit 9d8663c18e88cb0b5a65f86cfd7726f3d31e04d6)
----
- src/corelib/itemmodels/qabstractitemmodel.cpp | 13 +++++++++++++
- src/corelib/itemmodels/qabstractitemmodel_p.h | 4 ++++
- 2 files changed, 17 insertions(+)
-
-diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp
b/src/corelib/itemmodels/qabstractitemmodel.cpp
-index 5b9b215eab..3d4d566d46 100644
---- a/src/corelib/itemmodels/qabstractitemmodel.cpp
-+++ b/src/corelib/itemmodels/qabstractitemmodel.cpp
-@@ -3400,6 +3400,13 @@ void QAbstractItemModel::endMoveColumns()
- */
- void QAbstractItemModel::beginResetModel()
- {
-+ Q_D(QAbstractItemModel);
-+ if (d->resetting) {
-+ qWarning() << "beginResetModel called on" << this << "without
calling endResetModel first";
-+ // Warn, but don't return early in case user code relies on the
incorrect behavior.
-+ }
-+
-+ d->resetting = true;
- emit modelAboutToBeReset(QPrivateSignal());
- }
-
-@@ -3417,8 +3424,14 @@ void QAbstractItemModel::beginResetModel()
- void QAbstractItemModel::endResetModel()
- {
- Q_D(QAbstractItemModel);
-+ if (!d->resetting) {
-+ qWarning() << "endResetModel called on" << this << "without calling
beginResetModel first";
-+ // Warn, but don't return early in case user code relies on the
incorrect behavior.
-+ }
-+
- d->invalidatePersistentIndexes();
- resetInternalData();
-+ d->resetting = false;
- emit modelReset(QPrivateSignal());
- }
-
-diff --git a/src/corelib/itemmodels/qabstractitemmodel_p.h
b/src/corelib/itemmodels/qabstractitemmodel_p.h
-index e34dc3262c..c2113fde9a 100644
---- a/src/corelib/itemmodels/qabstractitemmodel_p.h
-+++ b/src/corelib/itemmodels/qabstractitemmodel_p.h
-@@ -45,6 +45,8 @@ public:
- QAbstractItemModelPrivate();
- ~QAbstractItemModelPrivate();
-
-+ static const QAbstractItemModelPrivate *get(const QAbstractItemModel
*model) { return model->d_func(); }
-+
- void removePersistentIndexData(QPersistentModelIndexData *data);
- void movePersistentIndexes(const QList<QPersistentModelIndexData *>
&indexes, int change, const QModelIndex &parent,
- Qt::Orientation orientation);
-@@ -115,6 +117,8 @@ public:
- void insertMultiAtEnd(const QModelIndex& key,
QPersistentModelIndexData *data);
- } persistent;
-
-+ bool resetting = false;
-+
- static const QHash<int,QByteArray> &defaultRoleNames();
- static bool isVariantLessThan(const QVariant &left, const QVariant
&right,
- Qt::CaseSensitivity cs =
Qt::CaseSensitive, bool isLocaleAware = false);
---
-cgit v1.2.3
-
diff --git a/qt6/qt6declarative/DETAILS b/qt6/qt6declarative/DETAILS
index fd7e93d..9d3f4de 100755
--- a/qt6/qt6declarative/DETAILS
+++ b/qt6/qt6declarative/DETAILS
@@ -1,7 +1,7 @@
SPELL=qt6declarative
source $GRIMOIRE/$SECTION/QT6_VERSIONS
- PATCHLEVEL=1
+
# SECURITY_PATCH=2
ENTERED=20210116
SHORT=""
diff --git a/qt6/qt6declarative/HISTORY b/qt6/qt6declarative/HISTORY
index e0d3b7a..9234f67 100644
--- a/qt6/qt6declarative/HISTORY
+++ b/qt6/qt6declarative/HISTORY
@@ -1,7 +1,3 @@
-2024-10-12 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: PATCHLEVEL=1
- * PRE_BUILD patches/*: upstream patches
-
2024-09-25 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add qt6tools
* CONFLICTS" add self
diff --git a/qt6/qt6declarative/PRE_BUILD b/qt6/qt6declarative/PRE_BUILD
deleted file mode 100755
index c230ad1..0000000
--- a/qt6/qt6declarative/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-apply_patch_dir patches
diff --git a/qt6/qt6declarative/patches/qml1.diff
b/qt6/qt6declarative/patches/qml1.diff
deleted file mode 100644
index dccd096..0000000
--- a/qt6/qt6declarative/patches/qml1.diff
+++ /dev/null
@@ -1,420 +0,0 @@
-From 3330731d0cb221477ab3d856db032126403ae6a0 Mon Sep 17 00:00:00 2001
-From: Mitch Curtis <mitch.curtis AT qt.io>
-Date: Tue, 24 Sep 2024 08:18:14 +0800
-Subject: Revert "QQmlDelegateModel: fix delegates not being created in
certain
- cases"
-
-This reverts commit 6561344dd2d1ba69abe6edec4fe340b256da9e13. It needs
-to be fixed in a different way.
-
-Fixes: QTBUG-127340
-Pick-to: 6.7 6.5
-Change-Id: I8503b22a5257e0fb5ee11a1bdf83d3dcab4a600a
-Reviewed-by: Richard Moe Gustavsen <richard.gustavsen AT qt.io>
-(cherry picked from commit 281f620ceea03e7a222d796ae0cca917a9778368)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot AT qt-project.org>
----
- src/qmlmodels/qqmldelegatemodel.cpp | 61 +++-------
- src/qmlmodels/qqmldelegatemodel_p_p.h | 2 -
- tests/auto/qml/qqmldelegatemodel/CMakeLists.txt | 1 -
- tests/auto/qml/qqmldelegatemodel/data/reset.qml | 28 -----
- .../data/resetInQAIMConstructor.qml | 28 -----
- .../qqmldelegatemodel/tst_qqmldelegatemodel.cpp | 135
++-------------------
- 6 files changed, 29 insertions(+), 226 deletions(-)
- delete mode 100644 tests/auto/qml/qqmldelegatemodel/data/reset.qml
- delete mode 100644
tests/auto/qml/qqmldelegatemodel/data/resetInQAIMConstructor.qml
-
-diff --git a/src/qmlmodels/qqmldelegatemodel.cpp
b/src/qmlmodels/qqmldelegatemodel.cpp
-index 9af58d7a22..7cfa662aa6 100644
---- a/src/qmlmodels/qqmldelegatemodel.cpp
-+++ b/src/qmlmodels/qqmldelegatemodel.cpp
-@@ -172,7 +172,6 @@
QQmlDelegateModelPrivate::QQmlDelegateModelPrivate(QQmlContext *ctxt)
- , m_transaction(false)
- , m_incubatorCleanupScheduled(false)
- , m_waitingToFetchMore(false)
-- , m_maybeResetRoleNames(false)
- , m_cacheItems(nullptr)
- , m_items(nullptr)
- , m_persistedItems(nullptr)
-@@ -366,7 +365,6 @@ void
QQmlDelegateModelPrivate::connectToAbstractItemModel()
- QObject::connect(aim, &QAbstractItemModel::dataChanged, q,
&QQmlDelegateModel::_q_dataChanged);
- QObject::connect(aim, &QAbstractItemModel::rowsMoved, q,
&QQmlDelegateModel::_q_rowsMoved);
- QObject::connect(aim, &QAbstractItemModel::modelAboutToBeReset, q,
&QQmlDelegateModel::_q_modelAboutToBeReset);
-- QObject::connect(aim, &QAbstractItemModel::modelReset, q,
&QQmlDelegateModel::handleModelReset);
- QObject::connect(aim, &QAbstractItemModel::layoutChanged, q,
&QQmlDelegateModel::_q_layoutChanged);
- }
-
-@@ -387,7 +385,6 @@ void
QQmlDelegateModelPrivate::disconnectFromAbstractItemModel()
- QObject::disconnect(aim, &QAbstractItemModel::dataChanged, q,
&QQmlDelegateModel::_q_dataChanged);
- QObject::disconnect(aim, &QAbstractItemModel::rowsMoved, q,
&QQmlDelegateModel::_q_rowsMoved);
- QObject::disconnect(aim, &QAbstractItemModel::modelAboutToBeReset, q,
&QQmlDelegateModel::_q_modelAboutToBeReset);
-- QObject::disconnect(aim, &QAbstractItemModel::modelReset, q,
&QQmlDelegateModel::handleModelReset);
- QObject::disconnect(aim, &QAbstractItemModel::layoutChanged, q,
&QQmlDelegateModel::_q_layoutChanged);
- }
-
-@@ -1898,28 +1895,25 @@ void QQmlDelegateModel::_q_modelAboutToBeReset()
- Q_D(QQmlDelegateModel);
- if (!d->m_adaptorModel.adaptsAim())
- return;
--
-- /*
-- roleNames are generally guaranteed to be stable (given that QAIM
has no
-- change signal for them), except that resetting the model is allowed
to
-- invalidate them (QTBUG-32132). DelegateModel must take this into
account by
-- snapshotting the current roleNames before the model is reset.
-- Afterwards, if we detect that roleNames has changed, we throw the
-- current model set up away and rebuild everything from scratch – it
is
-- unlikely that a more efficient implementation would be worth it.
--
-- If we detect no changes, we simply use the existing logic to handle
the
-- model reset.
--
-- This (role name resetting) logic relies on the fact that
-- modelAboutToBeReset must be followed by a modelReset signal before
any
-- further modelAboutToBeReset can occur. However, it's possible for
user
-- code to begin the reset before connectToAbstractItemModel is called
-- (QTBUG-125053), in which case we don't attempt to reset the role
names.
-- */
-- Q_ASSERT(!d->m_maybeResetRoleNames);
-- d->m_maybeResetRoleNames = true;
-- d->m_roleNamesBeforeReset = d->m_adaptorModel.aim()->roleNames();
-+ auto aim = d->m_adaptorModel.aim();
-+ auto oldRoleNames = aim->roleNames();
-+ // this relies on the fact that modelAboutToBeReset must be followed
-+ // by a modelReset signal before any further modelAboutToBeReset can
occur
-+ QObject::connect(aim, &QAbstractItemModel::modelReset, this, [this, d,
oldRoleNames, aim](){
-+ if (!d->m_adaptorModel.adaptsAim() || d->m_adaptorModel.aim() !=
aim)
-+ return;
-+ if (oldRoleNames == aim->roleNames()) {
-+ // if the rolenames stayed the same (most common case), then we
don't have
-+ // to throw away all the setup that we did
-+ handleModelReset();
-+ } else {
-+ // If they did change, we give up and just start from scratch
via setMode
-+ setModel(QVariant::fromValue(model()));
-+ // but we still have to call handleModelReset, otherwise views
will
-+ // not refresh
-+ handleModelReset();
-+ }
-+ }, Qt::SingleShotConnection);
- }
-
- void QQmlDelegateModel::handleModelReset()
-@@ -1929,23 +1923,6 @@ void QQmlDelegateModel::handleModelReset()
- return;
-
- int oldCount = d->m_count;
--
-- if (d->m_maybeResetRoleNames) {
-- auto aim = d->m_adaptorModel.aim();
-- if (!d->m_adaptorModel.adaptsAim() || d->m_adaptorModel.aim() !=
aim)
-- return;
--
-- // If the role names stayed the same (most common case), then we
don't have
-- // to throw away all the setup that we did.
-- // If they did change, we give up and just start from scratch via
setModel.
-- // We do this before handling the reset to ensure that views
refresh.
-- if (aim->roleNames() != d->m_roleNamesBeforeReset)
-- setModel(QVariant::fromValue(model()));
--
-- d->m_maybeResetRoleNames = false;
-- d->m_roleNamesBeforeReset.clear();
-- }
--
- d->m_adaptorModel.rootIndex = QModelIndex();
-
- if (d->m_complete) {
-diff --git a/src/qmlmodels/qqmldelegatemodel_p_p.h
b/src/qmlmodels/qqmldelegatemodel_p_p.h
-index bae8fc8a23..3c7ab9281d 100644
---- a/src/qmlmodels/qqmldelegatemodel_p_p.h
-+++ b/src/qmlmodels/qqmldelegatemodel_p_p.h
-@@ -334,7 +334,6 @@ public:
- QQmlReusableDelegateModelItemsPool m_reusableItemsPool;
- QList<QQDMIncubationTask *> m_finishedIncubating;
- QList<QByteArray> m_watchedRoles;
-- QHash<int, QByteArray> m_roleNamesBeforeReset;
-
- QString m_filterGroup;
-
-@@ -348,7 +347,6 @@ public:
- bool m_transaction : 1;
- bool m_incubatorCleanupScheduled : 1;
- bool m_waitingToFetchMore : 1;
-- bool m_maybeResetRoleNames : 1;
-
- union {
- struct {
-diff --git a/tests/auto/qml/qqmldelegatemodel/CMakeLists.txt
b/tests/auto/qml/qqmldelegatemodel/CMakeLists.txt
-index 966f5229df..8d8a90e0a7 100644
---- a/tests/auto/qml/qqmldelegatemodel/CMakeLists.txt
-+++ b/tests/auto/qml/qqmldelegatemodel/CMakeLists.txt
-@@ -29,7 +29,6 @@ qt_internal_add_test(tst_qqmldelegatemodel
- Qt::QmlModelsPrivate
- Qt::QmlPrivate
- Qt::Quick
-- Qt::QuickPrivate
- Qt::QuickTestUtilsPrivate
- TESTDATA ${test_data}
- )
-diff --git a/tests/auto/qml/qqmldelegatemodel/data/reset.qml
b/tests/auto/qml/qqmldelegatemodel/data/reset.qml
-deleted file mode 100644
-index 0fcd5e8afa..0000000000
---- a/tests/auto/qml/qqmldelegatemodel/data/reset.qml
-+++ /dev/null
-@@ -1,28 +0,0 @@
--import QtQuick
--import Test
--
--Window {
-- id: root
-- width: 200
-- height: 200
--
-- property alias listView: listView
--
-- ResettableModel {
-- id: resetModel
-- }
--
-- ListView {
-- id: listView
-- anchors.fill: parent
-- model: resetModel
--
-- delegate: Rectangle {
-- implicitWidth: 100
-- implicitHeight: 50
-- color: "olivedrab"
--
-- required property string display
-- }
-- }
--}
-diff --git
a/tests/auto/qml/qqmldelegatemodel/data/resetInQAIMConstructor.qml
b/tests/auto/qml/qqmldelegatemodel/data/resetInQAIMConstructor.qml
-deleted file mode 100644
-index cb1f226737..0000000000
---- a/tests/auto/qml/qqmldelegatemodel/data/resetInQAIMConstructor.qml
-+++ /dev/null
-@@ -1,28 +0,0 @@
--import QtQuick
--import Test
--
--Window {
-- id: root
-- width: 200
-- height: 200
--
-- property alias listView: listView
--
-- ResetInConstructorModel {
-- id: resetInConstructorModel
-- }
--
-- ListView {
-- id: listView
-- anchors.fill: parent
-- model: resetInConstructorModel
--
-- delegate: Rectangle {
-- implicitWidth: 100
-- implicitHeight: 50
-- color: "olivedrab"
--
-- required property string display
-- }
-- }
--}
-diff --git a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
-index d9f8b7aeba..2cacda5513 100644
---- a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
-+++ b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
-@@ -4,7 +4,6 @@
- #include <QtTest/qtest.h>
- #include <QtCore/qjsonobject.h>
- #include <QtCore/QConcatenateTablesProxyModel>
--#include <QtCore/qtimer.h>
- #include <QtGui/QStandardItemModel>
- #include <QtQml/qqmlcomponent.h>
- #include <QtQml/qqmlapplicationengine.h>
-@@ -12,17 +11,11 @@
- #include <QtQmlModels/private/qqmllistmodel_p.h>
- #include <QtQuick/qquickview.h>
- #include <QtQuick/qquickitem.h>
--#include <QtQuick/private/qquickitemview_p_p.h>
--#include <QtQuick/private/qquicklistview_p.h>
--#include <QtQuickTest/quicktest.h>
- #include <QtQuickTestUtils/private/qmlutils_p.h>
--#include <QtQuickTestUtils/private/visualtestutils_p.h>
- #include <QtTest/QSignalSpy>
-
- #include <forward_list>
-
--using namespace QQuickVisualTestUtils;
--
- class tst_QQmlDelegateModel : public QQmlDataTest
- {
- Q_OBJECT
-@@ -32,8 +25,6 @@ public:
-
- private slots:
- void resettingRolesRespected();
-- void resetInQAIMConstructor();
-- void reset();
- void valueWithoutCallingObjectFirst_data();
- void valueWithoutCallingObjectFirst();
- void qtbug_86017();
-@@ -53,9 +44,16 @@ private slots:
- void viewUpdatedOnDelegateChoiceAffectingRoleChange();
- };
-
--class BaseAbstractItemModel : public QAbstractItemModel
-+class AbstractItemModel : public QAbstractItemModel
- {
-+ Q_OBJECT
- public:
-+ AbstractItemModel()
-+ {
-+ for (int i = 0; i < 3; ++i)
-+ mValues.append(QString::fromLatin1("Item %1").arg(i));
-+ }
-+
- QModelIndex index(int row, int column, const QModelIndex &parent =
QModelIndex()) const override
- {
- if (parent.isValid())
-@@ -93,21 +91,10 @@ public:
- return mValues.at(index.row());
- }
-
--protected:
-+private:
- QVector<QString> mValues;
- };
-
--class AbstractItemModel : public BaseAbstractItemModel
--{
-- Q_OBJECT
--public:
-- AbstractItemModel()
-- {
-- for (int i = 0; i < 3; ++i)
-- mValues.append(QString::fromLatin1("Item %1").arg(i));
-- }
--};
--
- tst_QQmlDelegateModel::tst_QQmlDelegateModel()
- : QQmlDataTest(QT_QMLTEST_DATADIR)
- {
-@@ -166,109 +153,7 @@ void tst_QQmlDelegateModel::resettingRolesRespected()
- QObject *root = engine.rootObjects().constFirst();
- QVERIFY(!root->property("success").toBool());
- model->change();
-- QTRY_VERIFY_WITH_TIMEOUT(root->property("success").toBool(), 100);
--}
--
--class ResetInConstructorModel : public BaseAbstractItemModel
--{
-- Q_OBJECT
-- QML_ELEMENT
--
--public:
-- ResetInConstructorModel()
-- {
-- beginResetModel();
-- QTimer::singleShot(0, this, &ResetInConstructorModel::finishReset);
-- }
--
--private:
-- void finishReset()
-- {
-- mValues.append("First");
-- endResetModel();
-- }
--};
--
--void tst_QQmlDelegateModel::resetInQAIMConstructor()
--{
-- qmlRegisterTypesAndRevisions<ResetInConstructorModel>("Test", 1);
--
-- QQuickApplicationHelper helper(this, "resetInQAIMConstructor.qml");
-- QVERIFY2(helper.ready, helper.failureMessage());
-- QQuickWindow *window = helper.window;
-- window->show();
-- QVERIFY(QTest::qWaitForWindowExposed(window));
--
-- auto *listView = window->property("listView").value<QQuickListView *>();
-- QVERIFY(listView);
-- QTRY_VERIFY_WITH_TIMEOUT(listView->itemAtIndex(0), 100);
-- QQuickItem *firstDelegateItem = listView->itemAtIndex(0);
-- QVERIFY(firstDelegateItem);
-- QCOMPARE(firstDelegateItem->property("display").toString(), "First");
--}
--
--class ResettableModel : public BaseAbstractItemModel
--{
-- Q_OBJECT
-- QML_ELEMENT
--
--public:
-- ResettableModel()
-- {
-- mValues.append("First");
-- }
--
-- void callBeginResetModel()
-- {
-- beginResetModel();
-- mValues.clear();
-- }
--
-- void appendData()
-- {
-- mValues.append(QString::fromLatin1("Item %1").arg(mValues.size()));
-- }
--
-- void callEndResetModel()
-- {
-- endResetModel();
-- }
--};
--
--// Tests that everything works as expected when calling
beginResetModel/endResetModel
--// after the QAIM subclass constructor has run.
--void tst_QQmlDelegateModel::reset()
--{
-- qmlRegisterTypesAndRevisions<ResettableModel>("Test", 1);
--
-- QQuickApplicationHelper helper(this, "reset.qml");
-- QVERIFY2(helper.ready, helper.failureMessage());
-- QQuickWindow *window = helper.window;
-- window->show();
-- QVERIFY(QTest::qWaitForWindowExposed(window));
--
-- auto *listView = window->property("listView").value<QQuickListView *>();
-- QVERIFY(listView);
-- QQuickItem *firstDelegateItem = listView->itemAtIndex(0);
-- QVERIFY(firstDelegateItem);
-- QCOMPARE(firstDelegateItem->property("display").toString(), "First");
--
-- const auto delegateModel = QQuickItemViewPrivate::get(listView)->model;
-- QSignalSpy rootIndexChangedSpy(delegateModel,
SIGNAL(rootIndexChanged()));
-- QVERIFY(rootIndexChangedSpy.isValid());
--
-- auto *model = listView->model().value<ResettableModel *>();
-- model->callBeginResetModel();
-- model->appendData();
-- model->callEndResetModel();
-- // This is verifies that handleModelReset isn't called
-- // more than once during this process, since it unconditionally emits
rootIndexChanged.
-- QCOMPARE(rootIndexChangedSpy.count(), 1);
--
-- QTRY_VERIFY_WITH_TIMEOUT(listView->itemAtIndex(0), 100);
-- firstDelegateItem = listView->itemAtIndex(0);
-- QVERIFY(firstDelegateItem);
-- QCOMPARE(firstDelegateItem->property("display").toString(), "Item 0");
-+ QTRY_VERIFY(root->property("success").toBool());
- }
-
- void tst_QQmlDelegateModel::valueWithoutCallingObjectFirst_data()
---
-cgit v1.2.3
-
diff --git a/qt6/qt6declarative/patches/qml2.diff
b/qt6/qt6declarative/patches/qml2.diff
deleted file mode 100644
index 47ac219..0000000
--- a/qt6/qt6declarative/patches/qml2.diff
+++ /dev/null
@@ -1,473 +0,0 @@
-From 2aefbca84d2f3dca2c2697f13710b6907c0c7e59 Mon Sep 17 00:00:00 2001
-From: Mitch Curtis <mitch.curtis AT qt.io>
-Date: Tue, 24 Sep 2024 10:22:12 +0800
-Subject: QQmlDelegateModel: fix delegates not being created in certain cases
- v2
-
-Since 837c2f18cd223707e7cedb213257b0158ea07146, we connect to
-modelAboutToBeReset rather than modelReset so that we can handle role
-name changes. _q_modelAboutToBeReset now connects modelReset to
-handleModelReset with a single shot connection instead.
-
-However, it's possible for user code to begin the reset before
-connectToAbstractItemModel is called (QTBUG-125053), in which case we
-connect to modelReset too late and handleModelReset is never called,
-resulting in delegates not being created in certain cases.
-
-So, we check at the earliest point we can if the model is in the
-process of being reset, and if so, connect modelReset to
-handleModelReset.
-
-This is a less intrusive alternative to
-6561344dd2d1ba69abe6edec4fe340b256da9e13, which caused regressions and
-was reverted.
-
-Fixes: QTBUG-125053
-Task-number: QTBUG-127340
-Pick-to: 6.7 6.5
-Change-Id: I2bfe192ed61eddaa481de4b1e14b1fa5d07a51c1
-Reviewed-by: Richard Moe Gustavsen <richard.gustavsen AT qt.io>
-(cherry picked from commit 4bb16ce2c8ea94f768991593a581c8838d48f3a3)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot AT qt-project.org>
----
- src/qmlmodels/qqmldelegatemodel.cpp | 17 ++
- tests/auto/qml/qqmldelegatemodel/CMakeLists.txt | 1 +
- .../proxyModelWithDelayedSourceModelInListView.qml | 30 +++
- tests/auto/qml/qqmldelegatemodel/data/reset.qml | 28 +++
- .../data/resetInQAIMConstructor.qml | 28 +++
- .../qqmldelegatemodel/tst_qqmldelegatemodel.cpp | 210
++++++++++++++++++++-
- 6 files changed, 304 insertions(+), 10 deletions(-)
- create mode 100644
tests/auto/qml/qqmldelegatemodel/data/proxyModelWithDelayedSourceModelInListView.qml
- create mode 100644 tests/auto/qml/qqmldelegatemodel/data/reset.qml
- create mode 100644
tests/auto/qml/qqmldelegatemodel/data/resetInQAIMConstructor.qml
-
-diff --git a/src/qmlmodels/qqmldelegatemodel.cpp
b/src/qmlmodels/qqmldelegatemodel.cpp
-index 7cfa662aa6..f8de5cba82 100644
---- a/src/qmlmodels/qqmldelegatemodel.cpp
-+++ b/src/qmlmodels/qqmldelegatemodel.cpp
-@@ -3,6 +3,8 @@
-
- #include "qqmldelegatemodel_p_p.h"
-
-+#include <QtCore/private/qabstractitemmodel_p.h>
-+
- #include <QtQml/qqmlinfo.h>
-
- #include <private/qqmlabstractdelegatecomponent_p.h>
-@@ -409,6 +411,21 @@ void QQmlDelegateModel::setModel(const QVariant &model)
- _q_itemsInserted(0, d->adaptorModelCount());
- d->requestMoreIfNecessary();
- }
-+
-+ // Since 837c2f18cd223707e7cedb213257b0158ea07146, we connect to
modelAboutToBeReset
-+ // rather than modelReset so that we can handle role name changes.
_q_modelAboutToBeReset
-+ // now connects modelReset to handleModelReset with a single shot
connection instead.
-+ // However, it's possible for user code to begin the reset before
connectToAbstractItemModel is called
-+ // (QTBUG-125053), in which case we connect to modelReset too late and
handleModelReset is never called,
-+ // resulting in delegates not being created in certain cases.
-+ // So, we check at the earliest point we can if the model is in the
process of being reset,
-+ // and if so, connect modelReset to handleModelReset.
-+ if (d->m_adaptorModel.adaptsAim()) {
-+ auto *aim = d->m_adaptorModel.aim();
-+ auto *aimPrivate = QAbstractItemModelPrivate::get(aim);
-+ if (aimPrivate->resetting)
-+ QObject::connect(aim, &QAbstractItemModel::modelReset, this,
&QQmlDelegateModel::handleModelReset, Qt::SingleShotConnection);
-+ }
- }
-
- /*!
-diff --git a/tests/auto/qml/qqmldelegatemodel/CMakeLists.txt
b/tests/auto/qml/qqmldelegatemodel/CMakeLists.txt
-index 8d8a90e0a7..966f5229df 100644
---- a/tests/auto/qml/qqmldelegatemodel/CMakeLists.txt
-+++ b/tests/auto/qml/qqmldelegatemodel/CMakeLists.txt
-@@ -29,6 +29,7 @@ qt_internal_add_test(tst_qqmldelegatemodel
- Qt::QmlModelsPrivate
- Qt::QmlPrivate
- Qt::Quick
-+ Qt::QuickPrivate
- Qt::QuickTestUtilsPrivate
- TESTDATA ${test_data}
- )
-diff --git
a/tests/auto/qml/qqmldelegatemodel/data/proxyModelWithDelayedSourceModelInListView.qml
b/tests/auto/qml/qqmldelegatemodel/data/proxyModelWithDelayedSourceModelInListView.qml
-new file mode 100644
-index 0000000000..b6733bd38c
---- /dev/null
-+++
b/tests/auto/qml/qqmldelegatemodel/data/proxyModelWithDelayedSourceModelInListView.qml
-@@ -0,0 +1,30 @@
-+import QtQuick
-+import Test
-+
-+Window {
-+ id: root
-+ title: listView.count
-+
-+ property alias listView: listView
-+ property ProxySourceModel connectionModel: null
-+
-+ Component {
-+ id: modelComponent
-+ ProxySourceModel {}
-+ }
-+
-+ ListView {
-+ id: listView
-+ anchors.fill: parent
-+
-+ delegate: Text {
-+ text: model.Name
-+ }
-+
-+ model: ProxyModel {
-+ sourceModel: root.connectionModel
-+ }
-+ }
-+
-+ Component.onCompleted: root.connectionModel =
modelComponent.createObject(root)
-+}
-diff --git a/tests/auto/qml/qqmldelegatemodel/data/reset.qml
b/tests/auto/qml/qqmldelegatemodel/data/reset.qml
-new file mode 100644
-index 0000000000..0fcd5e8afa
---- /dev/null
-+++ b/tests/auto/qml/qqmldelegatemodel/data/reset.qml
-@@ -0,0 +1,28 @@
-+import QtQuick
-+import Test
-+
-+Window {
-+ id: root
-+ width: 200
-+ height: 200
-+
-+ property alias listView: listView
-+
-+ ResettableModel {
-+ id: resetModel
-+ }
-+
-+ ListView {
-+ id: listView
-+ anchors.fill: parent
-+ model: resetModel
-+
-+ delegate: Rectangle {
-+ implicitWidth: 100
-+ implicitHeight: 50
-+ color: "olivedrab"
-+
-+ required property string display
-+ }
-+ }
-+}
-diff --git
a/tests/auto/qml/qqmldelegatemodel/data/resetInQAIMConstructor.qml
b/tests/auto/qml/qqmldelegatemodel/data/resetInQAIMConstructor.qml
-new file mode 100644
-index 0000000000..cb1f226737
---- /dev/null
-+++ b/tests/auto/qml/qqmldelegatemodel/data/resetInQAIMConstructor.qml
-@@ -0,0 +1,28 @@
-+import QtQuick
-+import Test
-+
-+Window {
-+ id: root
-+ width: 200
-+ height: 200
-+
-+ property alias listView: listView
-+
-+ ResetInConstructorModel {
-+ id: resetInConstructorModel
-+ }
-+
-+ ListView {
-+ id: listView
-+ anchors.fill: parent
-+ model: resetInConstructorModel
-+
-+ delegate: Rectangle {
-+ implicitWidth: 100
-+ implicitHeight: 50
-+ color: "olivedrab"
-+
-+ required property string display
-+ }
-+ }
-+}
-diff --git a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
-index 2cacda5513..3f08d8fc85 100644
---- a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
-+++ b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
-@@ -3,7 +3,9 @@
-
- #include <QtTest/qtest.h>
- #include <QtCore/qjsonobject.h>
-+#include <QtCore/qsortfilterproxymodel.h>
- #include <QtCore/QConcatenateTablesProxyModel>
-+#include <QtCore/qtimer.h>
- #include <QtGui/QStandardItemModel>
- #include <QtQml/qqmlcomponent.h>
- #include <QtQml/qqmlapplicationengine.h>
-@@ -11,11 +13,17 @@
- #include <QtQmlModels/private/qqmllistmodel_p.h>
- #include <QtQuick/qquickview.h>
- #include <QtQuick/qquickitem.h>
-+#include <QtQuick/private/qquickitemview_p_p.h>
-+#include <QtQuick/private/qquicklistview_p.h>
-+#include <QtQuickTest/quicktest.h>
- #include <QtQuickTestUtils/private/qmlutils_p.h>
-+#include <QtQuickTestUtils/private/visualtestutils_p.h>
- #include <QtTest/QSignalSpy>
-
- #include <forward_list>
-
-+using namespace QQuickVisualTestUtils;
-+
- class tst_QQmlDelegateModel : public QQmlDataTest
- {
- Q_OBJECT
-@@ -25,6 +33,8 @@ public:
-
- private slots:
- void resettingRolesRespected();
-+ void resetInQAIMConstructor();
-+ void reset();
- void valueWithoutCallingObjectFirst_data();
- void valueWithoutCallingObjectFirst();
- void qtbug_86017();
-@@ -42,18 +52,12 @@ private slots:
- void doNotUnrefObjectUnderConstruction();
- void clearCacheDuringInsertion();
- void viewUpdatedOnDelegateChoiceAffectingRoleChange();
-+ void proxyModelWithDelayedSourceModelInListView();
- };
-
--class AbstractItemModel : public QAbstractItemModel
-+class BaseAbstractItemModel : public QAbstractItemModel
- {
-- Q_OBJECT
- public:
-- AbstractItemModel()
-- {
-- for (int i = 0; i < 3; ++i)
-- mValues.append(QString::fromLatin1("Item %1").arg(i));
-- }
--
- QModelIndex index(int row, int column, const QModelIndex &parent =
QModelIndex()) const override
- {
- if (parent.isValid())
-@@ -91,10 +95,21 @@ public:
- return mValues.at(index.row());
- }
-
--private:
-+protected:
- QVector<QString> mValues;
- };
-
-+class AbstractItemModel : public BaseAbstractItemModel
-+{
-+ Q_OBJECT
-+public:
-+ AbstractItemModel()
-+ {
-+ for (int i = 0; i < 3; ++i)
-+ mValues.append(QString::fromLatin1("Item %1").arg(i));
-+ }
-+};
-+
- tst_QQmlDelegateModel::tst_QQmlDelegateModel()
- : QQmlDataTest(QT_QMLTEST_DATADIR)
- {
-@@ -153,7 +168,109 @@ void tst_QQmlDelegateModel::resettingRolesRespected()
- QObject *root = engine.rootObjects().constFirst();
- QVERIFY(!root->property("success").toBool());
- model->change();
-- QTRY_VERIFY(root->property("success").toBool());
-+ QTRY_VERIFY_WITH_TIMEOUT(root->property("success").toBool(), 100);
-+}
-+
-+class ResetInConstructorModel : public BaseAbstractItemModel
-+{
-+ Q_OBJECT
-+ QML_ELEMENT
-+
-+public:
-+ ResetInConstructorModel()
-+ {
-+ beginResetModel();
-+ QTimer::singleShot(0, this, &ResetInConstructorModel::finishReset);
-+ }
-+
-+private:
-+ void finishReset()
-+ {
-+ mValues.append("First");
-+ endResetModel();
-+ }
-+};
-+
-+void tst_QQmlDelegateModel::resetInQAIMConstructor()
-+{
-+ qmlRegisterTypesAndRevisions<ResetInConstructorModel>("Test", 1);
-+
-+ QQuickApplicationHelper helper(this, "resetInQAIMConstructor.qml");
-+ QVERIFY2(helper.ready, helper.failureMessage());
-+ QQuickWindow *window = helper.window;
-+ window->show();
-+ QVERIFY(QTest::qWaitForWindowExposed(window));
-+
-+ auto *listView = window->property("listView").value<QQuickListView *>();
-+ QVERIFY(listView);
-+ QTRY_VERIFY_WITH_TIMEOUT(listView->itemAtIndex(0), 100);
-+ QQuickItem *firstDelegateItem = listView->itemAtIndex(0);
-+ QVERIFY(firstDelegateItem);
-+ QCOMPARE(firstDelegateItem->property("display").toString(), "First");
-+}
-+
-+class ResettableModel : public BaseAbstractItemModel
-+{
-+ Q_OBJECT
-+ QML_ELEMENT
-+
-+public:
-+ ResettableModel()
-+ {
-+ mValues.append("First");
-+ }
-+
-+ void callBeginResetModel()
-+ {
-+ beginResetModel();
-+ mValues.clear();
-+ }
-+
-+ void appendData()
-+ {
-+ mValues.append(QString::fromLatin1("Item %1").arg(mValues.size()));
-+ }
-+
-+ void callEndResetModel()
-+ {
-+ endResetModel();
-+ }
-+};
-+
-+// Tests that everything works as expected when calling
beginResetModel/endResetModel
-+// after the QAIM subclass constructor has run.
-+void tst_QQmlDelegateModel::reset()
-+{
-+ qmlRegisterTypesAndRevisions<ResettableModel>("Test", 1);
-+
-+ QQuickApplicationHelper helper(this, "reset.qml");
-+ QVERIFY2(helper.ready, helper.failureMessage());
-+ QQuickWindow *window = helper.window;
-+ window->show();
-+ QVERIFY(QTest::qWaitForWindowExposed(window));
-+
-+ auto *listView = window->property("listView").value<QQuickListView *>();
-+ QVERIFY(listView);
-+ QQuickItem *firstDelegateItem = listView->itemAtIndex(0);
-+ QVERIFY(firstDelegateItem);
-+ QCOMPARE(firstDelegateItem->property("display").toString(), "First");
-+
-+ const auto delegateModel = QQuickItemViewPrivate::get(listView)->model;
-+ QSignalSpy rootIndexChangedSpy(delegateModel,
SIGNAL(rootIndexChanged()));
-+ QVERIFY(rootIndexChangedSpy.isValid());
-+
-+ auto *model = listView->model().value<ResettableModel *>();
-+ model->callBeginResetModel();
-+ model->appendData();
-+ model->callEndResetModel();
-+ // This is verifies that handleModelReset isn't called
-+ // more than once during this process, since it unconditionally emits
rootIndexChanged.
-+ QCOMPARE(rootIndexChangedSpy.count(), 1);
-+
-+ QTRY_VERIFY_WITH_TIMEOUT(listView->itemAtIndex(0), 100);
-+ firstDelegateItem = listView->itemAtIndex(0);
-+ QVERIFY(firstDelegateItem);
-+ QCOMPARE(firstDelegateItem->property("display").toString(), "Item 0");
- }
-
- void tst_QQmlDelegateModel::valueWithoutCallingObjectFirst_data()
-@@ -616,6 +733,79 @@ void
tst_QQmlDelegateModel::viewUpdatedOnDelegateChoiceAffectingRoleChange()
- QVERIFY(returnedValue);
- }
-
-+class ProxySourceModel : public QAbstractListModel
-+{
-+ Q_OBJECT
-+ QML_ELEMENT
-+public:
-+ explicit ProxySourceModel(QObject *parent = nullptr)
-+ : QAbstractListModel(parent)
-+ {
-+ for (int i = 0; i < rows; ++i) {
-+ beginInsertRows(QModelIndex(), i, i);
-+ endInsertRows();
-+ }
-+ }
-+
-+ ~ProxySourceModel() override = default;
-+
-+ int rowCount(const QModelIndex &) const override
-+ {
-+ return rows;
-+ }
-+
-+ QVariant data(const QModelIndex &, int ) const override
-+ {
-+ return "Hello";
-+ }
-+
-+ QHash<int, QByteArray> roleNames() const override
-+ {
-+ QHash<int, QByteArray> roles = QAbstractListModel::roleNames();
-+ roles[Qt::UserRole + 1] = "Name";
-+
-+ return roles;
-+ }
-+
-+ static const int rows = 1;
-+};
-+
-+class ProxyModel : public QSortFilterProxyModel
-+{
-+ Q_OBJECT
-+ QML_ELEMENT
-+ Q_PROPERTY(QAbstractItemModel *sourceModel READ sourceModel WRITE
setSourceModel)
-+
-+public:
-+ explicit ProxyModel(QObject *parent = nullptr)
-+ : QSortFilterProxyModel(parent)
-+ {
-+ }
-+
-+ ~ProxyModel() override = default;
-+};
-+
-+// Checks that the correct amount of delegates are created when using a
proxy
-+// model whose source model is set after a delay.
-+void tst_QQmlDelegateModel::proxyModelWithDelayedSourceModelInListView()
-+{
-+ QTest::failOnWarning();
-+
-+ qmlRegisterTypesAndRevisions<ProxySourceModel>("Test", 1);
-+ qmlRegisterTypesAndRevisions<ProxyModel>("Test", 1);
-+
-+ QQuickApplicationHelper helper(this,
"proxyModelWithDelayedSourceModelInListView.qml");
-+ QVERIFY2(helper.ready, helper.failureMessage());
-+ QQuickWindow *window = helper.window;
-+ window->show();
-+ QVERIFY(QTest::qWaitForWindowExposed(window));
-+
-+ auto *listView = window->property("listView").value<QQuickListView *>();
-+ QVERIFY(listView);
-+ const auto delegateModel = QQuickItemViewPrivate::get(listView)->model;
-+ QTRY_COMPARE(listView->count(), 1);
-+}
-+
- QTEST_MAIN(tst_QQmlDelegateModel)
-
- #include "tst_qqmldelegatemodel.moc"
---
-cgit v1.2.3
-
diff --git a/qt6/sha5sum.txt b/qt6/sha5sum.txt
index 1692ca2..a6245c0 100644
--- a/qt6/sha5sum.txt
+++ b/qt6/sha5sum.txt
@@ -1,28 +1,28 @@
-27e23e3546b4f32be11eaa7e55d0bd1dfd7ef4a089cc4b7021b7bb0be93db118ebfe4ab71882d2b164e622b4cf9bc9fa7b4616b4df600cc7069ae6acb101e2ff
qt3d-everywhere-src-6.8.0.tar.xz
-c2304da058f0acf3120348dc179080a3dc28c9cf3605a22a2e8fe2816e9f0aea7e38b22966f59ee85ce52d4a8ddf5084a5fd24932f31e5b40cb64fc09dbca100
qt5compat-everywhere-src-6.8.0.tar.xz
-7bd9452d4cb85fad88e7d609de93e7c3d55ddd2ac47005c20aaaf057bf339d944b5211d1897d21f9896fe433b7c6954eaffd0e80e725b2f3335a047fe06b0cd9
qtbase-everywhere-src-6.8.0.tar.xz
-f422ea114571f6c01aa0af613614f40d6b11b0551c7de716ddaaba05ac44e9ca631648605e44af4a880961bbcab4b84a4f3a427fcc9462d33769cfb1c69456df
qtcharts-everywhere-src-6.8.0.tar.xz
-4f1e26511265e7085bfe097435e64b4daa0bb4a8287f56753a64437a5eb408c0679afa03e255d1949e382b59496eff600cb0638a9b8cc95278d67ad5cfb9d52b
qtdeclarative-everywhere-src-6.8.0.tar.xz
-5c6ceca4b9f0394889a1aefe5002c07c74190e9286be3d7d96a918525cf9a1cb9aa47098b2b46f7b8989c8670a5f31c119c6a13033e9ea1b182245b45529bce2
qtgraphs-everywhere-src-6.8.0.tar.xz
-92afcbb3294a3734bf47e53d3088f67722c5a72839f3f3f7208894af9e8356fbdc5aadf7858acf24d98c9594bfe6e5ca93ccca6f4b2190b5ac635f1a80ab771b
qthttpserver-everywhere-src-6.8.0.tar.xz
-87d7959a8e5507c22f450c98c28059f44ee1ed9a112c3f0d33689f9569c6d5e4ed9daca7f92ed2e39ccf55ae7d09f87c9fa5b9ac2f921a08d8ffd9cb51db9404
qtimageformats-everywhere-src-6.8.0.tar.xz
-dcbeb6306c58b8809054be070fdcb00c8b3397c934bbd433d3e3152275cbbd662d67c9316a5724a229ec6e2874d5a2d33fa9693f1a0f0c4ffb294b92a0387d49
qtlocation-everywhere-src-6.8.0.tar.xz
-be3f0c633ff4c6e4c23962de638ed58dd949fbce09a82c49dca76a0266d59617988ed85fd6b93a97924b1a4f0a9c378b87f8bc87b0de363a8034c4c7a6028d3d
qtlottie-everywhere-src-6.8.0.tar.xz
-1374db720141d09ca3081b5a7dd6d0f1b4457ab87096b4bfac0b9ab97de1dadf36ded5cf04ae01824fd9e16cfe7f45f45f2ebebc464696a348284462a731388e
qtmultimedia-everywhere-src-6.8.0.tar.xz
-dab8efa74a150f559ee318b519aa44c815785638de60aab02a6d92845b84eec937c9134844f92a9664d7b15acb4d4e66cc62857c98d91f78ac9c95334c7343f7
qtnetworkauth-everywhere-src-6.8.0.tar.xz
-481332f5c436a615681fb9f66ca1eb370f407cd7d258bbda72af1621583d292f9a68b149b6890ce119b450d071ce08808ae1b0aab28ccc498b9c341b52f2469d
qtpositioning-everywhere-src-6.8.0.tar.xz
-961f38845a07cb3792a1dc2c15784f526eb4da4ab6bb69825f7708076acff323ab9364434ad1099ac79a0f047b094f1b9bcd41e038f9520bda3dc361dc2f9529
qtquick3d-everywhere-src-6.8.0.tar.xz
-165d3dcf82c1a37bff31ece9ba3c1441e9dc147e93409dd81b876ff96e7857981eec5ccb8b03beb2fa56163db6d96f346c30788efcc3a675839c4c11176440f9
qtquicktimeline-everywhere-src-6.8.0.tar.xz
-8b045845c1cbb35e1c3c998b940e47b4c69d3cf17256805a1964f51675c6166db472c6a26f081519cbcf0f2ded78315580ffd2637b6c249f5bc7c6aa000f6c1b
qtscxml-everywhere-src-6.8.0.tar.xz
-bead813c30010a8ea65d1ec24c1907a15407283635cc6454c10bf47a4cf22dea6ea2c7e9b9e73870253ed5516f2959b241c17337875894554b2339496c9be057
qtsensors-everywhere-src-6.8.0.tar.xz
-7b55354f64178ec1d5735be2f4b29eab1eb37cd47483f608cb7c0faf18fb35d3989aaee18f67f14c2a446269eb1ee90bc31261333eb314bac63b780ce2a18509
qtserialport-everywhere-src-6.8.0.tar.xz
-fc15e7df6806c29f7c185dfb81a83d45bc0e65887812e09432b992d0606eb0477a6897ee611d490f671d2b2f8f492e0a74a7271b2d0397b5d37596d6217a7b7b
qtshadertools-everywhere-src-6.8.0.tar.xz
-d1e2597f5407775750378844a6daecb27da2c6ffe720e4008e11ade07f183ec4d64c0bd25845bef81d6d0c31f6dafe0df160265f952a050b72d88715379b7720
qtspeech-everywhere-src-6.8.0.tar.xz
-fa5d0869dc17fb6d44343bddd2741ab7b9930dbb6ede53a1e60a816b5efb520d98a1aaf58a04e1f380e03d33b24070305256d6a255f21e575009099c3882404f
qtsvg-everywhere-src-6.8.0.tar.xz
-e477c980446fe421484481537fb9997eca6595dae19e9bc7809d24e7685efb802fb704c97bacc77214070e6b7a0f7346f1537cc143e3fccb309bf14e9c8e8d75
qttools-everywhere-src-6.8.0.tar.xz
-a01cfa1908a1932b1fb11c3efc7f3493f42cc9a6c80f56f1ef18b13677a9bbf3714bffd33e76465b90404b6b43d371de1778ed8dd38cac0b5288f36030e016db
qtvirtualkeyboard-everywhere-src-6.8.0.tar.xz
-6b2258928481813db7037bdbc817f57e14fc7ae66d2a791e03a4f1ebc1eea6ed36782206b3edcbf17e8fa0eb9f45f4d2583865b2b764e8ac303abac40764070c
qtwayland-everywhere-src-6.8.0.tar.xz
-1110d8c5e93146ec23967bb77701f5054b9dc5e0307fc4a9cfb15e2bd3f2505b7bbfc5f07eba6c1c7b30854368c2d50415fd14d1d0871aa0b2d6ccbedce884b6
qtwebchannel-everywhere-src-6.8.0.tar.xz
-80137c6e1d9aaddddb5d81716acb2ddee620a1416e6318104ace377f0259906d3f79b0fbf9d57e13f581554bc14d7f13abc13396022406d3530f5d9014a7eed4
qtwebengine-everywhere-src-6.8.0.tar.xz
-d69a27da6e0d88d3908851ae3f4cf57ef0d4edb6429adaa7378e8857bee1c94a178973695a374e7143ee26d83476c3915d87d9ae4726c259fb93fa32ea595dc1
qtwebsockets-everywhere-src-6.8.0.tar.xz
-00f3756bfeaccf010cc065e641c928997772c61c655948a54df07b5c27fac3dbc29d4fe49c1fc4794559a922844445045ba16c8f03719336ab64cace12728b57
qtwebview-everywhere-src-6.8.0.tar.xz
+8ff647cc209fed963d3d8192c8ff495383c3118c699398ee280832086c1a33b70ef9f5b8486295be842ba2eaf419bdb10241a1371e84be4797665865fd48b6a9
qt3d-everywhere-src-6.8.1.tar.xz
+ef1764820387a6c9461fe4e21e44f77c6e95068d4cb37ea221228f06596b7bdb2cbe971e8646832454749954cbc31942eb882808c1b5b3b4d1efce5cf84bd93b
qt5compat-everywhere-src-6.8.1.tar.xz
+87b7df95a63f7c28bfc7659f19658e4151b9da55b0dc4d34dc0e04c5270254b01a72f8deac0b2fc5543fce8d7542128addb398833de9c3248196aa96b2dd1601
qtbase-everywhere-src-6.8.1.tar.xz
+bd15caaf0a4f06d13a5fc18a2e7063061dd279609d9c6db7f98ca07ce576e7580a7f1fc65cbc291b4fe34287fa01bb7e4409c767c57e201817c5ead96fa5de45
qtcharts-everywhere-src-6.8.1.tar.xz
+f9548ee58ac81eac72f1763647a9f28c16e7ab73bf6bc828574e5194d5209c53440f834a721e9bb74f50d4e437ce2de6eb7c7a13acd8602b3080e95d8929e674
qtdeclarative-everywhere-src-6.8.1.tar.xz
+95689516baeb3eeaabae1c4f1255446bfb79b7875d70b38c4b2c308c54028ae5bc6cbcfe097695e814ab424f0468e7780e061a641e317326a2c89118ba09b85e
qtgraphs-everywhere-src-6.8.1.tar.xz
+889dcfecb0443d49ce1a7a781c91e34b7fc80410ada823df65fbce59362aa85aa5db439eeabb34287d61b64747c450637555ad62b1ecfd8b88674984409ad55a
qthttpserver-everywhere-src-6.8.1.tar.xz
+9e5a7226d904234304ab5f4a884b2a3e42176477687492aaadf10cab9ec92bc512c44a0cd9cae3c1cb2e7224c322e2c15197f1d0f7966f167258a1c2b7b9b360
qtimageformats-everywhere-src-6.8.1.tar.xz
+0d002e99b1e7434814a58e560a0730f0b1f9cc81cfe7d01001b2a2bd213b5ceaa4deaf6693f210f8576d7e76ac32fe22e758bc9c03888e7acfd4440902d454ac
qtlocation-everywhere-src-6.8.1.tar.xz
+d91485385a7296bf5a511e7c3a2ce18c34b959ab96914fbf079901a782e39c9bfce2f0e7ca400740603fc9b15172708ead7b00f995350fc09814206eecbdc0a4
qtlottie-everywhere-src-6.8.1.tar.xz
+77f8e913116ff75cf4602e9c5ee01c48161fb40aaadca0e09ca2f89292071fc6f2918403932b9b0653bbc2b007f25362e0cb84a382baedd67e9e4c31bc414463
qtmultimedia-everywhere-src-6.8.1.tar.xz
+9f6e3b1bcc5921b8c663f9a84884e347eca17554d912188f3f2b6781ff6bd45a5783156425c2084ac214d05e5fa559a05a8881b9a90781154c45da18d3c23338
qtnetworkauth-everywhere-src-6.8.1.tar.xz
+483da18c59375e72641b46218327339e487e1ec1e9463be5ff9d89611c1d8daed28624523632029b3daedaec46e3e0564a9136a3e29933b3267c3d33a922ad35
qtpositioning-everywhere-src-6.8.1.tar.xz
+9845cf84b57b33d0acb29a4c5ea2492ac60367d210b51c4896d6d5b9a33197be007cc02934c1b0dde5ee888641c8104cc4080f1493d0d09ed271fe2d08d2f410
qtquick3d-everywhere-src-6.8.1.tar.xz
+479ec01b1c4ef829bca59458138eeeee0bcca5cee0b93cac01bfd6675ffd7a2bde31784b817760ae9fac908548a7ff581e8ea3f13237433e365471a9c570b8dc
qtquicktimeline-everywhere-src-6.8.1.tar.xz
+294d830569f05450a57fd30741707f7c6d42d07ad9ae03840e41c1382f72f8d3408d9cc1ba16145ede51f5ca510cef87b0ca298991c7697a7c2b58b0db8f8f29
qtscxml-everywhere-src-6.8.1.tar.xz
+565a332120c134099e8fbc7ba3fd1073046d512d8b5523bde3a2f4d353febc6a2a3839410f290ddeff05341fe37b0c8bd4dc4d0e990fa4c43918b944f10884e3
qtsensors-everywhere-src-6.8.1.tar.xz
+3f70261905557330fc2d32f555b0d8bf6abb022030a860f7fad45fcb2489486dcee87d24a624d12526f2a4fc9a73fa55d123db28dc83cf24be33fb0812709cfb
qtserialport-everywhere-src-6.8.1.tar.xz
+774eb2e041b743da12669905bb5b8b4def1100a5b7244172389ce5333bd6d400e39f5c6875c0409390bbf82dbdc606a2254503b0392c16e897198be93ed49b55
qtshadertools-everywhere-src-6.8.1.tar.xz
+a20d89c5bcad354d1896c87bf9c0a401e824b5dcbf0e5c86a72381e8f7f9d5946f10536b7a54d899c2fd6b84018ccd9159be4ffdc84cf2e568b54c688aa1101d
qtspeech-everywhere-src-6.8.1.tar.xz
+5c345e87b957370521ead10bb2fd02433d75a443021b6cf45a88e35f692a346607636ffaf6651f3d289cf4584e8c5732270173743eb79d048b3c580b9e00ec86
qtsvg-everywhere-src-6.8.1.tar.xz
+1f5eb44e86d400858abe21efcadb27537ae213127078d95ee56792b57923573e55fd850042e63ca547cd27ba199196fe9956646dcb285c6f6976a22a7832db52
qttools-everywhere-src-6.8.1.tar.xz
+be90765c490285638c9ed50a4cf666419f178c68f4bf8f0679a77fa4bc240fa31f36335197877813abb52ae70e9c2ec22548824add69aa5d1df14529517fef08
qtvirtualkeyboard-everywhere-src-6.8.1.tar.xz
+34885910532f6049cac09846aa4295e2ce82a1e6af2d3256391c835a406f0c6f679e9c94c06ca8921acf23036ccc747812631a91dc1f355ab20aafd8836e7312
qtwayland-everywhere-src-6.8.1.tar.xz
+43907776dbdea09821819aa6112e56288848b0975be24333977d9177cbba5203bba5841e269dfc7590f40f87a96cbe4c9416e0aba821ff96798b627f2203a51a
qtwebchannel-everywhere-src-6.8.1.tar.xz
+1cab90353894032e23ccccb279e3d0b4269f049879e5033f979b15f28141fd2fb3cae2cd31812811f648ca5b6a115d14790506e07f44cb56475f5865360b0ea6
qtwebengine-everywhere-src-6.8.1.tar.xz
+27b8c8a256f4319bd1f9a78efb4a5109d8677aa285c361787f0499930ea1813d44d56538ec3f1887b83ec4c4a717684efaba59ac9db88f86ee74e79d3d81c6e2
qtwebsockets-everywhere-src-6.8.1.tar.xz
+a40ba675028afafdae6018ec32ac18b4a9f4dc93d53dfb7f8f2e47bbd91ac46d3d2f47dcfb24eebc20ff2d9e85551fd96099c58d93ddea82f21e835da97ab9ee
qtwebview-everywhere-src-6.8.1.tar.xz
diff --git a/qt6/updqt b/qt6/updqt
new file mode 100644
index 0000000..f243789
--- /dev/null
+++ b/qt6/updqt
@@ -0,0 +1,7 @@
+#!/bin/bash
+# a script to summon all qt tarballs and update sha5sum.txt
+
+VV=`grep VERSION= QT6_VERSIONS| cut -d= -f2`
+summon `ls|grep qt`
+SPOOL=/var/spool/sorcery
+sha512sum ${SPOOL}/qt*${VV}*z |sed "s|${SPOOL}/||"> sha5sum.txt
- [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (c82f44bfe3132a8eef660b9151ecaed69d671bf2), Treeve Jelbert, 12/02/2024
Archive powered by MHonArc 2.6.24.