[neon/qt6/qt6-base/Neon/release] debian/patches: refresh patches

[Carlos De Maine]

Git commit c24abc0b7f185f01bac4e8ed8672f7aa85e7a9e2 by Carlos De Maine.
Committed on 03/12/2024 at 03:28.
Pushed by carlosdem into branch 'Neon/release'.

refresh patches

D  +0    -55   debian/patches/network_applet_list.diff
M  +0    -3    debian/patches/series

https://invent.kde.org/neon/qt6/qt6-base/-/commit/c24abc0b7f185f01bac4e8ed8672f7aa85e7a9e2

diff --git a/debian/patches/network_applet_list.diff b/debian/patches/network_applet_list.diff
deleted file mode 100644
index 633f109..0000000
--- a/debian/patches/network_applet_list.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-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);
diff --git a/debian/patches/series b/debian/patches/series
index 0762d51..874bf2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,6 +14,3 @@ forkfd_grow_stack_upwards_on_hppa.patch
 remove_privacy_breaches.diff
 remove_rpath_from_examples.patch
 
-# https://bugs.kde.org/493116
-# fixed in 6.8.1
-network_applet_list.diff