Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Fri Mar 4 14:11:20 CET 2011.
-------- --- libqt4/libqt4-devel-doc-data.changes 2011-03-02 17:45:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc-data.changes 2011-03-03 14:53:42.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Mar 3 14:47 CET 2011 - cgiboude...@gmail.com +- Add qtreeview-fix-QTBUG-16292.diff (picked from http://bugreports.qt.nokia.com/browse/QTBUG-16292) + Fixes a crash inside QTreeView::indexRowSizeHint when the index was already deleted + Will be part of Qt 4.7.3. + Fixes various KDE crashes in KMail(kde#219964), KPackageKit, amarok(kde#260303) + +------------------------------------------------------------------- libqt4-devel-doc.changes: same change libqt4-sql-plugins.changes: same change libqt4.changes: same change calling whatdependson for head-i586 New: ---- qtreeview-fix-QTBUG-16292.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.tNCWWL/_old 2011-03-04 14:10:20.000000000 +0100 +++ /var/tmp/diff_new_pack.tNCWWL/_new 2011-03-04 14:10:20.000000000 +0100 @@ -28,7 +28,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version: 4.7.2 -Release: 1 +Release: 2 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -78,6 +78,8 @@ Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff +Patch124: qtreeview-fix-QTBUG-16292.diff + BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ @@ -134,6 +136,7 @@ %patch120 %endif %patch123 +%patch124 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-devel-doc.spec: same change libqt4-sql-plugins.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.tNCWWL/_old 2011-03-04 14:10:20.000000000 +0100 +++ /var/tmp/diff_new_pack.tNCWWL/_new 2011-03-04 14:10:20.000000000 +0100 @@ -54,7 +54,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN Version: 4.7.2 -Release: 1 +Release: 2 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -95,6 +95,8 @@ Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff +Patch124: qtreeview-fix-QTBUG-16292.diff + BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ @@ -151,6 +153,7 @@ %patch120 %endif %patch123 +%patch124 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++++++ libqt4-devel-doc-data.spec.in ++++++ --- /var/tmp/diff_new_pack.tNCWWL/_old 2011-03-04 14:10:20.000000000 +0100 +++ /var/tmp/diff_new_pack.tNCWWL/_new 2011-03-04 14:10:20.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libqt4-devel-doc-data (Version 4.7.1) +# spec file for package libqt4-devel-doc-data # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ BuildRequires: cups-devel freeglut-devel freetype2-devel libQtWebKit-devel libqt4-devel pkgconfig BuildRequires: alsa-devel gtk2-devel libqt4-sql-sqlite openssl-devel sqlite-devel %if 0%{?suse_version} -BuildRequires: update-desktop-files fdupes +BuildRequires: fdupes update-desktop-files %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-END ++++++ libqt4-devel-doc.spec.in ++++++ --- /var/tmp/diff_new_pack.tNCWWL/_old 2011-03-04 14:10:20.000000000 +0100 +++ /var/tmp/diff_new_pack.tNCWWL/_new 2011-03-04 14:10:20.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libqt4-devel-doc (Version 4.7.1) +# spec file for package libqt4-devel-doc # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: libqt4-devel-doc BuildRequires: cups-devel freeglut-devel libjpeg-devel libpng-devel -BuildRequires: alsa-devel gtk2-devel libqt4-devel sqlite3-devel libQtWebKit-devel +BuildRequires: alsa-devel gtk2-devel libQtWebKit-devel libqt4-devel sqlite3-devel %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif ++++++ libqt4-sql-plugins.spec.in ++++++ --- /var/tmp/diff_new_pack.tNCWWL/_old 2011-03-04 14:10:20.000000000 +0100 +++ /var/tmp/diff_new_pack.tNCWWL/_new 2011-03-04 14:10:20.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libqt4-sql-plugins (Version 4.7.1) +# spec file for package libqt4-sql-plugins # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ qtreeview-fix-QTBUG-16292.diff ++++++ --- src/gui/itemviews/qtreeview.cpp +++ src/gui/itemviews/qtreeview.cpp @@ -2753,6 +2753,7 @@ int start = -1; int end = -1; + int indexRow = index.row(); int count = d->header->count(); bool emptyHeader = (count == 0); QModelIndex parent = index.parent(); @@ -2789,7 +2790,7 @@ int logicalColumn = emptyHeader ? column : d->header->logicalIndex(column); if (d->header->isSectionHidden(logicalColumn)) continue; - QModelIndex idx = d->model->index(index.row(), logicalColumn, parent); + QModelIndex idx = d->model->index(indexRow, logicalColumn, parent); if (idx.isValid()) { QWidget *editor = d->editorForIndex(idx).editor; if (editor && d->persistent.contains(editor)) { @@ -3224,14 +3225,14 @@ if (viewItems.isEmpty()) return 0; const QModelIndex &index = viewItems.at(item).index; + if (!index.isValid()) + return 0; int height = viewItems.at(item).height; - if (height <= 0 && index.isValid()) { + if (height <= 0) { height = q_func()->indexRowSizeHint(index); viewItems[item].height = height; } - if (!index.isValid() || height < 0) - return 0; - return height; + return qMax(height, 0); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
