Author: arekm Date: Sun Sep 26 12:14:23 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 3; fix list bug
---- Files affected: packages/qt4: qt4.spec (1.265 -> 1.266) , qt4-qtbug-13567.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/qt4/qt4.spec diff -u packages/qt4/qt4.spec:1.265 packages/qt4/qt4.spec:1.266 --- packages/qt4/qt4.spec:1.265 Sun Sep 26 14:05:22 2010 +++ packages/qt4/qt4.spec Sun Sep 26 14:14:18 2010 @@ -53,7 +53,7 @@ Summary(pt_BR.UTF-8): Estrutura para rodar aplicações GUI Qt Name: qt4 Version: 4.7.0 -Release: 2 +Release: 3 License: LGPL v2.1 or GPL v3.0 Group: X11/Libraries Source0: http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}.tar.gz @@ -78,6 +78,7 @@ Patch7: %{name}-x11_fonts.patch Patch8: %{name}-pl-update.patch Patch9: %{name}-ibase.patch +Patch10: %{name}-qtbug-13567.patch URL: http://www.qtsoftware.com/ %{?with_ibase:BuildRequires: Firebird-devel} BuildRequires: OpenGL-GLU-devel @@ -1393,6 +1394,7 @@ %patch7 -p1 #%patch8 -p1 %patch9 -p1 +%patch10 -p1 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \ mkspecs/common/linux.conf @@ -2320,6 +2322,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.266 2010/09/26 12:14:18 arekm +- rel 3; fix list bug + Revision 1.265 2010/09/26 12:05:22 qboosh - moved plugin dirs to proper packages (based on which package loads particular kind of plugins) - moved codecs plugins from QtGui to QtCore (they are used by QtCore and depend only on QtCore) ================================================================ Index: packages/qt4/qt4-qtbug-13567.patch diff -u /dev/null packages/qt4/qt4-qtbug-13567.patch:1.1 --- /dev/null Sun Sep 26 14:14:24 2010 +++ packages/qt4/qt4-qtbug-13567.patch Sun Sep 26 14:14:18 2010 @@ -0,0 +1,33 @@ +commit 6da6b7099d4e0b49329793e4b90703ec3d868048 +Author: Frank Reininghaus <[email protected]> +Date: Wed Sep 22 10:19:59 2010 +0200 + + QTreeView: do not scroll to top if last item is removed + + When the last item is the current item and is removed, + QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's + viewItems member is cleared. This commit makes sure that viewItems is + restored by calling QTreeView::doItemsLayout() in this case, preventing + that the scroll bar range is set to zero temporarily and the view is + scrolled to the top unexpectedly (this was a regression in 4.7.0: + QTBUG-13567). + + Merge-request: 2481 + Reviewed-by: Olivier Goffart <[email protected]> + +diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp +index b797776..40b51fe 100644 +--- a/src/gui/itemviews/qtreeview.cpp ++++ b/src/gui/itemviews/qtreeview.cpp +@@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars() + if (!viewportSize.isValid()) + viewportSize = QSize(0, 0); + ++ if (viewItems.isEmpty()) { ++ q->doItemsLayout(); ++ } ++ + int itemsInViewport = 0; + if (uniformRowHeights) { + if (defaultItemHeight <= 0) + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4.spec?r1=1.265&r2=1.266&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
