rev 10517 - in trunk/packages/qt4-x11/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-05-09 20:24:52 +0000 (Fri, 09 May 2008)
New Revision: 10517

Added:
   trunk/packages/qt4-x11/debian/patches/16_qsortfilterproxymodel_invalidate_noscroll.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
Calling QSortFilterProxyModel::invalidate causes view to scroll to the current item/index. This behavior was not present on the Qt4.3.x.

* Patch 16_qsortfilterproxymodel_invalidate_noscroll.diff,  scheduled for Qt 4.4.1 (TT #204403)

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-05-09 20:19:30 UTC (rev 10516)
+++ trunk/packages/qt4-x11/debian/changelog	2008-05-09 20:24:52 UTC (rev 10517)
@@ -9,9 +9,15 @@
   * Add qt-copy patch:
     * 0227-qdatastream-regression
       Fix a bug that causes all Qt3/2 applications to crash or hang under KDE4.
+  
+  +++ Changes by Modestas Vainius:
 
- -- Fathi Boudra <fabo at debian.org>  Fri, 09 May 2008 20:01:24 +0200
+  * Add 16_qsortfilterproxymodel_invalidate_noscroll.diff patch which fixes
+    scrolling to the current item/index on QSortFilterProxyModel::invalidate()
+    This patch has been scheduled for Qt 4.4.1 (TT #204403).
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 09 May 2008 23:23:55 +0300
+
 qt4-x11 (4.4.0-1) unstable; urgency=low
 
   * New upstream release.

Added: trunk/packages/qt4-x11/debian/patches/16_qsortfilterproxymodel_invalidate_noscroll.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/16_qsortfilterproxymodel_invalidate_noscroll.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/16_qsortfilterproxymodel_invalidate_noscroll.diff	2008-05-09 20:24:52 UTC (rev 10517)
@@ -0,0 +1,11 @@
+--- a/src/gui/itemviews/qabstractitemview.cpp	2008-04-28 15:11:18.000000000 +0200
++++ b/src/gui/itemviews/qabstractitemview.cpp	2008-04-10 01:00:58.000000000 +0200
+@@ -2980,7 +2982,7 @@
+     if (q->isVisible()) {
+         q->doItemsLayout();
+         const QModelIndex current = q->currentIndex();
+-        if (current.isValid())
++        if (current.isValid() && state == QAbstractItemView::EditingState)
+             q->scrollTo(current);
+     } else {
+         doDelayedItemsLayout();

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-05-09 20:19:30 UTC (rev 10516)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-05-09 20:24:52 UTC (rev 10517)
@@ -26,6 +26,7 @@
 12_fix_qmake_pkgconfig.diff
 14_add_libraries_to_gui_build_where_actually_needed.diff
 15_fix_qmake_makefile_generation.diff
+16_qsortfilterproxymodel_invalidate_noscroll.diff
 20_mips_atomic_ops.diff
 40_alpha_ice.diff
 41_disable_opengl_visibility.diff