1
=== modified file 'src/UbuntuToolkit/ucthemingextension.cpp'
2
--- src/UbuntuToolkit/ucthemingextension.cpp	2016-09-12 14:07:38 +0000
3
+++ src/UbuntuToolkit/ucthemingextension.cpp	2016-11-01 15:42:15 +0000
4
@@ -95,7 +95,25 @@
5
95
95
6
96
UCItemAttached::~UCItemAttached()
96
UCItemAttached::~UCItemAttached()
7
97
{
97
{
9
98
    QQuickItemPrivate::get(m_item)->removeItemChangeListener(this, QQuickItemPrivate::Parent);
98
    /*
10
99
     * Apparent problem: the UCItemAttached for a given item may be
11
100
     * destructed along with the user data for that item, which
12
101
     * occurs after the QQuickItemPrivate destructor has run, in the
13
102
     * destructor for the base class QObjectPrivate of
14
103
     * QQuickItemPrivate. At that point, the destructors of the
15
104
     * members of QQuickItemPrivate have already been called, so
16
105
     * accessing those members via a member function is invalid.
17
106
     * In particular, the changeListeners list of the
18
107
     * QQuickItemPrivate has already been destructed, so it does
19
108
     * not have much of a chance of removing a listener. We
20
109
     * must detect this and avoid the call to it.  Fortunately
21
110
     * the base class QObjectPrivate has a flag wasDeleted that
22
111
     * should still be valid at this point.
23
112
     */
24
113
    QQuickItemPrivate* itemPriv = QQuickItemPrivate::get(m_item);
25
114
    if (!(itemPriv->wasDeleted)) {
26
115
        itemPriv->removeItemChangeListener(this, QQuickItemPrivate::Parent);
27
116
    }
28
99
}
117
}
29
100
118
30
101
bool UCThemingExtension::isThemed(QQuickItem *item)
119
bool UCThemingExtension::isThemed(QQuickItem *item)
Status:	Merged
Approved by:	Timo Jyrinki on 2016-11-02
Approved revision:	2144
Merged at revision:	2144
Proposed branch:	lp:~zsombi/ubuntu-ui-toolkit/qt57fix
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	30 lines (+19/-1) 1 file modified src/UbuntuToolkit/ucthemingextension.cpp (+19/-1)
To merge this branch:	bzr merge lp:~zsombi/ubuntu-ui-toolkit/qt57fix
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-11-02
Timo Jyrinki		2016-11-01	Approve on 2016-11-02
Review via email: mp+309769@code.launchpad.net