summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorModestas Vainius <modestas@vainius.eu>2008-05-09 20:24:52 +0000
committerModestas Vainius <modestas@vainius.eu>2008-05-09 20:24:52 +0000
commit78130caf456310bd45f8576b7c4c501e630b363b (patch)
tree4cd401f37b42d5f1b4b2ab649d1651285e99148a /debian
parentc342689eddc4302bbf2c2684a47a169462d88506 (diff)
downloadqt4-x11-78130caf456310bd45f8576b7c4c501e630b363b.tar.gz
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)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/16_qsortfilterproxymodel_invalidate_noscroll.diff11
-rw-r--r--debian/patches/series1
3 files changed, 19 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 500439e..8bd1cff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,14 @@ qt4-x11 (4.4.0-2) UNRELEASED; urgency=low
* 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:
+
+ * 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).
- -- Fathi Boudra <fabo@debian.org> Fri, 09 May 2008 20:01:24 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 09 May 2008 23:23:55 +0300
qt4-x11 (4.4.0-1) unstable; urgency=low
diff --git a/debian/patches/16_qsortfilterproxymodel_invalidate_noscroll.diff b/debian/patches/16_qsortfilterproxymodel_invalidate_noscroll.diff
new file mode 100644
index 0000000..af51abb
--- /dev/null
+++ b/debian/patches/16_qsortfilterproxymodel_invalidate_noscroll.diff
@@ -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();
diff --git a/debian/patches/series b/debian/patches/series
index 42e9f36..d5eccb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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