1
=== modified file 'debian/control'
2
--- debian/control	2014-07-28 15:09:00 +0000
3
+++ debian/control	2014-07-30 12:12:03 +0000
4
@@ -26,6 +26,7 @@
5
26
               qtdeclarative5-doc-html,
26
               qtdeclarative5-doc-html,
6
27
               qtwebkit5-doc-html,
27
               qtwebkit5-doc-html,
7
28
               qtsvg5-doc-html,
28
               qtsvg5-doc-html,
8
29
               libqt5svg5,
9
29
               qtscript5-doc-html,
30
               qtscript5-doc-html,
10
30
               qtmultimedia5-doc-html,
31
               qtmultimedia5-doc-html,
11
31
               unity-action-doc,
32
               unity-action-doc,
12
32
33
13
=== modified file 'modules/Ubuntu/Components/Icon.qml'
14
--- modules/Ubuntu/Components/Icon.qml	2014-07-03 13:30:32 +0000
15
+++ modules/Ubuntu/Components/Icon.qml	2014-07-30 12:12:03 +0000
16
@@ -84,17 +84,37 @@
17
84
84
18
85
    Image {
85
    Image {
19
86
        id: image
86
        id: image
20
87
        anchors.fill: parent
21
87
88
22
88
        /* Necessary so that icons are not loaded before a size is set. */
89
        /* Necessary so that icons are not loaded before a size is set. */
28
89
        property bool ready: false
90
        source: ""
24
90
        Component.onCompleted: ready = true
25
91
26
92
        anchors.fill: parent
27
93
        source: ready && width > 0 && height > 0 && icon.name ? "image://theme/%1".arg(icon.name) : ""
29
94
        sourceSize {
91
        sourceSize {
33
95
            width: width
92
            width: 0
34
96
            height: height
93
            height: 0
35
97
        }
94
        }
36
95
37
96
        Component.onCompleted: update()
38
97
        onWidthChanged: update()
39
98
        onHeightChanged: update()
40
99
        Connections {
41
100
            target: icon
42
101
            onNameChanged: image.update()
43
102
        }
44
103
45
104
        function update() {
46
105
            // only set sourceSize.width, sourceSize.height and source when
47
106
            // icon dimensions are valid, see bug #1349769.
48
107
            if (width > 0 && height > 0 && icon.name) {
49
108
                sourceSize.width = width;
50
109
                sourceSize.height = height;
51
110
                source = "image://theme/%1".arg(icon.name);
52
111
            } else {
53
112
                source = "";
54
113
                sourceSize.width = 0;
55
114
                sourceSize.height = 0;
56
115
            }
57
116
        }
58
117
59
98
        cache: true
118
        cache: true
60
99
        visible: !colorizedImage.active
119
        visible: !colorizedImage.active
61
100
    }
120
    }
62
101
121
63
=== added file 'tests/unit_x11/tst_components/tst_icon.qml'
64
--- tests/unit_x11/tst_components/tst_icon.qml	1970-01-01 00:00:00 +0000
65
+++ tests/unit_x11/tst_components/tst_icon.qml	2014-07-30 12:12:03 +0000
66
@@ -0,0 +1,61 @@
67
1
/*
68
2
 * Copyright 2012 Canonical Ltd.
69
3
 *
70
4
 * This program is free software; you can redistribute it and/or modify
71
5
 * it under the terms of the GNU Lesser General Public License as published by
72
6
 * the Free Software Foundation; version 3.
73
7
 *
74
8
 * This program is distributed in the hope that it will be useful,
75
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
76
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
77
11
 * GNU Lesser General Public License for more details.
78
12
 *
79
13
 * You should have received a copy of the GNU Lesser General Public License
80
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
81
15
 */
82
16
83
17
import QtQuick 2.0
84
18
import QtTest 1.0
85
19
import Ubuntu.Components 1.1
86
20
87
21
Item {
88
22
    width: units.gu(50)
89
23
    height: units.gu(50)
90
24
91
25
    Row {
92
26
        anchors.centerIn: parent
93
27
        height: units.gu(10)
94
28
        width: childrenRect.width
95
29
96
30
        Icon {
97
31
            // Fails to load the icon when suru-icon-theme or libqt5svg5 are
98
32
            // not installed. This causes a warning and rejection
99
33
            // by jenkins continuous integration.
100
34
            name: "add"
101
35
            height: parent.height
102
36
            width: height
103
37
        }
104
38
        Icon {
105
39
            // Fails when the icon is becoming invisible when non-atomic updates
106
40
            // cause sourceSize.width or sourceSize.height to be 0 before other
107
41
            // properties are updated.
108
42
            id: icon
109
43
            width: visible ? units.gu(10) : 0
110
44
            height: width
111
45
            name: "search"
112
46
        }
113
47
    }
114
48
115
49
    TestCase {
116
50
        name: "Icon"
117
51
        when: windowShown
118
52
119
53
        function test_updateIconSize_bug1349769() {
120
54
            icon.visible = false;
121
55
            // causes "QML Image: Failed to get image from provider: image://theme/search"
122
56
            // warning when sourceSize.width or sourceSize.height becomes 0 while
123
57
            // while still trying to render the icon. Tests will pass with the warning, but
124
58
            // the MR is rejected by jenkins continuous integration.
125
59
        }
126
60
    }
127
61
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-07-30
Zsombor Egri		2014-07-30	Approve on 2014-07-30
Review via email: mp+228832@code.launchpad.net