[qt] - qsortfilterproxymodel fix (merge_request/934)

[Rex Dieter]

commit 22c56136ae5aa6d8af11e78f2a74aa899560fc42
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jan 6 13:07:58 2011 -0600

    - qsortfilterproxymodel fix (merge_request/934)

 ...-src-4.7.1-qsortfilterproxymodel_merge934.patch |   20 ++++++++++++++++++++
 qt.spec                                            |   11 +++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/qt-everywhere-opensource-src-4.7.1-qsortfilterproxymodel_merge934.patch b/qt-everywhere-opensource-src-4.7.1-qsortfilterproxymodel_merge934.patch
new file mode 100644
index 0000000..e2ec59f
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.7.1-qsortfilterproxymodel_merge934.patch
@@ -0,0 +1,20 @@
+diff -up qt-everywhere-opensource-src-4.7.1/src/gui/itemviews/qsortfilterproxymodel.cpp.merge_934 qt-everywhere-opensource-src-4.7.1/src/gui/itemviews/qsortfilterproxymodel.cpp
+--- qt-everywhere-opensource-src-4.7.1/src/gui/itemviews/qsortfilterproxymodel.cpp.merge_934	2010-11-05 20:55:17.000000000 -0500
++++ qt-everywhere-opensource-src-4.7.1/src/gui/itemviews/qsortfilterproxymodel.cpp	2011-01-06 13:05:52.686846333 -0600
+@@ -782,14 +782,14 @@ void QSortFilterProxyModelPrivate::sourc
+         if (orthogonal_source_to_proxy.isEmpty()) {
+             const int ortho_end = (orient == Qt::Horizontal) ? model->rowCount(source_parent) : model->columnCount(source_parent);
+ 
++            orthogonal_source_to_proxy.resize(ortho_end);
++
+             for (int ortho_item = 0; ortho_item < ortho_end; ++ortho_item) {
+                 if ((orient == Qt::Horizontal) ? q->filterAcceptsRow(ortho_item, source_parent)
+                         : q->filterAcceptsColumn(ortho_item, source_parent)) {
+                     orthogonal_proxy_to_source.append(ortho_item);
+                 }
+             }
+-            orthogonal_source_to_proxy.resize(orthogonal_proxy_to_source.size());
+-
+             if (orient == Qt::Horizontal) {
+                 // We're reacting to columnsInserted, but we've just inserted new rows. Sort them.
+                 sort_source_rows(orthogonal_proxy_to_source, source_parent);
diff --git a/qt.spec b/qt.spec
index 8ee9db5..5eb0417 100644
--- a/qt.spec
+++ b/qt.spec
@@ -18,7 +18,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.7.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@@ -99,6 +99,9 @@ Patch100: qt-everywhere-opensource-src-4.7.1-ml_IN-bz528303.patch
 # http://qt.gitorious.org/qt/qt/commit/6ae84f1183e91c910ca92a55e37f8254ace805c0
 Patch101: qt-everywhere-opensource-src-4.7.1-qtextcursor-crash.patch
 
+# qsortfilterproxymodel merge, http://qt.gitorious.org/qt/qt/merge_requests/934
+Patch102: qt-everywhere-opensource-src-4.7.1-qsortfilterproxymodel_merge934.patch
+
 # kde-qt git patches
 Patch202: 0002-This-patch-makes-override-redirect-windows-popup-men.patch
 Patch204: 0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch
@@ -460,6 +463,7 @@ Qt libraries used for drawing widgets and OpenGL items.
 # upstream patches
 %patch100 -p1 -b .ml_IN-rendering
 %patch101 -p1 -b .qtextcursor-crash
+%patch102 -p1 -b .qsortfilterproxymodel_merge934
 
 # kde-qt branch
 %if 0%{?kde_qt}
@@ -1128,7 +1132,10 @@ fi
 
 
 %changelog
-* Tue Jan 04 2011 Rex Dieter <rdieter at fedoraproject.org> -  4.7.1-8
+* Thu Jan 06 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.1-9
+- qsortfilterproxymodel fix (merge_request/934)
+
+* Tue Jan 04 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.1-8
 - only do Requires: phonon-backend if using qt's phonon
 
 * Fri Dec 24 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7.1-7