[neon/qt/qtdeclarative/Neon/unstable] debian/patches: refresh patches

Jonathan Riddell null at kde.org
Fri Apr 26 16:32:02 BST 2024


Git commit eb7f0efd952990aee6f231494deff69b65f73730 by Jonathan Riddell.
Committed on 26/04/2024 at 15:32.
Pushed by jriddell into branch 'Neon/unstable'.

refresh patches

M  +8    -8    debian/patches/qtdeclarative.git-3e47ac319b0f53c43cc02a8356c2dec4f0daeef4.patch
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt/qtdeclarative/-/commit/eb7f0efd952990aee6f231494deff69b65f73730

diff --git a/debian/patches/qtdeclarative.git-3e47ac319b0f53c43cc02a8356c2dec4f0daeef4.patch b/debian/patches/qtdeclarative.git-3e47ac319b0f53c43cc02a8356c2dec4f0daeef4.patch
index bece4cb..2c8470e 100644
--- a/debian/patches/qtdeclarative.git-3e47ac319b0f53c43cc02a8356c2dec4f0daeef4.patch
+++ b/debian/patches/qtdeclarative.git-3e47ac319b0f53c43cc02a8356c2dec4f0daeef4.patch
@@ -26,7 +26,7 @@ Index: qtdeclarative/src/quick/items/qquickitemview.cpp
 ===================================================================
 --- qtdeclarative.orig/src/quick/items/qquickitemview.cpp
 +++ qtdeclarative/src/quick/items/qquickitemview.cpp
-@@ -1393,7 +1393,7 @@ qreal QQuickItemView::maxYExtent() const
+@@ -1391,7 +1391,7 @@ qreal QQuickItemView::maxYExtent() const
  {
      Q_D(const QQuickItemView);
      if (d->layoutOrientation() == Qt::Horizontal)
@@ -35,7 +35,7 @@ Index: qtdeclarative/src/quick/items/qquickitemview.cpp
  
      if (d->vData.maxExtentDirty) {
          d->maxExtent = d->maxExtentForAxis(d->vData, false);
-@@ -1421,7 +1421,7 @@ qreal QQuickItemView::maxXExtent() const
+@@ -1419,7 +1419,7 @@ qreal QQuickItemView::maxXExtent() const
  {
      Q_D(const QQuickItemView);
      if (d->layoutOrientation() == Qt::Vertical)
@@ -48,7 +48,7 @@ Index: qtdeclarative/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
 ===================================================================
 --- qtdeclarative.orig/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
 +++ qtdeclarative/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
-@@ -73,6 +73,8 @@ public:
+@@ -75,6 +75,8 @@ public:
      tst_QQuickListView();
  
  private slots:
@@ -57,17 +57,17 @@ Index: qtdeclarative/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
      void init();
      void cleanupTestCase();
      // Test QAbstractItemModel model types
-@@ -300,6 +302,8 @@ private slots:
-     void clickHeaderAndFooterWhenClip();
-     void animatedDelegate();
+@@ -308,6 +310,8 @@ private slots:
+     void singletonModelLifetime();
+     void QTBUG_92809();
  
 +    // 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::animatedDelegat
-     }
+@@ -10250,6 +10254,8 @@ void tst_QQuickListView::QTBUG_92809()
+     QTRY_COMPARE(currentIndex, 9);
  }
  
 +// WARNING: please add new tests to tst_qquicklistview2; this file is too slow to work with.
diff --git a/debian/patches/series b/debian/patches/series
index c7a5b80..f3a9f6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 # Backported patches
 tst_qmldiskcache_big_endian.patch
-qquickitem_no_signals_on_destruction.patch
 
 # Debian patches
 disableopengltests.patch


More information about the Neon-commits mailing list