From: | "Ben de Groot (yngwin)" <yngwin@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in x11-libs/qt-gui/files: 0254-fix-qgraphicsproxywidget-deletion-crash.diff |
Date: | Thu, 01 Jan 2009 21:54:05 |
Message-Id: | E1LIVUQ-0004bR-4E@stork.gentoo.org |
1 | yngwin 09/01/01 21:54:02 |
2 | |
3 | Added: 0254-fix-qgraphicsproxywidget-deletion-crash.diff |
4 | Log: |
5 | Add patch for plasma crashes, bug 253044 |
6 | (Portage version: 2.2_rc20/cvs/Linux 2.6.27-hh7 i686) |
7 | |
8 | Revision Changes Path |
9 | 1.1 x11-libs/qt-gui/files/0254-fix-qgraphicsproxywidget-deletion-crash.diff |
10 | |
11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/files/0254-fix-qgraphicsproxywidget-deletion-crash.diff?rev=1.1&view=markup |
12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/files/0254-fix-qgraphicsproxywidget-deletion-crash.diff?rev=1.1&content-type=text/plain |
13 | |
14 | Index: 0254-fix-qgraphicsproxywidget-deletion-crash.diff |
15 | =================================================================== |
16 | qt-bugs@ issue : none |
17 | Trolltech task ID : None |
18 | applied: no |
19 | author: Alexis Menard <alexis.menard@×××××××××.com> |
20 | |
21 | Fix deletion of a qgraphicsproxywidget if it is in a layout |
22 | |
23 | Will be included in 4.4.4 |
24 | |
25 | Index: src/gui/graphicsview/qgraphicsproxywidget.cpp |
26 | =================================================================== |
27 | --- src/gui/graphicsview/qgraphicsproxywidget.cpp (revision 863839) |
28 | +++ src/gui/graphicsview/qgraphicsproxywidget.cpp (working copy) |
29 | @@ -521,9 +521,8 @@ |
30 | { |
31 | Q_D(QGraphicsProxyWidget); |
32 | if (d->widget) { |
33 | - QWidget *w = d->widget; |
34 | - setWidget(0); |
35 | - delete w; |
36 | + QObject::disconnect(d->widget, SIGNAL(destroyed()), this, SLOT(_q_removeWidgetSlot())); |
37 | + delete d->widget; |
38 | } |
39 | } |