rpms/qt4/FC-6 qt-x11-opensource-src-4.2.3-qt#153635.patch, NONE, 1.1 qt4.spec, 1.36, 1.37

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Wed May 16 18:37:59 UTC 2007


Author: rdieter

Update of /cvs/pkgs/rpms/qt4/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18219

Modified Files:
	qt4.spec 
Added Files:
	qt-x11-opensource-src-4.2.3-qt#153635.patch 
Log Message:
* Wed May 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-8
- QFileDialog file wrapping patch (qt#153635, rh#236908)
- License: GPL, dropping LICENSE.QPL (#237702)


qt-x11-opensource-src-4.2.3-qt#153635.patch:

--- NEW FILE qt-x11-opensource-src-4.2.3-qt#153635.patch ---
--- qt-x11-opensource-src-4.2.3/src/gui/itemviews/qlistview.cpp.236908	2007-02-21 03:58:48.000000000 -0600
+++ qt-x11-opensource-src-4.2.3/src/gui/itemviews/qlistview.cpp	2007-05-02 12:27:45.000000000 -0500
@@ -1464,6 +1464,7 @@
 {
     Q_D(QListView);
     if (d->model->columnCount(d->root) > 0) { // no columns means no contents
+        d->batchStartRow = 0;
         if (layoutMode() == SinglePass)
             d->doItemsLayout(d->model->rowCount(d->root)); // layout everything
         else if (!d->batchLayoutTimer.isActive())


Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/FC-6/qt4.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- qt4.spec	25 Apr 2007 15:37:39 -0000	1.36
+++ qt4.spec	16 May 2007 18:37:25 -0000	1.37
@@ -39,6 +39,9 @@
 Patch3: utf8-bug-qt4-2.diff
 ## qt-copy patches
 Patch0154: 0154-qdbuscpp2xml-moc_path.diff
+## upstream patches
+#  http://www.trolltech.com/developer/task-tracker/?method=entry&id=153635
+Patch153635: qt-x11-opensource-src-4.2.3-qt#153635.patch
 
 Source10: qt4-wrapper.sh
 Source11: qt4.sh
@@ -224,6 +227,7 @@
 %patch2 -p1
 %patch3 -p0 -b .utf8-bug
 %patch0154 -p0 -b .qt-copy#0154
+%patch153635 -p1 -b .qt#153635
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -560,7 +564,8 @@
 
 
 %changelog
-* Tue Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-8
+* Wed May 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-8
+- QFileDialog file wrapping patch (qt#153635, rh#236908)
 - License: GPL, dropping LICENSE.QPL (#237702)
 
 * Thu Mar 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-7




More information about the fedora-extras-commits mailing list