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

Carlos De Maine null at kde.org
Fri Nov 29 02:19:16 GMT 2024


Git commit 22d57dd36a953102ad53b37e6524ec894ea33867 by Carlos De Maine.
Committed on 29/11/2024 at 02:19.
Pushed by carlosdem into branch 'Neon/release'.

refresh patches

M  +5    -11   debian/patches/kirigami_crashes.diff
M  +13   -27   debian/patches/network_applet_list.diff
M  +8    -23   debian/patches/network_applet_list_2.diff
M  +15   -22   debian/patches/qtdeclarative.git-104b0d6e88ce6781c9d31cf0dd14dfe99988b789.patch
M  +8    -15   debian/patches/qtdeclarative.git-fbdbed919f59cc7b4520f5aab2149f4c99b63e24.patch

https://invent.kde.org/neon/qt6/qt6-declarative/-/commit/22d57dd36a953102ad53b37e6524ec894ea33867

diff --git a/debian/patches/kirigami_crashes.diff b/debian/patches/kirigami_crashes.diff
index db2ef3c..312d2a9 100644
--- a/debian/patches/kirigami_crashes.diff
+++ b/debian/patches/kirigami_crashes.diff
@@ -1,8 +1,6 @@
-diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
-index bc9f240..7497da1 100644 (file)
 --- a/src/quick/items/qquickitem.cpp
 +++ b/src/quick/items/qquickitem.cpp
-@@ -8751,9 +8751,10 @@ QPointF QQuickItem::mapToItem(const QQuickItem *item, const QPointF &point) cons
+@@ -8756,9 +8756,10 @@
  {
      QPointF p = mapToScene(point);
      if (item) {
@@ -16,7 +14,7 @@ index bc9f240..7497da1 100644 (file)
  
          p = item->mapFromScene(p);
      }
-@@ -8858,9 +8859,10 @@ QPointF QQuickItem::mapFromItem(const QQuickItem *item, const QPointF &point) co
+@@ -8863,9 +8864,10 @@
      QPointF p = point;
      if (item) {
          p = item->mapToScene(point);
@@ -30,11 +28,9 @@ index bc9f240..7497da1 100644 (file)
      }
      return mapFromScene(p);
  }
-diff --git a/tests/auto/quick/qquickitem2/data/mapCoordinatesWithWindows.qml b/tests/auto/quick/qquickitem2/data/mapCoordinatesWithWindows.qml
-index 98fc0e7..1696699 100644 (file)
 --- a/tests/auto/quick/qquickitem2/data/mapCoordinatesWithWindows.qml
 +++ b/tests/auto/quick/qquickitem2/data/mapCoordinatesWithWindows.qml
-@@ -48,4 +48,15 @@ QtObject {
+@@ -48,4 +48,15 @@
              color: "cyan"
          }
      }
@@ -50,11 +46,9 @@ index 98fc0e7..1696699 100644 (file)
 +        }
 +    }
  }
-diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
-index 154c4a6..eb4f62e 100644 (file)
 --- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
 +++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
-@@ -2945,6 +2945,33 @@ void tst_QQuickItem::mapCoordinatesWithWindows()
+@@ -2883,6 +2883,33 @@
          globalItemOffset(childItemInChildWindow, childItemInOtherWindow));
      QCOMPARE(childItemInChildWindow->mapFromItem(childItemInOtherWindow, {0, 0}),
          globalItemOffset(childItemInOtherWindow, childItemInChildWindow));
@@ -87,4 +81,4 @@ index 154c4a6..eb4f62e 100644 (file)
 +        itemWithoutWindowAPos - itemPos);
  }
  
- void tst_QQuickItem::transforms_data()
\ No newline at end of file
+ void tst_QQuickItem::transforms_data()
diff --git a/debian/patches/network_applet_list.diff b/debian/patches/network_applet_list.diff
index 04d7641..37f73ec 100644
--- a/debian/patches/network_applet_list.diff
+++ b/debian/patches/network_applet_list.diff
@@ -1,9 +1,7 @@
 
-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)
+@@ -171,7 +171,6 @@
      , m_transaction(false)
      , m_incubatorCleanupScheduled(false)
      , m_waitingToFetchMore(false)
@@ -11,7 +9,7 @@ index 9af58d7a22..7cfa662aa6 100644
      , m_cacheItems(nullptr)
      , m_items(nullptr)
      , m_persistedItems(nullptr)
-@@ -366,7 +365,6 @@ void QQmlDelegateModelPrivate::connectToAbstractItemModel()
+@@ -365,7 +364,6 @@
      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);
@@ -19,7 +17,7 @@ index 9af58d7a22..7cfa662aa6 100644
      QObject::connect(aim, &QAbstractItemModel::layoutChanged, q, &QQmlDelegateModel::_q_layoutChanged);
  }
  
-@@ -387,7 +385,6 @@ void QQmlDelegateModelPrivate::disconnectFromAbstractItemModel()
+@@ -386,7 +384,6 @@
      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);
@@ -27,7 +25,7 @@ index 9af58d7a22..7cfa662aa6 100644
      QObject::disconnect(aim, &QAbstractItemModel::layoutChanged, q, &QQmlDelegateModel::_q_layoutChanged);
  }
  
-@@ -1898,28 +1895,25 @@ void QQmlDelegateModel::_q_modelAboutToBeReset()
+@@ -1897,28 +1894,25 @@
      Q_D(QQmlDelegateModel);
      if (!d->m_adaptorModel.adaptsAim())
          return;
@@ -75,7 +73,7 @@ index 9af58d7a22..7cfa662aa6 100644
  }
  
  void QQmlDelegateModel::handleModelReset()
-@@ -1929,23 +1923,6 @@ void QQmlDelegateModel::handleModelReset()
+@@ -1928,23 +1922,6 @@
          return;
  
      int oldCount = d->m_count;
@@ -99,11 +97,9 @@ index 9af58d7a22..7cfa662aa6 100644
      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:
+@@ -334,7 +334,6 @@
      QQmlReusableDelegateModelItemsPool m_reusableItemsPool;
      QList<QQDMIncubationTask *> m_finishedIncubating;
      QList<QByteArray> m_watchedRoles;
@@ -111,7 +107,7 @@ index bae8fc8a23..3c7ab9281d 100644
  
      QString m_filterGroup;
  
-@@ -348,7 +347,6 @@ public:
+@@ -348,7 +347,6 @@
      bool m_transaction : 1;
      bool m_incubatorCleanupScheduled : 1;
      bool m_waitingToFetchMore : 1;
@@ -119,11 +115,9 @@ index bae8fc8a23..3c7ab9281d 100644
  
      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
+@@ -29,7 +29,6 @@
          Qt::QmlModelsPrivate
          Qt::QmlPrivate
          Qt::Quick
@@ -131,9 +125,6 @@ index 966f5229df..8d8a90e0a7 100644
          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 @@
@@ -165,9 +156,6 @@ index 0fcd5e8afa..0000000000
 -        }
 -    }
 -}
-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 @@
@@ -199,8 +187,6 @@ index cb1f226737..0000000000
 -        }
 -    }
 -}
-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 @@
@@ -229,7 +215,7 @@ index d9f8b7aeba..2cacda5513 100644
  class tst_QQmlDelegateModel : public QQmlDataTest
  {
      Q_OBJECT
-@@ -32,8 +25,6 @@ public:
+@@ -32,8 +25,6 @@
  
  private slots:
      void resettingRolesRespected();
@@ -238,7 +224,7 @@ index d9f8b7aeba..2cacda5513 100644
      void valueWithoutCallingObjectFirst_data();
      void valueWithoutCallingObjectFirst();
      void qtbug_86017();
-@@ -53,9 +44,16 @@ private slots:
+@@ -53,9 +44,16 @@
      void viewUpdatedOnDelegateChoiceAffectingRoleChange();
  };
  
@@ -256,7 +242,7 @@ index d9f8b7aeba..2cacda5513 100644
      QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override
      {
          if (parent.isValid())
-@@ -93,21 +91,10 @@ public:
+@@ -93,21 +91,10 @@
          return mValues.at(index.row());
      }
  
@@ -279,7 +265,7 @@ index d9f8b7aeba..2cacda5513 100644
  tst_QQmlDelegateModel::tst_QQmlDelegateModel()
      : QQmlDataTest(QT_QMLTEST_DATADIR)
  {
-@@ -166,109 +153,7 @@ void tst_QQmlDelegateModel::resettingRolesRespected()
+@@ -166,109 +153,7 @@
      QObject *root = engine.rootObjects().constFirst();
      QVERIFY(!root->property("success").toBool());
      model->change();
@@ -389,4 +375,4 @@ index d9f8b7aeba..2cacda5513 100644
 +    QTRY_VERIFY(root->property("success").toBool());
  }
  
- void tst_QQmlDelegateModel::valueWithoutCallingObjectFirst_data()
\ No newline at end of file
+ void tst_QQmlDelegateModel::valueWithoutCallingObjectFirst_data()
diff --git a/debian/patches/network_applet_list_2.diff b/debian/patches/network_applet_list_2.diff
index 2d5c6b5..bca0193 100644
--- a/debian/patches/network_applet_list_2.diff
+++ b/debian/patches/network_applet_list_2.diff
@@ -1,5 +1,3 @@
-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 @@
@@ -11,7 +9,7 @@ index 7cfa662aa6..f8de5cba82 100644
  #include <QtQml/qqmlinfo.h>
  
  #include <private/qqmlabstractdelegatecomponent_p.h>
-@@ -409,6 +411,21 @@ void QQmlDelegateModel::setModel(const QVariant &model)
+@@ -408,6 +410,21 @@
          _q_itemsInserted(0, d->adaptorModelCount());
          d->requestMoreIfNecessary();
      }
@@ -33,11 +31,9 @@ index 7cfa662aa6..f8de5cba82 100644
  }
  
  /*!
-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
+@@ -29,6 +29,7 @@
          Qt::QmlModelsPrivate
          Qt::QmlPrivate
          Qt::Quick
@@ -45,9 +41,6 @@ index 8d8a90e0a7..966f5229df 100644
          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 @@
@@ -81,9 +74,6 @@ index 0000000000..b6733bd38c
 +
 +    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 @@
@@ -115,9 +105,6 @@ index 0000000000..0fcd5e8afa
 +        }
 +    }
 +}
-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 @@
@@ -149,8 +136,6 @@ index 0000000000..cb1f226737
 +        }
 +    }
 +}
-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 @@
@@ -181,7 +166,7 @@ index 2cacda5513..3f08d8fc85 100644
  class tst_QQmlDelegateModel : public QQmlDataTest
  {
      Q_OBJECT
-@@ -25,6 +33,8 @@ public:
+@@ -25,6 +33,8 @@
  
  private slots:
      void resettingRolesRespected();
@@ -190,7 +175,7 @@ index 2cacda5513..3f08d8fc85 100644
      void valueWithoutCallingObjectFirst_data();
      void valueWithoutCallingObjectFirst();
      void qtbug_86017();
-@@ -42,18 +52,12 @@ private slots:
+@@ -42,18 +52,12 @@
      void doNotUnrefObjectUnderConstruction();
      void clearCacheDuringInsertion();
      void viewUpdatedOnDelegateChoiceAffectingRoleChange();
@@ -211,7 +196,7 @@ index 2cacda5513..3f08d8fc85 100644
      QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override
      {
          if (parent.isValid())
-@@ -91,10 +95,21 @@ public:
+@@ -91,10 +95,21 @@
          return mValues.at(index.row());
      }
  
@@ -234,7 +219,7 @@ index 2cacda5513..3f08d8fc85 100644
  tst_QQmlDelegateModel::tst_QQmlDelegateModel()
      : QQmlDataTest(QT_QMLTEST_DATADIR)
  {
-@@ -153,7 +168,109 @@ void tst_QQmlDelegateModel::resettingRolesRespected()
+@@ -153,7 +168,109 @@
      QObject *root = engine.rootObjects().constFirst();
      QVERIFY(!root->property("success").toBool());
      model->change();
@@ -345,7 +330,7 @@ index 2cacda5513..3f08d8fc85 100644
  }
  
  void tst_QQmlDelegateModel::valueWithoutCallingObjectFirst_data()
-@@ -616,6 +733,79 @@ void tst_QQmlDelegateModel::viewUpdatedOnDelegateChoiceAffectingRoleChange()
+@@ -616,6 +733,79 @@
      QVERIFY(returnedValue);
  }
  
@@ -424,4 +409,4 @@ index 2cacda5513..3f08d8fc85 100644
 +
  QTEST_MAIN(tst_QQmlDelegateModel)
  
- #include "tst_qqmldelegatemodel.moc"
\ No newline at end of file
+ #include "tst_qqmldelegatemodel.moc"
diff --git a/debian/patches/qtdeclarative.git-104b0d6e88ce6781c9d31cf0dd14dfe99988b789.patch b/debian/patches/qtdeclarative.git-104b0d6e88ce6781c9d31cf0dd14dfe99988b789.patch
index c0f0ff2..c40ef87 100644
--- a/debian/patches/qtdeclarative.git-104b0d6e88ce6781c9d31cf0dd14dfe99988b789.patch
+++ b/debian/patches/qtdeclarative.git-104b0d6e88ce6781c9d31cf0dd14dfe99988b789.patch
@@ -29,11 +29,9 @@ Reviewed-by: Fabian Kosmale <fabian.kosmale at qt.io>
  src/qml/memory/qv4mm_p.h | 64 ++++++++++++++++++++++++++++--------------------
  2 files changed, 73 insertions(+), 51 deletions(-)
 
-diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp
-index 0ef32d5273a..d9f4541aec9 100644
 --- a/src/qml/memory/qv4mm.cpp
 +++ b/src/qml/memory/qv4mm.cpp
-@@ -60,6 +60,8 @@ Q_LOGGING_CATEGORY(lcGcStats, "qt.qml.gc.statistics")
+@@ -60,6 +60,8 @@
  Q_DECLARE_LOGGING_CATEGORY(lcGcStats)
  Q_LOGGING_CATEGORY(lcGcAllocatorStats, "qt.qml.gc.allocatorStats")
  Q_DECLARE_LOGGING_CATEGORY(lcGcAllocatorStats)
@@ -42,7 +40,7 @@ index 0ef32d5273a..d9f4541aec9 100644
  
  using namespace WTF;
  
-@@ -680,27 +682,27 @@ GCState markStart(GCStateMachine *that, ExtraData &)
+@@ -680,27 +682,27 @@
      //Initialize the mark stack
      that->mm->m_markStack = std::make_unique<MarkStack>(that->mm->engine);
      that->mm->engine->isGCOngoing = true;
@@ -75,7 +73,7 @@ index 0ef32d5273a..d9f4541aec9 100644
  }
  
  static constexpr int markLoopIterationCount = 1024;
-@@ -717,35 +719,35 @@ bool wasDrainNecessary(MarkStack *ms, QDeadlineTimer deadline)
+@@ -717,35 +719,35 @@
  GCState markPersistentValues(GCStateMachine *that, ExtraData &stateData) {
      auto markStack = that->mm->markStack();
      if (wasDrainNecessary(markStack, that->deadline) && that->deadline.hasExpired())
@@ -117,7 +115,7 @@ index 0ef32d5273a..d9f4541aec9 100644
          QObjectWrapper *qobjectWrapper = (*it).as<QObjectWrapper>();
          ++it;
          if (!qobjectWrapper)
-@@ -766,25 +768,25 @@ GCState markWeakValues(GCStateMachine *that, ExtraData &stateData)
+@@ -766,25 +768,25 @@
          if (keepAlive)
              qobjectWrapper->mark(that->mm->markStack());
      }
@@ -148,7 +146,7 @@ index 0ef32d5273a..d9f4541aec9 100644
  }
  
  /** \!internal
-@@ -801,9 +803,9 @@ GCState initCallDestroyObjects(GCStateMachine *that, ExtraData &stateData)
+@@ -801,9 +803,9 @@
      // as we don't have a deletion barrier, we need to rescan the stack
      redrain(that);
      if (!that->mm->m_weakValues)
@@ -160,7 +158,7 @@ index 0ef32d5273a..d9f4541aec9 100644
  }
  GCState callDestroyObject(GCStateMachine *that, ExtraData &stateData)
  {
-@@ -816,7 +818,7 @@ GCState callDestroyObject(GCStateMachine *that, ExtraData &stateData)
+@@ -816,7 +818,7 @@
      // avoid repeatedly hitting the timer constantly by batching iterations
      for (int i = 0; i < markLoopIterationCount; ++i) {
          if (!it.p)
@@ -169,7 +167,7 @@ index 0ef32d5273a..d9f4541aec9 100644
          Managed *m = (*it).managed();
          ++it;
          if (!m || m->markBit())
-@@ -826,7 +828,7 @@ GCState callDestroyObject(GCStateMachine *that, ExtraData &stateData)
+@@ -826,7 +828,7 @@
          if (QObjectWrapper *qobjectWrapper = m->as<QObjectWrapper>())
              qobjectWrapper->destroyObject(/*lastSweep =*/false);
      }
@@ -178,7 +176,7 @@ index 0ef32d5273a..d9f4541aec9 100644
  }
  
  void freeWeakMaps(MemoryManager *mm)
-@@ -843,7 +845,7 @@ void freeWeakMaps(MemoryManager *mm)
+@@ -843,7 +845,7 @@
  GCState freeWeakMaps(GCStateMachine *that, ExtraData &)
  {
      freeWeakMaps(that->mm);
@@ -187,7 +185,7 @@ index 0ef32d5273a..d9f4541aec9 100644
  }
  
  void freeWeakSets(MemoryManager *mm)
-@@ -861,13 +863,13 @@ void freeWeakSets(MemoryManager *mm)
+@@ -861,13 +863,13 @@
  GCState freeWeakSets(GCStateMachine *that, ExtraData &)
  {
      freeWeakSets(that->mm);
@@ -203,7 +201,7 @@ index 0ef32d5273a..d9f4541aec9 100644
  }
  
  GCState doSweep(GCStateMachine *that, ExtraData &)
-@@ -891,7 +893,7 @@ GCState doSweep(GCStateMachine *that, ExtraData &)
+@@ -891,7 +893,7 @@
  
      mm->updateUnmanagedHeapSizeGCLimit();
  
@@ -212,7 +210,7 @@ index 0ef32d5273a..d9f4541aec9 100644
  }
  
  }
-@@ -1491,8 +1493,12 @@ void GCStateMachine::transition() {
+@@ -1491,8 +1493,12 @@
                  */
                  redrain(this);
              }
@@ -225,7 +223,7 @@ index 0ef32d5273a..d9f4541aec9 100644
              if (stateInfo.breakAfter)
                  break;
          }
-@@ -1505,8 +1511,12 @@ void GCStateMachine::transition() {
+@@ -1505,8 +1511,12 @@
      } else {
          deadline = QDeadlineTimer::Forever;
          while (state != GCState::Invalid) {
@@ -238,17 +236,15 @@ index 0ef32d5273a..d9f4541aec9 100644
          }
      }
  }
-@@ -1514,3 +1524,5 @@ void GCStateMachine::transition() {
+@@ -1514,3 +1524,5 @@
  } // namespace QV4
  
  QT_END_NAMESPACE
 +
 +#include "moc_qv4mm_p.cpp"
-diff --git a/src/qml/memory/qv4mm_p.h b/src/qml/memory/qv4mm_p.h
-index ef0cd0c36c5..9cdebdb1f47 100644
 --- a/src/qml/memory/qv4mm_p.h
 +++ b/src/qml/memory/qv4mm_p.h
-@@ -28,40 +28,48 @@ QT_BEGIN_NAMESPACE
+@@ -28,40 +28,48 @@
  
  namespace QV4 {
  
@@ -324,7 +320,7 @@ index ef0cd0c36c5..9cdebdb1f47 100644
      using ExtraData = GCStateInfo::ExtraData;
      GCState state{GCState::Invalid};
      std::chrono::microseconds timeLimit{};
-@@ -94,6 +102,8 @@ struct GCStateMachine {
+@@ -94,6 +102,8 @@
      }
  };
  
@@ -333,6 +329,3 @@ index ef0cd0c36c5..9cdebdb1f47 100644
  
  struct ChunkAllocator;
  struct MemorySegment;
--- 
-2.16.3
-
diff --git a/debian/patches/qtdeclarative.git-fbdbed919f59cc7b4520f5aab2149f4c99b63e24.patch b/debian/patches/qtdeclarative.git-fbdbed919f59cc7b4520f5aab2149f4c99b63e24.patch
index bf71190..3a017e5 100644
--- a/debian/patches/qtdeclarative.git-fbdbed919f59cc7b4520f5aab2149f4c99b63e24.patch
+++ b/debian/patches/qtdeclarative.git-fbdbed919f59cc7b4520f5aab2149f4c99b63e24.patch
@@ -19,11 +19,9 @@ Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot at qt-project.org>
  tests/auto/qml/qv4mm/tst_qv4mm.cpp      | 36 +++++++++++++++++++++++++++++++++
  2 files changed, 55 insertions(+), 2 deletions(-)
 
-diff --git a/src/qml/jsruntime/qv4qobjectwrapper_p.h b/src/qml/jsruntime/qv4qobjectwrapper_p.h
-index 826930cd255..a2538e7d5d5 100644
 --- a/src/qml/jsruntime/qv4qobjectwrapper_p.h
 +++ b/src/qml/jsruntime/qv4qobjectwrapper_p.h
-@@ -222,6 +222,19 @@ private:
+@@ -222,6 +222,19 @@
  
  Q_DECLARE_OPERATORS_FOR_FLAGS(QObjectWrapper::Flags)
  
@@ -43,7 +41,7 @@ index 826930cd255..a2538e7d5d5 100644
  inline ReturnedValue QObjectWrapper::wrap(ExecutionEngine *engine, QObject *object)
  {
      if (Q_UNLIKELY(QQmlData::wasDeleted(object)))
-@@ -233,7 +246,9 @@ inline ReturnedValue QObjectWrapper::wrap(ExecutionEngine *engine, QObject *obje
+@@ -233,7 +246,9 @@
          return ddata->jsWrapper.value();
      }
  
@@ -54,7 +52,7 @@ index 826930cd255..a2538e7d5d5 100644
  }
  
  // Unfortunately we still need a non-const QObject* here because QQmlData needs to register itself in QObjectPrivate.
-@@ -242,7 +257,9 @@ inline ReturnedValue QObjectWrapper::wrapConst(ExecutionEngine *engine, QObject
+@@ -242,7 +257,9 @@
      if (Q_UNLIKELY(QQmlData::wasDeleted(object)))
          return QV4::Encode::null();
  
@@ -65,20 +63,18 @@ index 826930cd255..a2538e7d5d5 100644
  }
  
  inline bool canConvert(const QQmlPropertyCache *fromMo, const QQmlPropertyCache *toMo)
-diff --git a/tests/auto/qml/qv4mm/tst_qv4mm.cpp b/tests/auto/qml/qv4mm/tst_qv4mm.cpp
-index 7859d105510..6f502c73310 100644
 --- a/tests/auto/qml/qv4mm/tst_qv4mm.cpp
 +++ b/tests/auto/qml/qv4mm/tst_qv4mm.cpp
-@@ -46,6 +46,7 @@ private slots:
+@@ -44,6 +44,7 @@
+     void weakValuesAssignedAfterThePhaseThatShouldHandleWeakValues();
+     void mapAndSetKeepValuesAlive();
      void jittedStoreLocalMarksValue();
-     void forInOnProxyMarksTarget();
-     void allocWithMemberDataMidwayDrain();
 +    void markObjectWrappersAfterMarkWeakValues();
  };
  
  tst_qv4mm::tst_qv4mm()
-@@ -795,6 +796,41 @@ void tst_qv4mm::allocWithMemberDataMidwayDrain()
-     QVERIFY(o); // dummy check
+@@ -730,6 +731,41 @@
+     QCOMPARE(result, 0);
  }
  
 +void tst_qv4mm::markObjectWrappersAfterMarkWeakValues()
@@ -119,6 +115,3 @@ index 7859d105510..6f502c73310 100644
  QTEST_MAIN(tst_qv4mm)
  
  #include "tst_qv4mm.moc"
--- 
-2.16.3
-


More information about the Neon-commits mailing list