From b8d8f1dc1b4cddcb3774c3f1e16ee0d1c17705e1 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin@tigcc.ticalc.org>
Date: Dec 24 2010 22:48:39 +0000
Subject: * Fri Dec 24 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.7.1-7

- fix QTreeView crash triggered by KPackageKit (patch by David Faure)

---

diff --git a/qt-everywhere-opensource-src-4.7.1-qtreeview-kpackagekit-crash.patch b/qt-everywhere-opensource-src-4.7.1-qtreeview-kpackagekit-crash.patch
new file mode 100644
index 0000000..1a52cb3
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.7.1-qtreeview-kpackagekit-crash.patch
@@ -0,0 +1,13 @@
+diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
+index 406e1f6..4691b17 100644
+--- a/src/gui/itemviews/qtreeview.cpp
++++ b/src/gui/itemviews/qtreeview.cpp
+@@ -3223,7 +3223,7 @@ int QTreeViewPrivate::itemHeight(int item) const
+         return defaultItemHeight;
+     if (viewItems.isEmpty())
+         return 0;
+-    const QModelIndex &index = viewItems.at(item).index;
++    QModelIndex index = viewItems.at(item).index;
+     int height = viewItems.at(item).height;
+     if (height <= 0 && index.isValid()) {
+         height = q_func()->indexRowSizeHint(index);
diff --git a/qt.spec b/qt.spec
index 437e6f3..432b7f1 100644
--- a/qt.spec
+++ b/qt.spec
@@ -18,7 +18,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.7.1
-Release: 6%{?dist}
+Release: 7%{?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
@@ -88,6 +88,9 @@ Patch63: qt-everywhere-opensource-src-4.7.0-bpp24.patch
 # Fails to create debug build of Qt projects on mingw (rhbz#653674)
 Patch64: qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch
 
+# fix QTreeView crash triggered by KPackageKit (patch by David Faure)
+Patch65: qt-everywhere-opensource-src-4.7.1-qtreeview-kpackagekit-crash.patch
+
 # upstream patches
 # Reordering of Malayalam Rakar not working properly
 Patch100: qt-everywhere-opensource-src-4.7.1-ml_IN-bz528303.patch
@@ -452,6 +455,7 @@ Qt libraries used for drawing widgets and OpenGL items.
 %patch62 -p1 -b .indic-rendering-bz636399
 %patch63 -p1 -b .bpp24
 %patch64 -p1 -b .QTBUG-14467
+%patch65 -p1 -b .qtreeview-kpackagekit-crash
 
 # upstream patches
 %patch100 -p1 -b .ml_IN-rendering
@@ -1124,6 +1128,9 @@ fi
 
 
 %changelog
+* Fri Dec 24 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.7.1-7
+- fix QTreeView crash triggered by KPackageKit (patch by David Faure)
+
 * Fri Dec 24 2010 Rex Dieter <rdieter@fedoraproject.org> 4.7.1-6
 - rebuild (mysql)