1
=== modified file 'src/Ubuntu/Components/plugin/uclabel.cpp'
2
--- src/Ubuntu/Components/plugin/uclabel.cpp	2016-03-14 18:56:42 +0000
3
+++ src/Ubuntu/Components/plugin/uclabel.cpp	2016-03-25 10:23:59 +0000
4
@@ -105,7 +105,8 @@
5
105
}
105
}
6
106
UCLabel::~UCLabel()
106
UCLabel::~UCLabel()
7
107
{
107
{
9
108
    delete d_ptr;
108
    // disconnect functor, so QQuickItem's enabledChanged won't call into the invalid functor
10
109
    disconnect(this, &UCLabel::enabledChanged, this, &UCLabel::postThemeChanged);
11
109
}
110
}
12
110
111
13
111
QColor UCLabelPrivate::getDefaultColor(QQuickItem *item, UCTheme *theme)
112
QColor UCLabelPrivate::getDefaultColor(QQuickItem *item, UCTheme *theme)
14
112
113
15
=== modified file 'src/Ubuntu/Components/plugin/uclabel.h'
16
--- src/Ubuntu/Components/plugin/uclabel.h	2016-03-11 19:28:41 +0000
17
+++ src/Ubuntu/Components/plugin/uclabel.h	2016-03-25 10:23:59 +0000
18
@@ -87,12 +87,10 @@
19
87
    void fontSizeChanged();
87
    void fontSizeChanged();
20
88
88
21
89
private:
89
private:
22
90
    QScopedPointer<UCLabelPrivate> d_ptr;
23
91
    Q_DECLARE_PRIVATE_D(d_ptr.data(), UCLabel)
24
92
    Q_DISABLE_COPY(UCLabel)
25
90
    Q_PRIVATE_SLOT(d_func(), void updateRenderType())
93
    Q_PRIVATE_SLOT(d_func(), void updateRenderType())
26
91
27
92
    UCLabelPrivate *d_ptr;
28
93
    Q_DECLARE_PRIVATE(UCLabel)
29
94
30
95
    Q_DISABLE_COPY(UCLabel)
31
96
};
94
};
32
97
95
33
98
QML_DECLARE_TYPE(UCLabel)
96
QML_DECLARE_TYPE(UCLabel)
34
99
97
35
=== modified file 'tests/unit_x11/tst_components/tst_label_extras.qml'
36
--- tests/unit_x11/tst_components/tst_label_extras.qml	2016-03-14 18:56:42 +0000
37
+++ tests/unit_x11/tst_components/tst_label_extras.qml	2016-03-25 10:23:59 +0000
38
@@ -16,7 +16,7 @@
39
16
16
40
17
import QtQuick 2.4
17
import QtQuick 2.4
41
18
import QtTest 1.0
18
import QtTest 1.0
43
19
import Ubuntu.Test 1.0
19
import Ubuntu.Test 1.3
44
20
import Ubuntu.Components 1.3
20
import Ubuntu.Components 1.3
45
21
21
46
22
Item {
22
Item {
47
@@ -43,6 +43,22 @@
48
43
        }
43
        }
49
44
    }
44
    }
50
45
45
51
46
    Component {
52
47
        id: labelModel
53
48
        ListView {
54
49
            anchors.fill: parent
55
50
            model: [ "Lorem ipsum dolor sit amet" ]
56
51
            enabled: false
57
52
            delegate: Label {
58
53
                id: ubuntuIdLabel
59
54
                objectName: "ubuntuIdLabel"
60
55
                text: modelData
61
56
                elide: Text.ElideRight
62
57
                property string email: modelData
63
58
            }
64
59
        }
65
60
    }
66
61
67
46
    Loader {
62
    Loader {
68
47
        id: testLoader
63
        id: testLoader
69
48
    }
64
    }
70
@@ -77,5 +93,10 @@
71
77
            theme.palette.normal.backgroundText = UbuntuColors.blue;
93
            theme.palette.normal.backgroundText = UbuntuColors.blue;
72
78
            verify(test.color != theme.palette.normal.backgroundText);
94
            verify(test.color != theme.palette.normal.backgroundText);
73
79
        }
95
        }
74
96
75
97
        function test_label_destruction_crash_bug1560044() {
76
98
            var test = loadTest(labelModel);
77
99
            testLoader.sourceComponent = null;
78
100
        }
79
80
    }
101
    }
80
81
}
102
}
81
82
103
82
=== modified file 'tests/unit_x11/tst_components/tst_listitem_extras.qml'
83
--- tests/unit_x11/tst_components/tst_listitem_extras.qml	2015-10-26 11:48:44 +0000
84
+++ tests/unit_x11/tst_components/tst_listitem_extras.qml	2016-03-25 10:23:59 +0000
85
@@ -16,7 +16,7 @@
86
16
16
87
17
import QtQuick 2.4
17
import QtQuick 2.4
88
18
import QtTest 1.0
18
import QtTest 1.0
90
19
import Ubuntu.Test 1.0
19
import Ubuntu.Test 1.3
91
20
import Ubuntu.Components 1.3
20
import Ubuntu.Components 1.3
92
21
21
93
22
Item {
22
Item {
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-03-25
Tim Peeters			Approve on 2016-03-25
Zoltan Balogh		2016-03-25	Approve on 2016-03-25
Review via email: mp+290106@code.launchpad.net