rev 12255 - in trunk/packages/qt4-x11/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Sat Sep 27 07:42:55 UTC 2008
Author: fabo
Date: 2008-09-27 07:42:55 +0000 (Sat, 27 Sep 2008)
New Revision: 12255
Added:
trunk/packages/qt4-x11/debian/patches/0254-fix-qgraphicsproxywidget-deletion-crash.diff
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/patches/0248-fix-qwidget-scroll-slowness.diff
trunk/packages/qt4-x11/debian/patches/series
Log:
* Add qt-copy patches:
- 0254-fix-qgraphicsproxywidget-deletion-crash.diff
Fix deletion of a qgraphicsproxywidget if it is in a layout.
It Will be included in Qt 4.4.4.
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2008-09-26 21:10:17 UTC (rev 12254)
+++ trunk/packages/qt4-x11/debian/changelog 2008-09-27 07:42:55 UTC (rev 12255)
@@ -1,15 +1,21 @@
-qt4-x11 (4.4.2-2) UNRELEASED; urgency=low
+qt4-x11 (4.4.2-2) unstable; urgency=low
+++ Changes by Fathi Boudra:
+
* Add missing Replaces to qt4-qmake.
+ * Add qt-copy patches:
+ - 0254-fix-qgraphicsproxywidget-deletion-crash.diff
+ Fix deletion of a qgraphicsproxywidget if it is in a layout.
+ It Will be included in Qt 4.4.4.
+++ Changes by Ana Beatriz Guerrero Lopez:
+
* Small updates in debian/control:
- Use always Qt 4 instead of Qt4.
- Remove architectures that are not being worked on anymore.
- Some typo.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 18 Sep 2008 18:22:04 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 23 Sep 2008 10:19:36 +0200
qt4-x11 (4.4.2-1) unstable; urgency=low
Modified: trunk/packages/qt4-x11/debian/patches/0248-fix-qwidget-scroll-slowness.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0248-fix-qwidget-scroll-slowness.diff 2008-09-26 21:10:17 UTC (rev 12254)
+++ trunk/packages/qt4-x11/debian/patches/0248-fix-qwidget-scroll-slowness.diff 2008-09-27 07:42:55 UTC (rev 12255)
@@ -1,5 +1,5 @@
-qt-bugs@ issue : none yet
-Trolltech task ID : none yet
+qt-bugs@ issue : N227210
+Trolltech task ID : 228764
bugs.kde.org number : 167739
applied: no
author: Germain Garand <germain at ebooksfrance.org>
Added: trunk/packages/qt4-x11/debian/patches/0254-fix-qgraphicsproxywidget-deletion-crash.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0254-fix-qgraphicsproxywidget-deletion-crash.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0254-fix-qgraphicsproxywidget-deletion-crash.diff 2008-09-27 07:42:55 UTC (rev 12255)
@@ -0,0 +1,23 @@
+qt-bugs@ issue : none
+Trolltech task ID : None
+applied: no
+author: Alexis Menard <alexis.menard at trolltech.com>
+
+Fix deletion of a qgraphicsproxywidget if it is in a layout
+
+Will be included in 4.4.4
+
+--- a/src/gui/graphicsview/qgraphicsproxywidget.cpp
++++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp
+@@ -521,9 +521,8 @@
+ {
+ Q_D(QGraphicsProxyWidget);
+ if (d->widget) {
+- QWidget *w = d->widget;
+- setWidget(0);
+- delete w;
++ QObject::disconnect(d->widget, SIGNAL(destroyed()), this, SLOT(_q_removeWidgetSlot()));
++ delete d->widget;
+ }
+ }
+
Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series 2008-09-26 21:10:17 UTC (rev 12254)
+++ trunk/packages/qt4-x11/debian/patches/series 2008-09-27 07:42:55 UTC (rev 12255)
@@ -13,6 +13,7 @@
0245-fix-randr-changes-detecting.diff
0248-fix-qwidget-scroll-slowness.diff
0249-webkit-stale-frame-pointer.diff
+0254-fix-qgraphicsproxywidget-deletion-crash.diff
# debian patches
01_qmake_for_debian.diff
More information about the pkg-kde-commits
mailing list