1
=== modified file 'debian/control'
2
--- debian/control	2015-09-18 14:20:22 +0000
3
+++ debian/control	2015-10-20 14:51:06 +0000
4
@@ -78,7 +78,7 @@
5
78
         qml-module-qtsysteminfo,
78
         qml-module-qtsysteminfo,
6
79
         qtdeclarative5-ubuntu-content1,
79
         qtdeclarative5-ubuntu-content1,
7
80
         qtdeclarative5-ubuntu-settings-components (>> 0.6),
80
         qtdeclarative5-ubuntu-settings-components (>> 0.6),
9
81
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1347) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1347),
81
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1584) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1584),
10
82
         suru-icon-theme (>= 14.04+15.04.20150813~),
82
         suru-icon-theme (>= 14.04+15.04.20150813~),
11
83
         whoopsie-preferences (>= 0.9),
83
         whoopsie-preferences (>= 0.9),
12
84
         libsystemsettings1 (= ${binary:Version}),
84
         libsystemsettings1 (= ${binary:Version}),
13
85
85
14
=== modified file 'plugins/about/DevMode.qml'
15
--- plugins/about/DevMode.qml	2015-03-16 13:51:36 +0000
16
+++ plugins/about/DevMode.qml	2015-10-20 14:51:06 +0000
17
@@ -21,11 +21,11 @@
18
21
 *
21
 *
19
22
 */
22
 */
20
23
23
22
24
import QtQuick 2.0
24
import QtQuick 2.4
23
25
import Qt.labs.folderlistmodel 1.0
25
import Qt.labs.folderlistmodel 1.0
24
26
import SystemSettings 1.0
26
import SystemSettings 1.0
27
27
import Ubuntu.Components 0.1
27
import Ubuntu.Components 1.3
28
28
import Ubuntu.Components.ListItems 0.1 as ListItem
28
import Ubuntu.Components.ListItems 1.3 as ListItem
29
29
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
29
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
30
30
import Ubuntu.SystemSettings.StorageAbout 1.0
30
import Ubuntu.SystemSettings.StorageAbout 1.0
31
31
31
32
32
32
33
=== modified file 'plugins/about/EntryComponent.qml'
34
--- plugins/about/EntryComponent.qml	2014-04-10 13:48:36 +0000
35
+++ plugins/about/EntryComponent.qml	2015-10-20 14:51:06 +0000
36
@@ -18,9 +18,9 @@
37
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
38
19
 */
19
 */
39
20
20
43
21
import QtQuick 2.0
21
import QtQuick 2.4
44
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
45
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
46
24
24
47
25
ListItem.Standard {
25
ListItem.Standard {
48
26
    id: root
26
    id: root
49
27
27
50
=== modified file 'plugins/about/License.qml'
51
--- plugins/about/License.qml	2014-09-02 08:42:27 +0000
52
+++ plugins/about/License.qml	2015-10-20 14:51:06 +0000
53
@@ -1,7 +1,7 @@
55
1
import QtQuick 2.0
1
import QtQuick 2.4
56
2
import SystemSettings 1.0
2
import SystemSettings 1.0
59
3
import Ubuntu.Components 0.1
3
import Ubuntu.Components 1.3
60
4
import Ubuntu.Components.ListItems 0.1 as ListItem
4
import Ubuntu.Components.ListItems 1.3 as ListItem
61
5
import Ubuntu.SystemSettings.StorageAbout 1.0
5
import Ubuntu.SystemSettings.StorageAbout 1.0
62
6
6
63
7
ItemPage {
7
ItemPage {
64
8
8
65
=== modified file 'plugins/about/PageComponent.qml'
66
--- plugins/about/PageComponent.qml	2015-08-19 13:54:40 +0000
67
+++ plugins/about/PageComponent.qml	2015-10-20 14:51:06 +0000
68
@@ -18,11 +18,11 @@
69
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
70
19
 */
19
 */
71
20
20
73
21
import QtQuick 2.0
21
import QtQuick 2.4
74
22
import QtSystemInfo 5.0
22
import QtSystemInfo 5.0
75
23
import SystemSettings 1.0
23
import SystemSettings 1.0
78
24
import Ubuntu.Components 0.1
24
import Ubuntu.Components 1.3
79
25
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 1.3 as ListItem
80
26
import Ubuntu.SystemSettings.StorageAbout 1.0
26
import Ubuntu.SystemSettings.StorageAbout 1.0
81
27
import Ubuntu.SystemSettings.Update 1.0
27
import Ubuntu.SystemSettings.Update 1.0
82
28
import MeeGo.QOfono 0.2
28
import MeeGo.QOfono 0.2
83
29
29
84
=== modified file 'plugins/about/SingleValueStacked.qml'
85
--- plugins/about/SingleValueStacked.qml	2014-09-05 14:38:39 +0000
86
+++ plugins/about/SingleValueStacked.qml	2015-10-20 14:51:06 +0000
87
@@ -22,9 +22,9 @@
88
22
 * DRY
22
 * DRY
89
23
 *
23
 *
90
24
 */
24
 */
94
25
import QtQuick 2.0
25
import QtQuick 2.4
95
26
import Ubuntu.Components 0.1
26
import Ubuntu.Components 1.3
96
27
import Ubuntu.Components.ListItems 0.1 as ListItem
27
import Ubuntu.Components.ListItems 1.3 as ListItem
97
28
28
98
29
ListItem.SingleValue {
29
ListItem.SingleValue {
99
30
30
100
31
31
101
=== modified file 'plugins/about/Software.qml'
102
--- plugins/about/Software.qml	2014-03-09 15:21:33 +0000
103
+++ plugins/about/Software.qml	2015-10-20 14:51:06 +0000
104
@@ -1,8 +1,8 @@
106
1
import QtQuick 2.0
1
import QtQuick 2.4
107
2
import Qt.labs.folderlistmodel 1.0
2
import Qt.labs.folderlistmodel 1.0
108
3
import SystemSettings 1.0
3
import SystemSettings 1.0
111
4
import Ubuntu.Components 0.1
4
import Ubuntu.Components 1.3
112
5
import Ubuntu.Components.ListItems 0.1 as ListItem
5
import Ubuntu.Components.ListItems 1.3 as ListItem
113
6
import Ubuntu.SystemSettings.StorageAbout 1.0
6
import Ubuntu.SystemSettings.StorageAbout 1.0
114
7
7
115
8
ItemPage {
8
ItemPage {
116
9
9
117
=== modified file 'plugins/about/Storage.qml'
118
--- plugins/about/Storage.qml	2015-02-18 15:35:11 +0000
119
+++ plugins/about/Storage.qml	2015-10-20 14:51:06 +0000
120
@@ -19,11 +19,11 @@
121
19
 */
19
 */
122
20
20
123
21
import GSettings 1.0
21
import GSettings 1.0
125
22
import QtQuick 2.0
22
import QtQuick 2.4
126
23
import QtSystemInfo 5.0
23
import QtSystemInfo 5.0
127
24
import SystemSettings 1.0
24
import SystemSettings 1.0
130
25
import Ubuntu.Components 0.1
25
import Ubuntu.Components 1.3
131
26
import Ubuntu.Components.ListItems 0.1 as ListItem
26
import Ubuntu.Components.ListItems 1.3 as ListItem
132
27
import Ubuntu.SystemSettings.StorageAbout 1.0
27
import Ubuntu.SystemSettings.StorageAbout 1.0
133
28
28
134
29
ItemPage {
29
ItemPage {
135
30
30
136
=== modified file 'plugins/about/StorageBar.qml'
137
--- plugins/about/StorageBar.qml	2013-09-20 16:14:23 +0000
138
+++ plugins/about/StorageBar.qml	2015-10-20 14:51:06 +0000
139
@@ -1,5 +1,5 @@
142
1
import QtQuick 2.0
1
import QtQuick 2.4
143
2
import Ubuntu.Components 0.1
2
import Ubuntu.Components 1.3
144
3
3
145
4
Item {
4
Item {
146
5
    property bool ready: false
5
    property bool ready: false
147
@@ -9,11 +9,11 @@
148
9
9
149
10
    UbuntuShape {
10
    UbuntuShape {
150
11
        //border.width: 1
11
        //border.width: 1
152
12
        color: "white"
12
        backgroundColor: "white"
153
13
        clip: true
13
        clip: true
154
14
        height: units.gu(3)
14
        height: units.gu(3)
155
15
        width: parent.width
15
        width: parent.width
157
16
        image: ses
16
        source: ses
158
17
    }
17
    }
159
18
18
160
19
    ShaderEffectSource {
19
    ShaderEffectSource {
161
20
20
162
=== modified file 'plugins/about/StorageItem.qml'
163
--- plugins/about/StorageItem.qml	2014-10-24 20:04:30 +0000
164
+++ plugins/about/StorageItem.qml	2015-10-20 14:51:06 +0000
165
@@ -1,5 +1,5 @@
168
1
import QtQuick 2.0
1
import QtQuick 2.4
169
2
import Ubuntu.Components 0.1
2
import Ubuntu.Components 1.3
170
3
3
171
4
Item {
4
Item {
172
5
    property string label
5
    property string label
173
@@ -17,7 +17,7 @@
174
17
            anchors.verticalCenter: parent.verticalCenter
17
            anchors.verticalCenter: parent.verticalCenter
175
18
            width: units.gu(3)
18
            width: units.gu(3)
176
19
            height: units.gu(2)
19
            height: units.gu(2)
178
20
            color: colorName
20
            backgroundColor: colorName
179
21
        }
21
        }
180
22
        Label { text: label }
22
        Label { text: label }
181
23
    }
23
    }
182
24
24
183
=== modified file 'plugins/about/Version.qml'
184
--- plugins/about/Version.qml	2015-07-13 18:26:10 +0000
185
+++ plugins/about/Version.qml	2015-10-20 14:51:06 +0000
186
@@ -22,11 +22,11 @@
187
22
 *
22
 *
188
23
 */
23
 */
189
24
24
191
25
import QtQuick 2.0
25
import QtQuick 2.4
192
26
import Qt.labs.folderlistmodel 1.0
26
import Qt.labs.folderlistmodel 1.0
193
27
import SystemSettings 1.0
27
import SystemSettings 1.0
196
28
import Ubuntu.Components 0.1
28
import Ubuntu.Components 1.3
197
29
import Ubuntu.Components.ListItems 0.1 as ListItem
29
import Ubuntu.Components.ListItems 1.3 as ListItem
198
30
import Ubuntu.SystemSettings.StorageAbout 1.0
30
import Ubuntu.SystemSettings.StorageAbout 1.0
199
31
import Ubuntu.SystemSettings.Update 1.0
31
import Ubuntu.SystemSettings.Update 1.0
200
32
32
201
33
33
202
=== modified file 'plugins/background/Components/AddRemove.qml'
203
--- plugins/background/Components/AddRemove.qml	2014-09-22 17:11:10 +0000
204
+++ plugins/background/Components/AddRemove.qml	2015-10-20 14:51:06 +0000
205
@@ -18,9 +18,9 @@
206
18
 *
18
 *
207
19
*/
19
*/
208
20
20
210
21
import QtQuick 2.0
21
import QtQuick 2.4
211
22
import SystemSettings 1.0
22
import SystemSettings 1.0
213
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
214
24
import "../utilities.js" as Utilities
24
import "../utilities.js" as Utilities
215
25
25
216
26
Row {
26
Row {
217
27
27
218
=== modified file 'plugins/background/Components/HighlightedOverlay.qml'
219
--- plugins/background/Components/HighlightedOverlay.qml	2014-07-04 12:00:55 +0000
220
+++ plugins/background/Components/HighlightedOverlay.qml	2015-10-20 14:51:06 +0000
221
@@ -18,8 +18,8 @@
222
18
 *
18
 *
223
19
*/
19
*/
224
20
20
227
21
import QtQuick 2.0
21
import QtQuick 2.4
228
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
229
23
23
230
24
Rectangle {
24
Rectangle {
231
25
    border.width: units.gu(1)
25
    border.width: units.gu(1)
232
26
26
233
=== modified file 'plugins/background/Components/ListItemsHeader.qml'
234
--- plugins/background/Components/ListItemsHeader.qml	2014-06-30 15:37:42 +0000
235
+++ plugins/background/Components/ListItemsHeader.qml	2015-10-20 14:51:06 +0000
236
@@ -14,9 +14,9 @@
237
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
238
15
 */
15
 */
239
16
16
243
17
import QtQuick 2.0
17
import QtQuick 2.4
244
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
245
19
import Ubuntu.Components.ListItems 0.1 as ListItem
19
import Ubuntu.Components.ListItems 1.3 as ListItem
246
20
20
247
21
Item {
21
Item {
248
22
    property alias text: label.text
22
    property alias text: label.text
249
23
23
250
=== modified file 'plugins/background/Components/OverlayImage.qml'
251
--- plugins/background/Components/OverlayImage.qml	2014-07-04 12:02:53 +0000
252
+++ plugins/background/Components/OverlayImage.qml	2015-10-20 14:51:06 +0000
253
@@ -18,8 +18,8 @@
254
18
 *
18
 *
255
19
*/
19
*/
256
20
20
259
21
import QtQuick 2.0
21
import QtQuick 2.4
260
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
261
23
23
262
24
Item {
24
Item {
263
25
    id: overlayImage
25
    id: overlayImage
264
26
26
265
=== modified file 'plugins/background/Components/SelectedOverlay.qml'
266
--- plugins/background/Components/SelectedOverlay.qml	2014-06-30 15:37:42 +0000
267
+++ plugins/background/Components/SelectedOverlay.qml	2015-10-20 14:51:06 +0000
268
@@ -18,7 +18,7 @@
269
18
 *
18
 *
270
19
*/
19
*/
271
20
20
273
21
import QtQuick 2.0
21
import QtQuick 2.4
274
22
22
275
23
Image {
23
Image {
276
24
    anchors.right: parent.right
24
    anchors.right: parent.right
277
25
25
278
=== modified file 'plugins/background/MainPage.qml'
279
--- plugins/background/MainPage.qml	2015-03-16 13:51:36 +0000
280
+++ plugins/background/MainPage.qml	2015-10-20 14:51:06 +0000
281
@@ -18,13 +18,13 @@
282
18
 *
18
 *
283
19
*/
19
*/
284
20
20
286
21
import QtQuick 2.0
21
import QtQuick 2.4
287
22
import GSettings 1.0
22
import GSettings 1.0
288
23
import SystemSettings 1.0
23
import SystemSettings 1.0
289
24
import Ubuntu.Content 0.1
24
import Ubuntu.Content 0.1
293
25
import Ubuntu.Components 0.1
25
import Ubuntu.Components 1.3
294
26
import Ubuntu.Components.ListItems 0.1 as ListItem
26
import Ubuntu.Components.ListItems 1.3 as ListItem
295
27
import Ubuntu.Components.Popups 0.1
27
import Ubuntu.Components.Popups 1.3
296
28
import Ubuntu.SystemSettings.Background 1.0
28
import Ubuntu.SystemSettings.Background 1.0
297
29
import "utilities.js" as Utilities
29
import "utilities.js" as Utilities
298
30
30
299
31
31
300
=== modified file 'plugins/background/Preview.qml'
301
--- plugins/background/Preview.qml	2014-09-25 17:08:33 +0000
302
+++ plugins/background/Preview.qml	2015-10-20 14:51:06 +0000
303
@@ -18,10 +18,10 @@
304
18
 *
18
 *
305
19
*/
19
*/
306
20
20
308
21
import QtQuick 2.0
21
import QtQuick 2.4
309
22
import SystemSettings 1.0
22
import SystemSettings 1.0
312
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
313
24
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 1.3 as ListItem
314
25
25
315
26
ItemPage {
26
ItemPage {
316
27
    id: preview
27
    id: preview
317
@@ -35,7 +35,6 @@
318
35
    property Item headerStyle: header.__styleInstance ?
35
    property Item headerStyle: header.__styleInstance ?
319
36
                                   header.__styleInstance : null
36
                                   header.__styleInstance : null
320
37
37
321
38
    tools: null
322
39
    Component.onCompleted: {
38
    Component.onCompleted: {
323
40
        /* change the header text color to make it more readable over the background */
39
        /* change the header text color to make it more readable over the background */
324
41
        if (headerStyle.hasOwnProperty("textColor"))
40
        if (headerStyle.hasOwnProperty("textColor"))
325
42
41
326
=== modified file 'plugins/background/WallpaperGrid.qml'
327
--- plugins/background/WallpaperGrid.qml	2014-09-05 13:33:21 +0000
328
+++ plugins/background/WallpaperGrid.qml	2015-10-20 14:51:06 +0000
329
@@ -18,10 +18,10 @@
330
18
 *
18
 *
331
19
*/
19
*/
332
20
20
337
21
import QtQuick 2.0
21
import QtQuick 2.4
338
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
339
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
340
24
import Ubuntu.Components.Popups 0.1
24
import Ubuntu.Components.Popups 1.3
341
25
import "Components"
25
import "Components"
342
26
import "utilities.js" as Utilities
26
import "utilities.js" as Utilities
343
27
27
344
28
28
345
=== modified file 'plugins/battery/PageComponent.qml'
346
--- plugins/battery/PageComponent.qml	2015-08-10 20:04:29 +0000
347
+++ plugins/battery/PageComponent.qml	2015-10-20 14:51:06 +0000
348
@@ -20,11 +20,11 @@
349
20
20
350
21
import GSettings 1.0
21
import GSettings 1.0
351
22
import QMenuModel 0.1
22
import QMenuModel 0.1
353
23
import QtQuick 2.0
23
import QtQuick 2.4
354
24
import QtSystemInfo 5.0
24
import QtSystemInfo 5.0
355
25
import SystemSettings 1.0
25
import SystemSettings 1.0
358
26
import Ubuntu.Components 0.1
26
import Ubuntu.Components 1.3
359
27
import Ubuntu.Components.ListItems 0.1 as ListItem
27
import Ubuntu.Components.ListItems 1.3 as ListItem
360
28
import Ubuntu.SystemSettings.Battery 1.0
28
import Ubuntu.SystemSettings.Battery 1.0
361
29
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
29
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
362
30
import Ubuntu.Settings.Components 0.1 as USC
30
import Ubuntu.Settings.Components 0.1 as USC
363
31
31
364
=== modified file 'plugins/battery/SleepValues.qml'
365
--- plugins/battery/SleepValues.qml	2015-08-05 16:22:55 +0000
366
+++ plugins/battery/SleepValues.qml	2015-10-20 14:51:06 +0000
367
@@ -22,9 +22,9 @@
368
22
// IF YOU RENAME IT YOU MUST UPDATE THE REFERENCE THERE.
22
// IF YOU RENAME IT YOU MUST UPDATE THE REFERENCE THERE.
369
23
23
370
24
import GSettings 1.0
24
import GSettings 1.0
374
25
import QtQuick 2.0
25
import QtQuick 2.4
375
26
import Ubuntu.Components 0.1
26
import Ubuntu.Components 1.3
376
27
import Ubuntu.Components.ListItems 0.1 as ListItem
27
import Ubuntu.Components.ListItems 1.3 as ListItem
377
28
import SystemSettings 1.0
28
import SystemSettings 1.0
378
29
import Ubuntu.SystemSettings.Battery 1.0
29
import Ubuntu.SystemSettings.Battery 1.0
379
30
30
380
31
31
381
=== modified file 'plugins/bluetooth/ConfirmPasskeyDialog.qml'
382
--- plugins/bluetooth/ConfirmPasskeyDialog.qml	2015-08-28 09:32:38 +0000
383
+++ plugins/bluetooth/ConfirmPasskeyDialog.qml	2015-10-20 14:51:06 +0000
384
@@ -19,9 +19,9 @@
385
19
 */
19
 */
386
20
20
387
21
21
391
22
import QtQuick 2.0
22
import QtQuick 2.4
392
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
393
24
import Ubuntu.Components.Popups 0.1
24
import Ubuntu.Components.Popups 1.3
394
25
25
395
26
Dialog {
26
Dialog {
396
27
    id: root
27
    id: root
397
28
28
398
=== modified file 'plugins/bluetooth/DevicePage.qml'
399
--- plugins/bluetooth/DevicePage.qml	2015-08-28 09:32:38 +0000
400
+++ plugins/bluetooth/DevicePage.qml	2015-10-20 14:51:06 +0000
401
@@ -21,9 +21,9 @@
402
21
import QMenuModel 0.1
21
import QMenuModel 0.1
403
22
import QtQuick 2.0
22
import QtQuick 2.0
404
23
import SystemSettings 1.0
23
import SystemSettings 1.0
408
24
import Ubuntu.Components 0.1
24
import Ubuntu.Components 1.3
409
25
import Ubuntu.Components.Popups 0.1
25
import Ubuntu.Components.Popups 1.3
410
26
import Ubuntu.Components.ListItems 0.1 as ListItem
26
import Ubuntu.Components.ListItems 1.3 as ListItem
411
27
import Ubuntu.SystemSettings.Bluetooth 1.0
27
import Ubuntu.SystemSettings.Bluetooth 1.0
412
28
28
413
29
Page {
29
Page {
414
30
30
415
=== modified file 'plugins/bluetooth/DisplayPasskeyDialog.qml'
416
--- plugins/bluetooth/DisplayPasskeyDialog.qml	2015-08-28 09:32:38 +0000
417
+++ plugins/bluetooth/DisplayPasskeyDialog.qml	2015-10-20 14:51:06 +0000
418
@@ -17,9 +17,9 @@
419
17
 */
17
 */
420
18
18
421
19
19
425
20
import QtQuick 2.0
20
import QtQuick 2.4
426
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
427
22
import Ubuntu.Components.Popups 0.1
22
import Ubuntu.Components.Popups 1.3
428
23
23
429
24
Dialog {
24
Dialog {
430
25
    id: root
25
    id: root
431
26
26
432
=== modified file 'plugins/bluetooth/PageComponent.qml'
433
--- plugins/bluetooth/PageComponent.qml	2015-08-28 09:32:38 +0000
434
+++ plugins/bluetooth/PageComponent.qml	2015-10-20 14:51:06 +0000
435
@@ -19,11 +19,11 @@
436
19
 */
19
 */
437
20
20
438
21
import QMenuModel 0.1
21
import QMenuModel 0.1
440
22
import QtQuick 2.0
22
import QtQuick 2.4
441
23
import SystemSettings 1.0
23
import SystemSettings 1.0
445
24
import Ubuntu.Components 0.1
24
import Ubuntu.Components 1.3
446
25
import Ubuntu.Components.Popups 0.1
25
import Ubuntu.Components.Popups 1.3
447
26
import Ubuntu.Components.ListItems 0.1 as ListItem
26
import Ubuntu.Components.ListItems 1.3 as ListItem
448
27
import Ubuntu.SystemSettings.Bluetooth 1.0
27
import Ubuntu.SystemSettings.Bluetooth 1.0
449
28
import Ubuntu.Settings.Components 0.1 as USC
28
import Ubuntu.Settings.Components 0.1 as USC
450
29
29
451
30
30
452
=== modified file 'plugins/bluetooth/ProvidePasskeyDialog.qml'
453
--- plugins/bluetooth/ProvidePasskeyDialog.qml	2015-08-28 09:32:38 +0000
454
+++ plugins/bluetooth/ProvidePasskeyDialog.qml	2015-10-20 14:51:06 +0000
455
@@ -19,9 +19,9 @@
456
19
 */
19
 */
457
20
20
458
21
21
462
22
import QtQuick 2.0
22
import QtQuick 2.4
463
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
464
24
import Ubuntu.Components.Popups 0.1
24
import Ubuntu.Components.Popups 1.3
465
25
25
466
26
Dialog {
26
Dialog {
467
27
    id: root
27
    id: root
468
28
28
469
=== modified file 'plugins/bluetooth/ProvidePinCodeDialog.qml'
470
--- plugins/bluetooth/ProvidePinCodeDialog.qml	2015-08-28 09:32:38 +0000
471
+++ plugins/bluetooth/ProvidePinCodeDialog.qml	2015-10-20 14:51:06 +0000
472
@@ -19,9 +19,9 @@
473
19
 */
19
 */
474
20
20
475
21
21
479
22
import QtQuick 2.0
22
import QtQuick 2.4
480
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
481
24
import Ubuntu.Components.Popups 0.1
24
import Ubuntu.Components.Popups 1.3
482
25
25
483
26
Dialog {
26
Dialog {
484
27
    id: root
27
    id: root
485
28
28
486
=== modified file 'plugins/brightness/PageComponent.qml'
487
--- plugins/brightness/PageComponent.qml	2015-04-07 10:46:52 +0000
488
+++ plugins/brightness/PageComponent.qml	2015-10-20 14:51:06 +0000
489
@@ -19,10 +19,10 @@
490
19
 */
19
 */
491
20
20
492
21
import GSettings 1.0
21
import GSettings 1.0
494
22
import QtQuick 2.0
22
import QtQuick 2.4
495
23
import SystemSettings 1.0
23
import SystemSettings 1.0
498
24
import Ubuntu.Components 0.1
24
import Ubuntu.Components 1.3
499
25
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 1.3 as ListItem
500
26
import Ubuntu.SystemSettings.Brightness 1.0
26
import Ubuntu.SystemSettings.Brightness 1.0
501
27
import Ubuntu.Settings.Menus 0.1 as Menus
27
import Ubuntu.Settings.Menus 0.1 as Menus
502
28
import Ubuntu.Settings.Components 0.1 as USC
28
import Ubuntu.Settings.Components 0.1 as USC
503
29
29
504
=== modified file 'plugins/cellular/Components/DataMultiSim.qml'
505
--- plugins/cellular/Components/DataMultiSim.qml	2015-01-20 12:23:34 +0000
506
+++ plugins/cellular/Components/DataMultiSim.qml	2015-10-20 14:51:06 +0000
507
@@ -17,10 +17,10 @@
508
17
 * Jonas G. Drange <jonas.drange@canonical.com>
17
 * Jonas G. Drange <jonas.drange@canonical.com>
509
18
 *
18
 *
510
19
*/
19
*/
512
20
import QtQuick 2.0
20
import QtQuick 2.4
513
21
import SystemSettings 1.0
21
import SystemSettings 1.0
516
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
517
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
518
24
24
519
25
Column {
25
Column {
520
26
26
521
27
27
522
=== modified file 'plugins/cellular/Components/DefaultSim.qml'
523
--- plugins/cellular/Components/DefaultSim.qml	2014-10-31 18:14:35 +0000
524
+++ plugins/cellular/Components/DefaultSim.qml	2015-10-20 14:51:06 +0000
525
@@ -17,10 +17,10 @@
526
17
 * Jonas G. Drange <jonas.drange@canonical.com>
17
 * Jonas G. Drange <jonas.drange@canonical.com>
527
18
 *
18
 *
528
19
*/
19
*/
530
20
import QtQuick 2.0
20
import QtQuick 2.4
531
21
import SystemSettings 1.0
21
import SystemSettings 1.0
534
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
535
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
536
24
24
537
25
Column {
25
Column {
538
26
26
539
27
27
540
=== modified file 'plugins/cellular/Components/KeyboardRectangle.qml'
541
--- plugins/cellular/Components/KeyboardRectangle.qml	2015-05-08 09:22:05 +0000
542
+++ plugins/cellular/Components/KeyboardRectangle.qml	2015-10-20 14:51:06 +0000
543
@@ -14,7 +14,7 @@
544
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
545
15
 */
15
 */
546
16
16
548
17
import QtQuick 2.2
17
import QtQuick 2.4
549
18
18
550
19
Item {
19
Item {
551
20
    id: keyboardRect
20
    id: keyboardRect
552
21
21
553
=== modified file 'plugins/cellular/Components/LabelTextField.qml'
554
--- plugins/cellular/Components/LabelTextField.qml	2015-05-19 15:09:41 +0000
555
+++ plugins/cellular/Components/LabelTextField.qml	2015-10-20 14:51:06 +0000
556
@@ -16,9 +16,9 @@
557
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
558
17
 */
17
 */
559
18
18
563
19
import QtQuick 2.0
19
import QtQuick 2.4
564
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.3
565
21
import Ubuntu.Components.Themes.Ambiance 0.1
21
import Ubuntu.Components.Themes.Ambiance 1.3
566
22
import Ubuntu.Keyboard 0.1
22
import Ubuntu.Keyboard 0.1
567
23
import SystemSettings 1.0
23
import SystemSettings 1.0
568
24
24
569
25
25
570
=== modified file 'plugins/cellular/Components/MultiSim.qml'
571
--- plugins/cellular/Components/MultiSim.qml	2015-09-10 20:17:14 +0000
572
+++ plugins/cellular/Components/MultiSim.qml	2015-10-20 14:51:06 +0000
573
@@ -17,11 +17,11 @@
574
17
 * Jonas G. Drange <jonas.drange@canonical.com>
17
 * Jonas G. Drange <jonas.drange@canonical.com>
575
18
 *
18
 *
576
19
*/
19
*/
578
20
import QtQuick 2.0
20
import QtQuick 2.4
579
21
import GSettings 1.0
21
import GSettings 1.0
580
22
import SystemSettings 1.0
22
import SystemSettings 1.0
583
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
584
24
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 1.3 as ListItem
585
25
25
586
26
/* This is a temporary solution to the issue of Hotspots failing on mako. If
26
/* This is a temporary solution to the issue of Hotspots failing on mako. If
587
27
the device is mako, we hide the hotspot entry. Will be removed once lp:1434591
27
the device is mako, we hide the hotspot entry. Will be removed once lp:1434591
588
28
28
589
=== modified file 'plugins/cellular/Components/NoSim.qml'
590
--- plugins/cellular/Components/NoSim.qml	2015-02-13 09:50:19 +0000
591
+++ plugins/cellular/Components/NoSim.qml	2015-10-20 14:51:06 +0000
592
@@ -17,8 +17,8 @@
593
17
 * Jonas G. Drange <jonas.drange@canonical.com>
17
 * Jonas G. Drange <jonas.drange@canonical.com>
594
18
 *
18
 *
595
19
*/
19
*/
598
20
import QtQuick 2.0
20
import QtQuick 2.4
599
21
import Ubuntu.Components 1.1
21
import Ubuntu.Components 1.3
600
22
22
601
23
Column {
23
Column {
602
24
24
603
25
25
604
=== modified file 'plugins/cellular/Components/RadioSingleSim.qml'
605
--- plugins/cellular/Components/RadioSingleSim.qml	2015-09-10 20:17:14 +0000
606
+++ plugins/cellular/Components/RadioSingleSim.qml	2015-10-20 14:51:06 +0000
607
@@ -17,10 +17,10 @@
608
17
 * Jonas G. Drange <jonas.drange@canonical.com>
17
 * Jonas G. Drange <jonas.drange@canonical.com>
609
18
 *
18
 *
610
19
*/
19
*/
612
20
import QtQuick 2.0
20
import QtQuick 2.4
613
21
import SystemSettings 1.0
21
import SystemSettings 1.0
616
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
617
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
618
24
24
619
25
Column {
25
Column {
620
26
    id: radioSingleSim
26
    id: radioSingleSim
621
27
27
622
=== modified file 'plugins/cellular/Components/Sim.qml'
623
--- plugins/cellular/Components/Sim.qml	2015-01-21 20:44:20 +0000
624
+++ plugins/cellular/Components/Sim.qml	2015-10-20 14:51:06 +0000
625
@@ -17,7 +17,7 @@
626
17
 * Jonas G. Drange <jonas.drange@canonical.com>
17
 * Jonas G. Drange <jonas.drange@canonical.com>
627
18
 *
18
 *
628
19
*/
19
*/
630
20
import QtQuick 2.0
20
import QtQuick 2.4
631
21
import MeeGo.QOfono 0.2
21
import MeeGo.QOfono 0.2
632
22
22
633
23
Item {
23
Item {
634
24
24
635
=== modified file 'plugins/cellular/Components/SimEditor.qml'
636
--- plugins/cellular/Components/SimEditor.qml	2014-10-31 18:14:35 +0000
637
+++ plugins/cellular/Components/SimEditor.qml	2015-10-20 14:51:06 +0000
638
@@ -17,10 +17,10 @@
639
17
 * Jonas G. Drange <jonas.drange@canonical.com>
17
 * Jonas G. Drange <jonas.drange@canonical.com>
640
18
 *
18
 *
641
19
*/
19
*/
643
20
import QtQuick 2.0
20
import QtQuick 2.4
644
21
import SystemSettings 1.0
21
import SystemSettings 1.0
647
22
import Ubuntu.Components 1.1
22
import Ubuntu.Components 1.3
648
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
649
24
24
650
25
Column {
25
Column {
651
26
    id: simList
26
    id: simList
652
27
27
653
=== modified file 'plugins/cellular/Components/SingleSim.qml'
654
--- plugins/cellular/Components/SingleSim.qml	2015-08-06 17:12:34 +0000
655
+++ plugins/cellular/Components/SingleSim.qml	2015-10-20 14:51:06 +0000
656
@@ -17,10 +17,10 @@
657
17
 * Jonas G. Drange <jonas.drange@canonical.com>
17
 * Jonas G. Drange <jonas.drange@canonical.com>
658
18
 *
18
 *
659
19
*/
19
*/
661
20
import QtQuick 2.0
20
import QtQuick 2.4
662
21
import SystemSettings 1.0
21
import SystemSettings 1.0
665
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
666
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
667
24
24
668
25
Column {
25
Column {
669
26
26
670
27
27
671
=== modified file 'plugins/cellular/Components/StandardAnimation.qml'
672
--- plugins/cellular/Components/StandardAnimation.qml	2015-05-08 09:22:05 +0000
673
+++ plugins/cellular/Components/StandardAnimation.qml	2015-10-20 14:51:06 +0000
674
@@ -14,7 +14,7 @@
675
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
676
15
 */
15
 */
677
16
16
679
17
import QtQuick 2.2
17
import QtQuick 2.4
680
18
18
681
19
NumberAnimation {
19
NumberAnimation {
682
20
    duration: 300
20
    duration: 300
683
21
21
684
=== modified file 'plugins/cellular/PageApnEditor.qml'
685
--- plugins/cellular/PageApnEditor.qml	2015-07-07 14:16:04 +0000
686
+++ plugins/cellular/PageApnEditor.qml	2015-10-20 14:51:06 +0000
687
@@ -19,11 +19,11 @@
688
19
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
19
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
689
20
 */
20
 */
690
21
21
692
22
import QtQuick 2.0
22
import QtQuick 2.4
693
23
import SystemSettings 1.0
23
import SystemSettings 1.0
697
24
import Ubuntu.Components 1.1
24
import Ubuntu.Components 1.3
698
25
import Ubuntu.Components.Popups 1.0
25
import Ubuntu.Components.Popups 1.3
699
26
import Ubuntu.Components.ListItems 1.0 as ListItem
26
import Ubuntu.Components.ListItems 1.3 as ListItem
700
27
import MeeGo.QOfono 0.2
27
import MeeGo.QOfono 0.2
701
28
import "Components" as LocalComponents
28
import "Components" as LocalComponents
702
29
import "apn_editor.js" as Editor
29
import "apn_editor.js" as Editor
703
30
30
704
=== modified file 'plugins/cellular/PageCarrierAndApn.qml'
705
--- plugins/cellular/PageCarrierAndApn.qml	2015-03-27 10:01:48 +0000
706
+++ plugins/cellular/PageCarrierAndApn.qml	2015-10-20 14:51:06 +0000
707
@@ -17,10 +17,10 @@
708
17
 * Jonas G. Drange <jonas.drange@canonical.com>
17
 * Jonas G. Drange <jonas.drange@canonical.com>
709
18
 *
18
 *
710
19
*/
19
*/
712
20
import QtQuick 2.0
20
import QtQuick 2.4
713
21
import SystemSettings 1.0
21
import SystemSettings 1.0
716
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
717
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
718
24
24
719
25
ItemPage {
25
ItemPage {
720
26
    id: root
26
    id: root
721
27
27
722
=== modified file 'plugins/cellular/PageCarriersAndApns.qml'
723
--- plugins/cellular/PageCarriersAndApns.qml	2015-03-27 10:01:48 +0000
724
+++ plugins/cellular/PageCarriersAndApns.qml	2015-10-20 14:51:06 +0000
725
@@ -17,10 +17,10 @@
726
17
 * Jonas G. Drange <jonas.drange@canonical.com>
17
 * Jonas G. Drange <jonas.drange@canonical.com>
727
18
 *
18
 *
728
19
*/
19
*/
730
20
import QtQuick 2.0
20
import QtQuick 2.4
731
21
import SystemSettings 1.0
21
import SystemSettings 1.0
734
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
735
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
736
24
24
737
25
ItemPage {
25
ItemPage {
738
26
    id: root
26
    id: root
739
27
27
740
=== modified file 'plugins/cellular/PageChooseApn.qml'
741
--- plugins/cellular/PageChooseApn.qml	2015-06-08 14:25:13 +0000
742
+++ plugins/cellular/PageChooseApn.qml	2015-10-20 14:51:06 +0000
743
@@ -23,11 +23,11 @@
744
23
 *
23
 *
745
24
 */
24
 */
746
25
25
748
26
import QtQuick 2.0
26
import QtQuick 2.4
749
27
import SystemSettings 1.0
27
import SystemSettings 1.0
753
28
import Ubuntu.Components 1.1
28
import Ubuntu.Components 1.3
754
29
import Ubuntu.Components.Popups 1.0
29
import Ubuntu.Components.Popups 1.3
755
30
import Ubuntu.Components.ListItems 1.0 as ListItem
30
import Ubuntu.Components.ListItems 1.3 as ListItem
756
31
import MeeGo.QOfono 0.2
31
import MeeGo.QOfono 0.2
757
32
import Ubuntu.SystemSettings.Cellular 1.0
32
import Ubuntu.SystemSettings.Cellular 1.0
758
33
import "apn_manager.js" as Manager
33
import "apn_manager.js" as Manager
759
34
34
760
=== modified file 'plugins/cellular/PageChooseCarrier.qml'
761
--- plugins/cellular/PageChooseCarrier.qml	2014-12-05 15:47:24 +0000
762
+++ plugins/cellular/PageChooseCarrier.qml	2015-10-20 14:51:06 +0000
763
@@ -19,11 +19,11 @@
764
19
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
19
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
765
20
 */
20
 */
766
21
21
768
22
import QtQuick 2.0
22
import QtQuick 2.4
769
23
import QtQuick.Layouts 1.1
23
import QtQuick.Layouts 1.1
770
24
import SystemSettings 1.0
24
import SystemSettings 1.0
773
25
import Ubuntu.Components 1.1
25
import Ubuntu.Components 1.3
774
26
import Ubuntu.Components.ListItems 1.0 as ListItem
26
import Ubuntu.Components.ListItems 1.3 as ListItem
775
27
import MeeGo.QOfono 0.2
27
import MeeGo.QOfono 0.2
776
28
import "carriers.js" as CHelper
28
import "carriers.js" as CHelper
777
29
29
778
30
30
779
=== modified file 'plugins/cellular/PageComponent.qml'
780
--- plugins/cellular/PageComponent.qml	2015-07-24 20:00:06 +0000
781
+++ plugins/cellular/PageComponent.qml	2015-10-20 14:51:06 +0000
782
@@ -18,11 +18,11 @@
783
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
784
19
 */
19
 */
785
20
20
787
21
import QtQuick 2.0
21
import QtQuick 2.4
788
22
import SystemSettings 1.0
22
import SystemSettings 1.0
789
23
import Ubuntu.SystemSettings.Cellular 1.0
23
import Ubuntu.SystemSettings.Cellular 1.0
792
24
import Ubuntu.Components 0.1
24
import Ubuntu.Components 1.3
793
25
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 1.3 as ListItem
794
26
import MeeGo.QOfono 0.2
26
import MeeGo.QOfono 0.2
795
27
import QMenuModel 0.1
27
import QMenuModel 0.1
796
28
import "Components" as LocalComponents
28
import "Components" as LocalComponents
797
29
29
798
=== modified file 'plugins/example/PageComponent.qml'
799
--- plugins/example/PageComponent.qml	2013-05-30 08:06:10 +0000
800
+++ plugins/example/PageComponent.qml	2015-10-20 14:51:06 +0000
801
@@ -18,8 +18,8 @@
802
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
803
19
 */
19
 */
804
20
20
807
21
import QtQuick 2.0
21
import QtQuick 2.4
808
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
809
23
import SystemSettings 1.0
23
import SystemSettings 1.0
810
24
24
811
25
ItemPage {
25
ItemPage {
812
26
26
813
=== modified file 'plugins/flight-mode/EntryComponent.qml'
814
--- plugins/flight-mode/EntryComponent.qml	2015-03-20 12:11:57 +0000
815
+++ plugins/flight-mode/EntryComponent.qml	2015-10-20 14:51:06 +0000
816
@@ -18,9 +18,9 @@
817
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
818
19
 */
19
 */
819
20
20
823
21
import QtQuick 2.0
21
import QtQuick 2.4
824
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
825
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
826
24
import Ubuntu.SystemSettings.FlightMode 1.0 as FlightMode
24
import Ubuntu.SystemSettings.FlightMode 1.0 as FlightMode
827
25
import Ubuntu.Settings.Components 0.1 as USC
25
import Ubuntu.Settings.Components 0.1 as USC
828
26
26
829
27
27
830
=== modified file 'plugins/hotspot/Common.qml'
831
--- plugins/hotspot/Common.qml	2015-08-06 15:12:39 +0000
832
+++ plugins/hotspot/Common.qml	2015-10-20 14:51:06 +0000
833
@@ -17,7 +17,7 @@
834
17
 * Jonas G. Drange <jonas.drange@canonical.com>
17
 * Jonas G. Drange <jonas.drange@canonical.com>
835
18
 *
18
 *
836
19
*/
19
*/
838
20
import QtQuick 2.0
20
import QtQuick 2.4
839
21
21
840
22
Item {
22
Item {
841
23
    /*
23
    /*
842
24
24
843
=== modified file 'plugins/hotspot/HotspotSetup.qml'
844
--- plugins/hotspot/HotspotSetup.qml	2015-09-10 15:33:51 +0000
845
+++ plugins/hotspot/HotspotSetup.qml	2015-10-20 14:51:06 +0000
846
@@ -16,14 +16,14 @@
847
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
848
17
 */
17
 */
849
18
18
851
19
import QtQuick 2.0
19
import QtQuick 2.4
852
20
import QtQuick.Layouts 1.1
20
import QtQuick.Layouts 1.1
853
21
import SystemSettings 1.0
21
import SystemSettings 1.0
856
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
857
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
858
24
import Ubuntu.Components.Popups 1.3
859
24
import Ubuntu.Connectivity 1.0
25
import Ubuntu.Connectivity 1.0
860
25
import Ubuntu.SystemSettings.Cellular 1.0
26
import Ubuntu.SystemSettings.Cellular 1.0
861
26
import Ubuntu.Components.Popups 0.1
862
27
27
863
28
Component {
28
Component {
864
29
    id: hotspotSetup
29
    id: hotspotSetup
865
30
30
866
=== modified file 'plugins/hotspot/PageComponent.qml'
867
--- plugins/hotspot/PageComponent.qml	2015-09-10 15:33:51 +0000
868
+++ plugins/hotspot/PageComponent.qml	2015-10-20 14:51:06 +0000
869
@@ -18,11 +18,11 @@
870
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
871
19
 */
19
 */
872
20
20
874
21
import QtQuick 2.0
21
import QtQuick 2.4
875
22
import SystemSettings 1.0
22
import SystemSettings 1.0
879
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
880
24
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 1.3 as ListItem
881
25
import Ubuntu.Components.Popups 0.1
25
import Ubuntu.Components.Popups 1.3
882
26
import Ubuntu.Connectivity 1.0
26
import Ubuntu.Connectivity 1.0
883
27
27
884
28
ItemPage {
28
ItemPage {
885
29
29
886
=== modified file 'plugins/language/DisplayLanguage.qml'
887
--- plugins/language/DisplayLanguage.qml	2014-10-28 16:10:46 +0000
888
+++ plugins/language/DisplayLanguage.qml	2015-10-20 14:51:06 +0000
889
@@ -18,10 +18,10 @@
890
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
891
19
 */
19
 */
892
20
20
897
21
import QtQuick 2.0
21
import QtQuick 2.4
898
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
899
23
import Ubuntu.Components.Popups 0.1
23
import Ubuntu.Components.Popups 1.3
900
24
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 1.3 as ListItem
901
25
import Ubuntu.SystemSettings.LanguagePlugin 1.0
25
import Ubuntu.SystemSettings.LanguagePlugin 1.0
902
26
26
903
27
SheetBase {
27
SheetBase {
904
28
28
905
=== modified file 'plugins/language/KeyboardLayoutItem.qml'
906
--- plugins/language/KeyboardLayoutItem.qml	2013-11-28 16:28:54 +0000
907
+++ plugins/language/KeyboardLayoutItem.qml	2015-10-20 14:51:06 +0000
908
@@ -18,9 +18,9 @@
909
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
910
19
 */
19
 */
911
20
20
915
21
import QtQuick 2.0
21
import QtQuick 2.4
916
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
917
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
918
24
24
919
25
ListItem.Base {
25
ListItem.Base {
920
26
    property alias name: name.text
26
    property alias name: name.text
921
27
27
922
=== modified file 'plugins/language/KeyboardLayouts.qml'
923
--- plugins/language/KeyboardLayouts.qml	2013-11-28 16:28:54 +0000
924
+++ plugins/language/KeyboardLayouts.qml	2015-10-20 14:51:06 +0000
925
@@ -19,7 +19,7 @@
926
19
 */
19
 */
927
20
20
928
21
import SystemSettings 1.0
21
import SystemSettings 1.0
930
22
import Ubuntu.Components.ListItems 0.1 as ListItem
22
import Ubuntu.Components.ListItems 1.3 as ListItem
931
23
import Ubuntu.SystemSettings.LanguagePlugin 1.0
23
import Ubuntu.SystemSettings.LanguagePlugin 1.0
932
24
24
933
25
ItemPage {
25
ItemPage {
934
26
26
935
=== modified file 'plugins/language/PageComponent.qml'
936
--- plugins/language/PageComponent.qml	2015-05-21 13:47:55 +0000
937
+++ plugins/language/PageComponent.qml	2015-10-20 14:51:06 +0000
938
@@ -18,12 +18,12 @@
939
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
940
19
 */
19
 */
941
20
20
943
21
import QtQuick 2.0
21
import QtQuick 2.4
944
22
import GSettings 1.0
22
import GSettings 1.0
945
23
import SystemSettings 1.0
23
import SystemSettings 1.0
949
24
import Ubuntu.Components 0.1
24
import Ubuntu.Components 1.3
950
25
import Ubuntu.Components.Popups 0.1
25
import Ubuntu.Components.Popups 1.3
951
26
import Ubuntu.Components.ListItems 0.1 as ListItem
26
import Ubuntu.Components.ListItems 1.3 as ListItem
952
27
import Ubuntu.Settings.Menus 0.1 as Menus
27
import Ubuntu.Settings.Menus 0.1 as Menus
953
28
import Ubuntu.SystemSettings.LanguagePlugin 1.0
28
import Ubuntu.SystemSettings.LanguagePlugin 1.0
954
29
29
955
30
30
956
=== modified file 'plugins/language/RebootNecessary.qml'
957
--- plugins/language/RebootNecessary.qml	2014-09-03 15:18:38 +0000
958
+++ plugins/language/RebootNecessary.qml	2015-10-20 14:51:06 +0000
959
@@ -18,9 +18,9 @@
960
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
961
19
 */
19
 */
962
20
20
966
21
import QtQuick 2.0
21
import QtQuick 2.4
967
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
968
23
import Ubuntu.Components.Popups 0.1
23
import Ubuntu.Components.Popups 1.3
969
24
24
970
25
Dialog {
25
Dialog {
971
26
    id: dialog
26
    id: dialog
972
27
27
973
=== modified file 'plugins/language/SpellChecking.qml'
974
--- plugins/language/SpellChecking.qml	2014-11-04 14:42:49 +0000
975
+++ plugins/language/SpellChecking.qml	2015-10-20 14:51:06 +0000
976
@@ -18,11 +18,11 @@
977
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
978
19
 */
19
 */
979
20
20
981
21
import QtQuick 2.0
21
import QtQuick 2.4
982
22
import GSettings 1.0
22
import GSettings 1.0
983
23
import SystemSettings 1.0
23
import SystemSettings 1.0
986
24
import Ubuntu.Components 0.1
24
import Ubuntu.Components 1.3
987
25
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 1.3 as ListItem
988
26
import Ubuntu.SystemSettings.LanguagePlugin 1.0
26
import Ubuntu.SystemSettings.LanguagePlugin 1.0
989
27
27
990
28
ItemPage {
28
ItemPage {
991
29
29
992
=== modified file 'plugins/language/SubsetView.qml'
993
--- plugins/language/SubsetView.qml	2014-09-08 13:04:38 +0000
994
+++ plugins/language/SubsetView.qml	2015-10-20 14:51:06 +0000
995
@@ -18,10 +18,10 @@
996
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
997
19
 */
19
 */
998
20
20
1000
21
import QtQuick 2.0
21
import QtQuick 2.4
1001
22
import SystemSettings 1.0
22
import SystemSettings 1.0
1004
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
1005
24
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 1.3 as ListItem
1006
25
25
1007
26
ListView {
26
ListView {
1008
27
    id: root
27
    id: root
1009
28
28
1010
=== modified file 'plugins/notifications/PageComponent.qml'
1011
--- plugins/notifications/PageComponent.qml	2014-11-04 20:49:18 +0000
1012
+++ plugins/notifications/PageComponent.qml	2015-10-20 14:51:06 +0000
1013
@@ -16,9 +16,9 @@
1014
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1015
17
 */
17
 */
1016
18
18
1020
19
import QtQuick 2.0
19
import QtQuick 2.4
1021
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.3
1022
21
import Ubuntu.Components.ListItems 0.1 as ListItem
21
import Ubuntu.Components.ListItems 1.3 as ListItem
1023
22
import Ubuntu.SystemSettings.Notifications 1.0
22
import Ubuntu.SystemSettings.Notifications 1.0
1024
23
import SystemSettings 1.0
23
import SystemSettings 1.0
1025
24
24
1026
25
25
1027
=== modified file 'plugins/orientation-lock/EntryComponent.qml'
1028
--- plugins/orientation-lock/EntryComponent.qml	2014-11-04 12:04:16 +0000
1029
+++ plugins/orientation-lock/EntryComponent.qml	2015-10-20 14:51:06 +0000
1030
@@ -19,10 +19,10 @@
1031
19
 */
19
 */
1032
20
20
1033
21
import GSettings 1.0
21
import GSettings 1.0
1035
22
import QtQuick 2.0
22
import QtQuick 2.4
1036
23
import QtQuick.Window 2.1
23
import QtQuick.Window 2.1
1039
24
import Ubuntu.Components 0.1
24
import Ubuntu.Components 1.3
1040
25
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 1.3 as ListItem
1041
26
26
1042
27
27
1043
28
ListItem.Standard {
28
ListItem.Standard {
1044
29
29
1045
=== modified file 'plugins/phone/CallForwardItem.qml'
1046
--- plugins/phone/CallForwardItem.qml	2015-06-30 21:00:45 +0000
1047
+++ plugins/phone/CallForwardItem.qml	2015-10-20 14:51:06 +0000
1048
@@ -18,9 +18,9 @@
1049
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1050
19
 */
19
 */
1051
20
20
1055
21
import QtQuick 2.0
21
import QtQuick 2.4
1056
22
import Ubuntu.Components 1.1
22
import Ubuntu.Components 1.3
1057
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
1058
24
import Ubuntu.Components.Themes.Ambiance 0.1
24
import Ubuntu.Components.Themes.Ambiance 0.1
1059
25
import MeeGo.QOfono 0.2
25
import MeeGo.QOfono 0.2
1060
26
import "callForwardingUtils.js" as Utils
26
import "callForwardingUtils.js" as Utils
1061
27
27
1062
=== modified file 'plugins/phone/CallForwarding.qml'
1063
--- plugins/phone/CallForwarding.qml	2015-07-02 22:42:12 +0000
1064
+++ plugins/phone/CallForwarding.qml	2015-10-20 14:51:06 +0000
1065
@@ -26,12 +26,12 @@
1066
26
 *       “Contact {carrier name} for more information.”.
26
 *       “Contact {carrier name} for more information.”.
1067
27
 */
27
 */
1068
28
28
1070
29
import QtQuick 2.0
29
import QtQuick 2.4
1071
30
import QtContacts 5.0
30
import QtContacts 5.0
1072
31
import SystemSettings 1.0
31
import SystemSettings 1.0
1076
32
import Ubuntu.Components 1.1
32
import Ubuntu.Components 1.3
1077
33
import Ubuntu.Components.ListItems 0.1 as ListItem
33
import Ubuntu.Components.ListItems 1.3 as ListItem
1078
34
import Ubuntu.Components.Popups 0.1
34
import Ubuntu.Components.Popups 1.3
1079
35
import Ubuntu.Components.Themes.Ambiance 0.1
35
import Ubuntu.Components.Themes.Ambiance 0.1
1080
36
import Ubuntu.Content 0.1
36
import Ubuntu.Content 0.1
1081
37
import "callForwardingUtils.js" as Utils
37
import "callForwardingUtils.js" as Utils
1082
38
38
1083
=== modified file 'plugins/phone/CallWaiting.qml'
1084
--- plugins/phone/CallWaiting.qml	2015-07-06 15:15:05 +0000
1085
+++ plugins/phone/CallWaiting.qml	2015-10-20 14:51:06 +0000
1086
@@ -18,10 +18,10 @@
1087
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1088
19
 */
19
 */
1089
20
20
1091
21
import QtQuick 2.0
21
import QtQuick 2.4
1092
22
import SystemSettings 1.0
22
import SystemSettings 1.0
1095
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
1096
24
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 1.3 as ListItem
1097
25
import MeeGo.QOfono 0.2
25
import MeeGo.QOfono 0.2
1098
26
26
1099
27
ItemPage {
27
ItemPage {
1100
28
28
1101
=== modified file 'plugins/phone/KeyboardRectangle.qml'
1102
--- plugins/phone/KeyboardRectangle.qml	2015-06-15 13:05:17 +0000
1103
+++ plugins/phone/KeyboardRectangle.qml	2015-10-20 14:51:06 +0000
1104
@@ -14,7 +14,7 @@
1105
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1106
15
 */
15
 */
1107
16
16
1109
17
import QtQuick 2.2
17
import QtQuick 2.4
1110
18
18
1111
19
Item {
19
Item {
1112
20
    id: keyboardRect
20
    id: keyboardRect
1113
21
21
1114
=== modified file 'plugins/phone/MultiSim.qml'
1115
--- plugins/phone/MultiSim.qml	2015-07-09 11:54:39 +0000
1116
+++ plugins/phone/MultiSim.qml	2015-10-20 14:51:06 +0000
1117
@@ -18,11 +18,11 @@
1118
18
 * Jonas G. Drange <jonas.drange@canonical.com>
18
 * Jonas G. Drange <jonas.drange@canonical.com>
1119
19
 *
19
 *
1120
20
*/
20
*/
1122
21
import QtQuick 2.0
21
import QtQuick 2.4
1123
22
import GSettings 1.0
22
import GSettings 1.0
1124
23
import SystemSettings 1.0
23
import SystemSettings 1.0
1127
24
import Ubuntu.Components 1.1
24
import Ubuntu.Components 1.3
1128
25
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 1.3 as ListItem
1129
26
26
1130
27
Column {
27
Column {
1131
28
28
1132
29
29
1133
=== modified file 'plugins/phone/NoSims.qml'
1134
--- plugins/phone/NoSims.qml	2014-08-19 15:59:18 +0000
1135
+++ plugins/phone/NoSims.qml	2015-10-20 14:51:06 +0000
1136
@@ -18,9 +18,9 @@
1137
18
 * Jonas G. Drange <jonas.drange@canonical.com>
18
 * Jonas G. Drange <jonas.drange@canonical.com>
1138
19
 *
19
 *
1139
20
*/
20
*/
1143
21
import QtQuick 2.0
21
import QtQuick 2.4
1144
22
import Ubuntu.Components 1.1
22
import Ubuntu.Components 1.3
1145
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
1146
24
24
1147
25
Column {
25
Column {
1148
26
26
1149
27
27
1150
=== modified file 'plugins/phone/Ofono.qml'
1151
--- plugins/phone/Ofono.qml	2014-08-23 17:36:04 +0000
1152
+++ plugins/phone/Ofono.qml	2015-10-20 14:51:06 +0000
1153
@@ -17,7 +17,7 @@
1154
17
 * Jonas G. Drange <jonas.drange@canonical.com>
17
 * Jonas G. Drange <jonas.drange@canonical.com>
1155
18
 *
18
 *
1156
19
*/
19
*/
1158
20
import QtQuick 2.0
20
import QtQuick 2.4
1159
21
import MeeGo.QOfono 0.2
21
import MeeGo.QOfono 0.2
1160
22
22
1161
23
Item {
23
Item {
1162
24
24
1163
=== modified file 'plugins/phone/PageComponent.qml'
1164
--- plugins/phone/PageComponent.qml	2015-01-29 18:26:44 +0000
1165
+++ plugins/phone/PageComponent.qml	2015-10-20 14:51:06 +0000
1166
@@ -18,10 +18,10 @@
1167
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1168
19
 */
19
 */
1169
20
20
1171
21
import QtQuick 2.0
21
import QtQuick 2.4
1172
22
import SystemSettings 1.0
22
import SystemSettings 1.0
1175
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
1176
24
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 1.3 as ListItem
1177
25
import Ubuntu.SystemSettings.Sound 1.0
25
import Ubuntu.SystemSettings.Sound 1.0
1178
26
import MeeGo.QOfono 0.2
26
import MeeGo.QOfono 0.2
1179
27
import "sims.js" as Sims
27
import "sims.js" as Sims
1180
28
28
1181
=== modified file 'plugins/phone/ServiceInfo.qml'
1182
--- plugins/phone/ServiceInfo.qml	2015-09-18 14:06:10 +0000
1183
+++ plugins/phone/ServiceInfo.qml	2015-10-20 14:51:06 +0000
1184
@@ -18,10 +18,10 @@
1185
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1186
19
 */
19
 */
1187
20
20
1189
21
import QtQuick 2.0
21
import QtQuick 2.4
1190
22
import SystemSettings 1.0
22
import SystemSettings 1.0
1193
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
1194
24
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 1.3 as ListItem
1195
25
import Ubuntu.History 0.1
25
import Ubuntu.History 0.1
1196
26
import "dateUtils.js" as DateUtils
26
import "dateUtils.js" as DateUtils
1197
27
27
1198
28
28
1199
=== modified file 'plugins/phone/Services.qml'
1200
--- plugins/phone/Services.qml	2015-07-13 12:17:29 +0000
1201
+++ plugins/phone/Services.qml	2015-10-20 14:51:06 +0000
1202
@@ -18,10 +18,10 @@
1203
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1204
19
 */
19
 */
1205
20
20
1207
21
import QtQuick 2.0
21
import QtQuick 2.4
1208
22
import SystemSettings 1.0
22
import SystemSettings 1.0
1211
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
1212
24
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 1.3 as ListItem
1213
25
25
1214
26
ItemPage {
26
ItemPage {
1215
27
    id: root
27
    id: root
1216
28
28
1217
=== modified file 'plugins/phone/SingleSim.qml'
1218
--- plugins/phone/SingleSim.qml	2015-07-09 11:54:39 +0000
1219
+++ plugins/phone/SingleSim.qml	2015-10-20 14:51:06 +0000
1220
@@ -18,9 +18,9 @@
1221
18
 * Jonas G. Drange <jonas.drange@canonical.com>
18
 * Jonas G. Drange <jonas.drange@canonical.com>
1222
19
 *
19
 *
1223
20
*/
20
*/
1227
21
import QtQuick 2.0
21
import QtQuick 2.4
1228
22
import Ubuntu.Components 1.1
22
import Ubuntu.Components 1.3
1229
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
1230
24
24
1231
25
Column {
25
Column {
1232
26
26
1233
27
27
1234
=== modified file 'plugins/phone/VCardParser.qml'
1235
--- plugins/phone/VCardParser.qml	2015-06-22 13:57:56 +0000
1236
+++ plugins/phone/VCardParser.qml	2015-10-20 14:51:06 +0000
1237
@@ -14,7 +14,7 @@
1238
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1239
15
 */
15
 */
1240
16
16
1242
17
import QtQuick 2.2
17
import QtQuick 2.4
1243
18
import QtContacts 5.0
18
import QtContacts 5.0
1244
19
19
1245
20
QtObject {
20
QtObject {
1246
21
21
1247
=== modified file 'plugins/reset/EntryComponent.qml'
1248
--- plugins/reset/EntryComponent.qml	2014-07-30 22:16:33 +0000
1249
+++ plugins/reset/EntryComponent.qml	2015-10-20 14:51:06 +0000
1250
@@ -18,9 +18,9 @@
1251
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1252
19
 */
19
 */
1253
20
20
1257
21
import QtQuick 2.0
21
import QtQuick 2.4
1258
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
1259
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
1260
24
24
1261
25
ListItem.Standard {
25
ListItem.Standard {
1262
26
    id: root
26
    id: root
1263
27
27
1264
=== modified file 'plugins/reset/EraseEverything.qml'
1265
--- plugins/reset/EraseEverything.qml	2014-07-30 22:16:33 +0000
1266
+++ plugins/reset/EraseEverything.qml	2015-10-20 14:51:06 +0000
1267
@@ -18,9 +18,9 @@
1268
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1269
19
 */
19
 */
1270
20
20
1274
21
import QtQuick 2.0
21
import QtQuick 2.4
1275
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
1276
23
import Ubuntu.Components.Popups 0.1
23
import Ubuntu.Components.Popups 1.3
1277
24
24
1278
25
Component {
25
Component {
1279
26
    id: eraseEverything
26
    id: eraseEverything
1280
27
27
1281
=== modified file 'plugins/reset/PageComponent.qml'
1282
--- plugins/reset/PageComponent.qml	2014-07-30 22:16:33 +0000
1283
+++ plugins/reset/PageComponent.qml	2015-10-20 14:51:06 +0000
1284
@@ -19,11 +19,11 @@
1285
19
 */
19
 */
1286
20
20
1287
21
import GSettings 1.0
21
import GSettings 1.0
1289
22
import QtQuick 2.0
22
import QtQuick 2.4
1290
23
import SystemSettings 1.0
23
import SystemSettings 1.0
1294
24
import Ubuntu.Components 0.1
24
import Ubuntu.Components 1.3
1295
25
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 1.3 as ListItem
1296
26
import Ubuntu.Components.Popups 0.1
26
import Ubuntu.Components.Popups 1.3
1297
27
import Ubuntu.SystemSettings.Reset 1.0
27
import Ubuntu.SystemSettings.Reset 1.0
1298
28
28
1299
29
ItemPage {
29
ItemPage {
1300
30
30
1301
=== modified file 'plugins/reset/ResetAllSettings.qml'
1302
--- plugins/reset/ResetAllSettings.qml	2014-02-27 12:55:28 +0000
1303
+++ plugins/reset/ResetAllSettings.qml	2015-10-20 14:51:06 +0000
1304
@@ -18,9 +18,9 @@
1305
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1306
19
 */
19
 */
1307
20
20
1311
21
import QtQuick 2.0
21
import QtQuick 2.4
1312
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
1313
23
import Ubuntu.Components.Popups 0.1
23
import Ubuntu.Components.Popups 1.3
1314
24
24
1315
25
Component {
25
Component {
1316
26
    id: resetAllSettings
26
    id: resetAllSettings
1317
27
27
1318
=== modified file 'plugins/reset/ResetLauncherHome.qml'
1319
--- plugins/reset/ResetLauncherHome.qml	2014-10-02 13:03:10 +0000
1320
+++ plugins/reset/ResetLauncherHome.qml	2015-10-20 14:51:06 +0000
1321
@@ -18,9 +18,9 @@
1322
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1323
19
 */
19
 */
1324
20
20
1328
21
import QtQuick 2.0
21
import QtQuick 2.4
1329
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
1330
23
import Ubuntu.Components.Popups 0.1
23
import Ubuntu.Components.Popups 1.3
1331
24
24
1332
25
Component {
25
Component {
1333
26
    id: resetLauncherHome
26
    id: resetLauncherHome
1334
27
27
1335
=== modified file 'plugins/security-privacy/AppAccess.qml'
1336
--- plugins/security-privacy/AppAccess.qml	2015-09-09 15:03:26 +0000
1337
+++ plugins/security-privacy/AppAccess.qml	2015-10-20 14:51:06 +0000
1338
@@ -17,9 +17,9 @@
1339
17
 * Alberto Mardegan <alberto.mardegan@canonical.com>
17
 * Alberto Mardegan <alberto.mardegan@canonical.com>
1340
18
 */
18
 */
1341
19
19
1345
20
import QtQuick 2.0
20
import QtQuick 2.4
1346
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
1347
22
import Ubuntu.Components.ListItems 0.1 as ListItem
22
import Ubuntu.Components.ListItems 1.3 as ListItem
1348
23
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
23
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1349
24
import SystemSettings 1.0
24
import SystemSettings 1.0
1350
25
25
1351
26
26
1352
=== modified file 'plugins/security-privacy/AppAccessControl.qml'
1353
--- plugins/security-privacy/AppAccessControl.qml	2015-07-13 12:09:52 +0000
1354
+++ plugins/security-privacy/AppAccessControl.qml	2015-10-20 14:51:06 +0000
1355
@@ -17,9 +17,9 @@
1356
17
 * Alberto Mardegan <alberto.mardegan@canonical.com>
17
 * Alberto Mardegan <alberto.mardegan@canonical.com>
1357
18
 */
18
 */
1358
19
19
1362
20
import QtQuick 2.0
20
import QtQuick 2.4
1363
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
1364
22
import Ubuntu.Components.ListItems 0.1 as ListItem
22
import Ubuntu.Components.ListItems 1.3 as ListItem
1365
23
import SystemSettings 1.0
23
import SystemSettings 1.0
1366
24
24
1367
25
ItemPage {
25
ItemPage {
1368
26
26
1369
=== modified file 'plugins/security-privacy/Location.qml'
1370
--- plugins/security-privacy/Location.qml	2015-08-21 08:45:16 +0000
1371
+++ plugins/security-privacy/Location.qml	2015-10-20 14:51:06 +0000
1372
@@ -21,9 +21,9 @@
1373
21
import GSettings 1.0
21
import GSettings 1.0
1374
22
import QMenuModel 0.1
22
import QMenuModel 0.1
1375
23
import Qt.labs.folderlistmodel 2.1
23
import Qt.labs.folderlistmodel 2.1
1379
24
import QtQuick 2.3
24
import QtQuick 2.4
1380
25
import Ubuntu.Components 1.1
25
import Ubuntu.Components 1.3
1381
26
import Ubuntu.Components.ListItems 0.1 as ListItem
26
import Ubuntu.Components.ListItems 1.3 as ListItem
1382
27
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
27
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1383
28
import SystemSettings 1.0
28
import SystemSettings 1.0
1384
29
29
1385
30
30
1386
=== modified file 'plugins/security-privacy/LockSecurity.qml'
1387
--- plugins/security-privacy/LockSecurity.qml	2015-07-13 12:04:01 +0000
1388
+++ plugins/security-privacy/LockSecurity.qml	2015-10-20 14:51:06 +0000
1389
@@ -19,11 +19,11 @@
1390
19
 */
19
 */
1391
20
20
1392
21
import GSettings 1.0
21
import GSettings 1.0
1394
22
import QtQuick 2.0
22
import QtQuick 2.4
1395
23
import QtQuick.Layouts 1.1
23
import QtQuick.Layouts 1.1
1399
24
import Ubuntu.Components 1.1
24
import Ubuntu.Components 1.3
1400
25
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 1.3 as ListItem
1401
26
import Ubuntu.Components.Popups 0.1
26
import Ubuntu.Components.Popups 1.3
1402
27
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
27
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1403
28
import SystemSettings 1.0
28
import SystemSettings 1.0
1404
29
29
1405
30
30
1406
=== modified file 'plugins/security-privacy/Ofono.qml'
1407
--- plugins/security-privacy/Ofono.qml	2014-08-27 05:19:24 +0000
1408
+++ plugins/security-privacy/Ofono.qml	2015-10-20 14:51:06 +0000
1409
@@ -17,7 +17,7 @@
1410
17
 * Jonas G. Drange <jonas.drange@canonical.com>
17
 * Jonas G. Drange <jonas.drange@canonical.com>
1411
18
 *
18
 *
1412
19
*/
19
*/
1414
20
import QtQuick 2.0
20
import QtQuick 2.4
1415
21
import MeeGo.QOfono 0.2
21
import MeeGo.QOfono 0.2
1416
22
22
1417
23
Item {
23
Item {
1418
24
24
1419
=== modified file 'plugins/security-privacy/PageComponent.qml'
1420
--- plugins/security-privacy/PageComponent.qml	2015-09-30 14:57:48 +0000
1421
+++ plugins/security-privacy/PageComponent.qml	2015-10-20 14:51:06 +0000
1422
@@ -20,9 +20,9 @@
1423
20
20
1424
21
import GSettings 1.0
21
import GSettings 1.0
1425
22
import QMenuModel 0.1
22
import QMenuModel 0.1
1429
23
import QtQuick 2.0
23
import QtQuick 2.4
1430
24
import Ubuntu.Components 0.1
24
import Ubuntu.Components 1.3
1431
25
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 1.3 as ListItem
1432
26
import SystemSettings 1.0
26
import SystemSettings 1.0
1433
27
import Ubuntu.SystemSettings.Battery 1.0
27
import Ubuntu.SystemSettings.Battery 1.0
1434
28
import Ubuntu.SystemSettings.Diagnostics 1.0
28
import Ubuntu.SystemSettings.Diagnostics 1.0
1435
29
29
1436
=== modified file 'plugins/security-privacy/PhoneLocking.qml'
1437
--- plugins/security-privacy/PhoneLocking.qml	2015-08-21 07:59:07 +0000
1438
+++ plugins/security-privacy/PhoneLocking.qml	2015-10-20 14:51:06 +0000
1439
@@ -19,10 +19,10 @@
1440
19
 */
19
 */
1441
20
20
1442
21
import GSettings 1.0
21
import GSettings 1.0
1444
22
import QtQuick 2.0
22
import QtQuick 2.4
1445
23
import SystemSettings 1.0
23
import SystemSettings 1.0
1448
24
import Ubuntu.Components 0.1
24
import Ubuntu.Components 1.3
1449
25
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 1.3 as ListItem
1450
26
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
26
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1451
27
27
1452
28
ItemPage {
28
ItemPage {
1453
29
29
1454
=== modified file 'plugins/security-privacy/SimPin.qml'
1455
--- plugins/security-privacy/SimPin.qml	2015-07-13 12:00:27 +0000
1456
+++ plugins/security-privacy/SimPin.qml	2015-10-20 14:51:06 +0000
1457
@@ -19,11 +19,11 @@
1458
19
 */
19
 */
1459
20
20
1460
21
import GSettings 1.0
21
import GSettings 1.0
1462
22
import QtQuick 2.0
22
import QtQuick 2.4
1463
23
import QtQuick.Layouts 1.1
23
import QtQuick.Layouts 1.1
1467
24
import Ubuntu.Components 1.1
24
import Ubuntu.Components 1.3
1468
25
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 1.3 as ListItem
1469
26
import Ubuntu.Components.Popups 0.1
26
import Ubuntu.Components.Popups 1.3
1470
27
import SystemSettings 1.0
27
import SystemSettings 1.0
1471
28
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
28
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1472
29
import MeeGo.QOfono 0.2
29
import MeeGo.QOfono 0.2
1473
30
30
1474
=== modified file 'plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml'
1475
--- plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml	2013-07-26 11:12:18 +0000
1476
+++ plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml	2015-10-20 14:51:06 +0000
1477
@@ -18,9 +18,9 @@
1478
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1479
19
 */
19
 */
1480
20
20
1484
21
import QtQuick 2.0
21
import QtQuick 2.4
1485
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
1486
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
1487
24
24
1488
25
ListItem.Base {
25
ListItem.Base {
1489
26
    property string textEntry: "";
26
    property string textEntry: "";
1490
27
27
1491
=== modified file 'plugins/security-privacy/diagnostics/PageComponent.qml'
1492
--- plugins/security-privacy/diagnostics/PageComponent.qml	2015-09-30 14:40:01 +0000
1493
+++ plugins/security-privacy/diagnostics/PageComponent.qml	2015-10-20 14:51:06 +0000
1494
@@ -18,10 +18,10 @@
1495
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1496
19
 */
19
 */
1497
20
20
1499
21
import QtQuick 2.0
21
import QtQuick 2.4
1500
22
import SystemSettings 1.0
22
import SystemSettings 1.0
1503
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
1504
24
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 1.3 as ListItem
1505
25
import Ubuntu.SystemSettings.Diagnostics 1.0
25
import Ubuntu.SystemSettings.Diagnostics 1.0
1506
26
26
1507
27
ItemPage {
27
ItemPage {
1508
28
28
1509
=== modified file 'plugins/security-privacy/here-terms.qml'
1510
--- plugins/security-privacy/here-terms.qml	2014-10-16 14:28:16 +0000
1511
+++ plugins/security-privacy/here-terms.qml	2015-10-20 14:51:06 +0000
1512
@@ -14,10 +14,10 @@
1513
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1514
15
 */
15
 */
1515
16
16
1517
17
import QtQuick 2.3
17
import QtQuick 2.4
1518
18
import Qt.labs.folderlistmodel 2.1
18
import Qt.labs.folderlistmodel 2.1
1519
19
import SystemSettings 1.0
19
import SystemSettings 1.0
1521
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.3
1522
21
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
21
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1523
22
22
1524
23
ItemPage {
23
ItemPage {
1525
24
24
1526
=== modified file 'plugins/sound/PageComponent.qml'
1527
--- plugins/sound/PageComponent.qml	2015-08-24 17:05:19 +0000
1528
+++ plugins/sound/PageComponent.qml	2015-10-20 14:51:06 +0000
1529
@@ -19,9 +19,9 @@
1530
19
 */
19
 */
1531
20
20
1532
21
import GSettings 1.0
21
import GSettings 1.0
1536
22
import QtQuick 2.0
22
import QtQuick 2.4
1537
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
1538
24
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 1.3 as ListItem
1539
25
import SystemSettings 1.0
25
import SystemSettings 1.0
1540
26
import Ubuntu.SystemSettings.Sound 1.0
26
import Ubuntu.SystemSettings.Sound 1.0
1541
27
import Ubuntu.Settings.Menus 0.1 as Menus
27
import Ubuntu.Settings.Menus 0.1 as Menus
1542
28
28
1543
=== modified file 'plugins/sound/SoundsList.qml'
1544
--- plugins/sound/SoundsList.qml	2015-08-24 17:05:19 +0000
1545
+++ plugins/sound/SoundsList.qml	2015-10-20 14:51:06 +0000
1546
@@ -1,9 +1,9 @@
1547
1
import GSettings 1.0
1
import GSettings 1.0
1549
2
import QtQuick 2.0
2
import QtQuick 2.4
1550
3
import QtMultimedia 5.0
3
import QtMultimedia 5.0
1551
4
import SystemSettings 1.0
4
import SystemSettings 1.0
1554
5
import Ubuntu.Components 0.1
5
import Ubuntu.Components 1.3
1555
6
import Ubuntu.Components.ListItems 0.1 as ListItem
6
import Ubuntu.Components.ListItems 1.3 as ListItem
1556
7
import Ubuntu.SystemSettings.Sound 1.0
7
import Ubuntu.SystemSettings.Sound 1.0
1557
8
import QMenuModel 0.1
8
import QMenuModel 0.1
1558
9
9
1559
10
10
1560
=== modified file 'plugins/system-update/Configuration.qml'
1561
--- plugins/system-update/Configuration.qml	2014-09-05 18:23:22 +0000
1562
+++ plugins/system-update/Configuration.qml	2015-10-20 14:51:06 +0000
1563
@@ -16,10 +16,10 @@
1564
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1565
17
 */
17
 */
1566
18
18
1568
19
import QtQuick 2.0
19
import QtQuick 2.4
1569
20
import SystemSettings 1.0
20
import SystemSettings 1.0
1572
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
1573
22
import Ubuntu.Components.ListItems 0.1 as ListItem
22
import Ubuntu.Components.ListItems 1.3 as ListItem
1574
23
import Ubuntu.SystemSettings.Update 1.0
23
import Ubuntu.SystemSettings.Update 1.0
1575
24
24
1576
25
25
1577
26
26
1578
=== modified file 'plugins/system-update/EntryComponent.qml'
1579
--- plugins/system-update/EntryComponent.qml	2014-10-27 13:29:30 +0000
1580
+++ plugins/system-update/EntryComponent.qml	2015-10-20 14:51:06 +0000
1581
@@ -18,9 +18,9 @@
1582
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1583
19
 */
19
 */
1584
20
20
1588
21
import QtQuick 2.0
21
import QtQuick 2.4
1589
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
1590
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
1591
24
import Ubuntu.SystemSettings.Update 1.0
24
import Ubuntu.SystemSettings.Update 1.0
1592
25
25
1593
26
ListItem.SingleValue {
26
ListItem.SingleValue {
1594
27
27
1595
=== modified file 'plugins/system-update/PageComponent.qml'
1596
--- plugins/system-update/PageComponent.qml	2015-09-09 15:08:08 +0000
1597
+++ plugins/system-update/PageComponent.qml	2015-10-20 14:51:06 +0000
1598
@@ -20,11 +20,11 @@
1599
20
 */
20
 */
1600
21
21
1601
22
import QMenuModel 0.1
22
import QMenuModel 0.1
1603
23
import QtQuick 2.0
23
import QtQuick 2.4
1604
24
import SystemSettings 1.0
24
import SystemSettings 1.0
1608
25
import Ubuntu.Components 0.1
25
import Ubuntu.Components 1.3
1609
26
import Ubuntu.Components.ListItems 0.1 as ListItem
26
import Ubuntu.Components.ListItems 1.3 as ListItem
1610
27
import Ubuntu.Components.Popups 0.1
27
import Ubuntu.Components.Popups 1.3
1611
28
import Ubuntu.OnlineAccounts.Client 0.1
28
import Ubuntu.OnlineAccounts.Client 0.1
1612
29
import Ubuntu.SystemSettings.Update 1.0
29
import Ubuntu.SystemSettings.Update 1.0
1613
30
import Ubuntu.Connectivity 1.0
30
import Ubuntu.Connectivity 1.0
1614
31
31
1615
=== modified file 'plugins/time-date/ChooseTimeZone.qml'
1616
--- plugins/time-date/ChooseTimeZone.qml	2015-09-11 14:12:38 +0000
1617
+++ plugins/time-date/ChooseTimeZone.qml	2015-10-20 14:51:06 +0000
1618
@@ -18,10 +18,10 @@
1619
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1620
19
 */
19
 */
1621
20
20
1623
21
import QtQuick 2.0
21
import QtQuick 2.4
1624
22
import SystemSettings 1.0
22
import SystemSettings 1.0
1627
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
1628
24
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 1.3 as ListItem
1629
25
import Ubuntu.SystemSettings.TimeDate 1.0
25
import Ubuntu.SystemSettings.TimeDate 1.0
1630
26
26
1631
27
ItemPage {
27
ItemPage {
1632
28
28
1633
=== modified file 'plugins/time-date/PageComponent.qml'
1634
--- plugins/time-date/PageComponent.qml	2015-09-11 14:15:03 +0000
1635
+++ plugins/time-date/PageComponent.qml	2015-10-20 14:51:06 +0000
1636
@@ -18,11 +18,11 @@
1637
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1638
19
 */
19
 */
1639
20
20
1641
21
import QtQuick 2.0
21
import QtQuick 2.4
1642
22
import SystemSettings 1.0
22
import SystemSettings 1.0
1646
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
1647
24
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 1.3 as ListItem
1648
25
import Ubuntu.Components.Popups 0.1
25
import Ubuntu.Components.Popups 1.3
1649
26
import Ubuntu.SystemSettings.TimeDate 1.0
26
import Ubuntu.SystemSettings.TimeDate 1.0
1650
27
27
1651
28
ItemPage {
28
ItemPage {
1652
29
29
1653
=== modified file 'plugins/time-date/Scroller.qml'
1654
--- plugins/time-date/Scroller.qml	2013-10-09 15:42:36 +0000
1655
+++ plugins/time-date/Scroller.qml	2015-10-20 14:51:06 +0000
1656
@@ -16,9 +16,9 @@
1657
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1658
17
 */
17
 */
1659
18
18
1663
19
import QtQuick 2.0
19
import QtQuick 2.4
1664
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.3
1665
21
import Ubuntu.Components.ListItems 0.1 as ListItems
21
import Ubuntu.Components.ListItems 1.3 as ListItems
1666
22
22
1667
23
Item {
23
Item {
1668
24
    id: root
24
    id: root
1669
25
25
1670
=== modified file 'plugins/time-date/TimePicker.qml'
1671
--- plugins/time-date/TimePicker.qml	2013-10-07 11:02:12 +0000
1672
+++ plugins/time-date/TimePicker.qml	2015-10-20 14:51:06 +0000
1673
@@ -16,10 +16,10 @@
1674
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1675
17
 */
17
 */
1676
18
18
1681
19
import QtQuick 2.0
19
import QtQuick 2.4
1682
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.3
1683
21
import Ubuntu.Components.ListItems 0.1 as ListItem
21
import Ubuntu.Components.ListItems 1.3 as ListItem
1684
22
import Ubuntu.Components.Popups 0.1
22
import Ubuntu.Components.Popups 1.3
1685
23
23
1686
24
Dialog {
24
Dialog {
1687
25
    id: root
25
    id: root
1688
26
26
1689
=== modified file 'plugins/wifi/AccessPoint.qml'
1690
--- plugins/wifi/AccessPoint.qml	2015-06-08 15:43:08 +0000
1691
+++ plugins/wifi/AccessPoint.qml	2015-10-20 14:51:06 +0000
1692
@@ -17,9 +17,9 @@
1693
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
1694
18
 */
18
 */
1695
19
19
1699
20
import QtQuick 2.0
20
import QtQuick 2.4
1700
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
1701
22
import Ubuntu.Components.ListItems 0.1 as ListItem
22
import Ubuntu.Components.ListItems 1.3 as ListItem
1702
23
23
1703
24
FramedMenuItem {
24
FramedMenuItem {
1704
25
    id: accessPoint
25
    id: accessPoint
1705
26
26
1706
=== modified file 'plugins/wifi/BaseMenuItem.qml'
1707
--- plugins/wifi/BaseMenuItem.qml	2013-09-18 19:41:37 +0000
1708
+++ plugins/wifi/BaseMenuItem.qml	2015-10-20 14:51:06 +0000
1709
@@ -18,8 +18,8 @@
1710
18
 *      Nick Dedekind <nick.dedekind@canonical.com>
18
 *      Nick Dedekind <nick.dedekind@canonical.com>
1711
19
 */
19
 */
1712
20
20
1715
21
import QtQuick 2.0
21
import QtQuick 2.4
1716
22
import Ubuntu.Components.ListItems 0.1 as ListItem
22
import Ubuntu.Components.ListItems 1.3 as ListItem
1717
23
23
1718
24
ListItem.Standard {
24
ListItem.Standard {
1719
25
    id: baseMenu
25
    id: baseMenu
1720
26
26
1721
=== modified file 'plugins/wifi/CertDialog.qml'
1722
--- plugins/wifi/CertDialog.qml	2015-06-24 11:05:11 +0000
1723
+++ plugins/wifi/CertDialog.qml	2015-10-20 14:51:06 +0000
1724
@@ -1,8 +1,8 @@
1726
1
import QtQuick 2.0
1
import QtQuick 2.4
1727
2
import QtQuick.Layouts 1.1
2
import QtQuick.Layouts 1.1
1731
3
import Ubuntu.Components.Popups 0.1
3
import Ubuntu.Components.Popups 1.3
1732
4
import Ubuntu.Components 0.1
4
import Ubuntu.Components 1.3
1733
5
import Ubuntu.Components.ListItems 0.1 as ListItem
5
import Ubuntu.Components.ListItems 1.3 as ListItem
1734
6
import Ubuntu.SystemSettings.Wifi 1.0
6
import Ubuntu.SystemSettings.Wifi 1.0
1735
7
7
1736
8
Component {
8
Component {
1737
9
9
1738
=== modified file 'plugins/wifi/CertPicker.qml'
1739
--- plugins/wifi/CertPicker.qml	2015-06-24 11:05:11 +0000
1740
+++ plugins/wifi/CertPicker.qml	2015-10-20 14:51:06 +0000
1741
@@ -1,7 +1,7 @@
1743
1
import QtQuick 2.0
1
import QtQuick 2.4
1744
2
import QtQuick.Layouts 1.1
2
import QtQuick.Layouts 1.1
1747
3
import Ubuntu.Components 0.1
3
import Ubuntu.Components 1.3
1748
4
import Ubuntu.Components.Popups 0.1
4
import Ubuntu.Components.Popups 1.3
1749
5
import Ubuntu.Content 0.1
5
import Ubuntu.Content 0.1
1750
6
6
1751
7
PopupBase  {
7
PopupBase  {
1752
8
8
1753
=== modified file 'plugins/wifi/Common.qml'
1754
--- plugins/wifi/Common.qml	2014-09-22 15:29:16 +0000
1755
+++ plugins/wifi/Common.qml	2015-10-20 14:51:06 +0000
1756
@@ -17,7 +17,7 @@
1757
17
 * Jonas G. Drange <jonas.drange@canonical.com>
17
 * Jonas G. Drange <jonas.drange@canonical.com>
1758
18
 *
18
 *
1759
19
*/
19
*/
1761
20
import QtQuick 2.0
20
import QtQuick 2.4
1762
21
21
1763
22
Item {
22
Item {
1764
23
23
1765
24
24
1766
=== modified file 'plugins/wifi/DivMenuItem.qml'
1767
--- plugins/wifi/DivMenuItem.qml	2013-10-18 10:30:18 +0000
1768
+++ plugins/wifi/DivMenuItem.qml	2015-10-20 14:51:06 +0000
1769
@@ -17,8 +17,8 @@
1770
17
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
17
 *      Olivier Tilloy <olivier.tilloy@canonical.com>
1771
18
 */
18
 */
1772
19
19
1775
20
import QtQuick 2.0
20
import QtQuick 2.4
1776
21
import Ubuntu.Components.ListItems 0.1 as ListItem
21
import Ubuntu.Components.ListItems 1.3 as ListItem
1777
22
22
1778
23
ListItem.Empty {
23
ListItem.Empty {
1779
24
    height: units.gu(3)
24
    height: units.gu(3)
1780
25
25
1781
=== modified file 'plugins/wifi/FramedMenuItem.qml'
1782
--- plugins/wifi/FramedMenuItem.qml	2013-10-09 16:32:18 +0000
1783
+++ plugins/wifi/FramedMenuItem.qml	2015-10-20 14:51:06 +0000
1784
@@ -18,8 +18,8 @@
1785
18
 *      Nick Dedekind <nick.dedekind@canonical.com>
18
 *      Nick Dedekind <nick.dedekind@canonical.com>
1786
19
 */
19
 */
1787
20
20
1791
21
import QtQuick 2.0
21
import QtQuick 2.4
1792
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
1793
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
1794
24
24
1795
25
ListItem.Standard {}
25
ListItem.Standard {}
1796
26
26
1797
=== modified file 'plugins/wifi/HLine.qml'
1798
--- plugins/wifi/HLine.qml	2013-09-18 19:41:37 +0000
1799
+++ plugins/wifi/HLine.qml	2015-10-20 14:51:06 +0000
1800
@@ -17,8 +17,8 @@
1801
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
1802
18
 */
18
 */
1803
19
19
1806
20
import QtQuick 2.0
20
import QtQuick 2.4
1807
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
1808
22
22
1809
23
Rectangle {
23
Rectangle {
1810
24
    height: units.dp(1)
24
    height: units.dp(1)
1811
25
25
1812
=== modified file 'plugins/wifi/IndicatorBase.qml'
1813
--- plugins/wifi/IndicatorBase.qml	2013-09-18 19:41:37 +0000
1814
+++ plugins/wifi/IndicatorBase.qml	2015-10-20 14:51:06 +0000
1815
@@ -17,10 +17,10 @@
1816
17
 *      Nick Dedekind <nick.dedekind@canonical.com>
17
 *      Nick Dedekind <nick.dedekind@canonical.com>
1817
18
 */
18
 */
1818
19
19
1820
20
import QtQuick 2.0
20
import QtQuick 2.4
1821
21
import QMenuModel 0.1 as QMenuModel
21
import QMenuModel 0.1 as QMenuModel
1822
22
import SystemSettings 1.0
22
import SystemSettings 1.0
1824
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
1825
24
24
1826
25
ItemPage {
25
ItemPage {
1827
26
    id: indicatorItem
26
    id: indicatorItem
1828
27
27
1829
=== modified file 'plugins/wifi/MenuItemFactory.qml'
1830
--- plugins/wifi/MenuItemFactory.qml	2015-07-09 15:12:11 +0000
1831
+++ plugins/wifi/MenuItemFactory.qml	2015-10-20 14:51:06 +0000
1832
@@ -17,7 +17,7 @@
1833
17
 *      Nick Dedekind <nick.dedekind@canonical.com>
17
 *      Nick Dedekind <nick.dedekind@canonical.com>
1834
18
 */
18
 */
1835
19
19
1837
20
import QtQuick 2.0
20
import QtQuick 2.4
1838
21
import QMenuModel 0.1 as QMenuModel
21
import QMenuModel 0.1 as QMenuModel
1839
22
import Ubuntu.Settings.Menus 0.1 as Menus
22
import Ubuntu.Settings.Menus 0.1 as Menus
1840
23
import Ubuntu.Settings.Components 0.1 as USC
23
import Ubuntu.Settings.Components 0.1 as USC
1841
24
24
1842
=== modified file 'plugins/wifi/NetworkDetails.qml'
1843
--- plugins/wifi/NetworkDetails.qml	2015-07-13 12:23:27 +0000
1844
+++ plugins/wifi/NetworkDetails.qml	2015-10-20 14:51:06 +0000
1845
@@ -18,11 +18,11 @@
1846
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1847
19
 */
19
 */
1848
20
20
1850
21
import QtQuick 2.0
21
import QtQuick 2.4
1851
22
import QtQuick.Layouts 1.1
22
import QtQuick.Layouts 1.1
1852
23
import SystemSettings 1.0
23
import SystemSettings 1.0
1855
24
import Ubuntu.Components 0.1
24
import Ubuntu.Components 1.3
1856
25
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 1.3 as ListItem
1857
26
import Ubuntu.SystemSettings.Wifi 1.0
26
import Ubuntu.SystemSettings.Wifi 1.0
1858
27
27
1859
28
ItemPage {
28
ItemPage {
1860
29
29
1861
=== modified file 'plugins/wifi/NetworkDetailsBrief.qml'
1862
--- plugins/wifi/NetworkDetailsBrief.qml	2015-07-13 13:13:50 +0000
1863
+++ plugins/wifi/NetworkDetailsBrief.qml	2015-10-20 14:51:06 +0000
1864
@@ -18,11 +18,11 @@
1865
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
1866
19
 */
19
 */
1867
20
20
1869
21
import QtQuick 2.0
21
import QtQuick 2.4
1870
22
import QtQuick.Layouts 1.1
22
import QtQuick.Layouts 1.1
1871
23
import SystemSettings 1.0
23
import SystemSettings 1.0
1874
24
import Ubuntu.Components 0.1
24
import Ubuntu.Components 1.3
1875
25
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 1.3 as ListItem
1876
26
import Ubuntu.SystemSettings.Wifi 1.0
26
import Ubuntu.SystemSettings.Wifi 1.0
1877
27
27
1878
28
ItemPage {
28
ItemPage {
1879
29
29
1880
=== modified file 'plugins/wifi/OtherNetwork.qml'
1881
--- plugins/wifi/OtherNetwork.qml	2015-09-16 14:13:21 +0000
1882
+++ plugins/wifi/OtherNetwork.qml	2015-10-20 14:51:06 +0000
1883
@@ -14,12 +14,12 @@
1884
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1885
15
 */
15
 */
1886
16
16
1888
17
import QtQuick 2.0
17
import QtQuick 2.4
1889
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
1890
19
import SystemSettings 1.0
19
import SystemSettings 1.0
1894
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.3
1895
21
import Ubuntu.Components.ListItems 0.1 as ListItem
21
import Ubuntu.Components.ListItems 1.3 as ListItem
1896
22
import Ubuntu.Components.Popups 0.1
22
import Ubuntu.Components.Popups 1.3
1897
23
import Ubuntu.SystemSettings.Wifi 1.0
23
import Ubuntu.SystemSettings.Wifi 1.0
1898
24
import QMenuModel 0.1
24
import QMenuModel 0.1
1899
25
25
1900
26
26
1901
=== modified file 'plugins/wifi/PageComponent.qml'
1902
--- plugins/wifi/PageComponent.qml	2015-07-07 14:41:51 +0000
1903
+++ plugins/wifi/PageComponent.qml	2015-10-20 14:51:06 +0000
1904
@@ -14,11 +14,11 @@
1905
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1906
15
 */
15
 */
1907
16
16
1909
17
import QtQuick 2.0
17
import QtQuick 2.4
1910
18
import SystemSettings 1.0
18
import SystemSettings 1.0
1914
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
1915
20
import Ubuntu.Components.ListItems 0.1 as ListItem
20
import Ubuntu.Components.ListItems 1.3 as ListItem
1916
21
import Ubuntu.Components.Popups 0.1
21
import Ubuntu.Components.Popups 1.3
1917
22
import Ubuntu.SystemSettings.Wifi 1.0
22
import Ubuntu.SystemSettings.Wifi 1.0
1918
23
import QMenuModel 0.1
23
import QMenuModel 0.1
1919
24
24
1920
25
25
1921
=== modified file 'plugins/wifi/PreviousNetworks.qml'
1922
--- plugins/wifi/PreviousNetworks.qml	2014-09-26 12:52:31 +0000
1923
+++ plugins/wifi/PreviousNetworks.qml	2015-10-20 14:51:06 +0000
1924
@@ -14,10 +14,10 @@
1925
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1926
15
 */
15
 */
1927
16
16
1929
17
import QtQuick 2.0
17
import QtQuick 2.4
1930
18
import SystemSettings 1.0
18
import SystemSettings 1.0
1933
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
1934
20
import Ubuntu.Components.ListItems 0.1 as ListItem
20
import Ubuntu.Components.ListItems 1.3 as ListItem
1935
21
import Ubuntu.SystemSettings.Wifi 1.0
21
import Ubuntu.SystemSettings.Wifi 1.0
1936
22
import QMenuModel 0.1
22
import QMenuModel 0.1
1937
23
23
1938
24
24
1939
=== modified file 'plugins/wifi/RemoveBackground.qml'
1940
--- plugins/wifi/RemoveBackground.qml	2014-09-25 09:30:34 +0000
1941
+++ plugins/wifi/RemoveBackground.qml	2015-10-20 14:51:06 +0000
1942
@@ -14,8 +14,8 @@
1943
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1944
15
 */
15
 */
1945
16
16
1948
17
import QtQuick 2.0
17
import QtQuick 2.4
1949
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
1950
19
19
1951
20
Rectangle {
20
Rectangle {
1952
21
    anchors.fill: parent
21
    anchors.fill: parent
1953
22
22
1954
=== modified file 'plugins/wifi/SectionMenuItem.qml'
1955
--- plugins/wifi/SectionMenuItem.qml	2013-09-18 19:41:37 +0000
1956
+++ plugins/wifi/SectionMenuItem.qml	2015-10-20 14:51:06 +0000
1957
@@ -17,9 +17,9 @@
1958
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
1959
18
 */
18
 */
1960
19
19
1964
20
import QtQuick 2.0
20
import QtQuick 2.4
1965
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
1966
22
import Ubuntu.Components.ListItems 0.1 as ListItem
22
import Ubuntu.Components.ListItems 1.3 as ListItem
1967
23
23
1968
24
BaseMenuItem {
24
BaseMenuItem {
1969
25
    id: menuItem
25
    id: menuItem
1970
26
26
1971
=== modified file 'plugins/wifi/StandardMenuItem.qml'
1972
--- plugins/wifi/StandardMenuItem.qml	2013-10-18 10:34:32 +0000
1973
+++ plugins/wifi/StandardMenuItem.qml	2015-10-20 14:51:06 +0000
1974
@@ -17,8 +17,8 @@
1975
17
 *      Nick Dedekind <nick.dedekind@canonical.com>
17
 *      Nick Dedekind <nick.dedekind@canonical.com>
1976
18
 */
18
 */
1977
19
19
1980
20
import QtQuick 2.0
20
import QtQuick 2.4
1981
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
1982
22
22
1983
23
FramedMenuItem {
23
FramedMenuItem {
1984
24
    id: menuItem
24
    id: menuItem
1985
25
25
1986
=== modified file 'plugins/wifi/SwitchMenuItem.qml'
1987
--- plugins/wifi/SwitchMenuItem.qml	2013-10-18 10:33:28 +0000
1988
+++ plugins/wifi/SwitchMenuItem.qml	2015-10-20 14:51:06 +0000
1989
@@ -18,8 +18,8 @@
1990
18
 *      Nick Dedekind <nick.dedekind@canonical.com>
18
 *      Nick Dedekind <nick.dedekind@canonical.com>
1991
19
 */
19
 */
1992
20
20
1995
21
import QtQuick 2.0
21
import QtQuick 2.4
1996
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
1997
23
23
1998
24
FramedMenuItem {
24
FramedMenuItem {
1999
25
    id: menuItem
25
    id: menuItem
2000
26
26
2001
=== modified file 'src/SystemSettings/ItemPage.qml'
2002
--- src/SystemSettings/ItemPage.qml	2015-01-26 16:00:44 +0000
2003
+++ src/SystemSettings/ItemPage.qml	2015-10-20 14:51:06 +0000
2004
@@ -18,8 +18,8 @@
2005
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
2006
19
 */
19
 */
2007
20
20
2010
21
import QtQuick 2.0
21
import QtQuick 2.4
2011
22
import Ubuntu.Components 1.1
22
import Ubuntu.Components 1.3
2012
23
23
2013
24
Page {
24
Page {
2014
25
    id: root
25
    id: root
2015
26
26
2016
=== modified file 'src/SystemSettings/SettingsItemTitle.qml'
2017
--- src/SystemSettings/SettingsItemTitle.qml	2014-10-31 08:45:10 +0000
2018
+++ src/SystemSettings/SettingsItemTitle.qml	2015-10-20 14:51:06 +0000
2019
@@ -16,9 +16,9 @@
2020
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
2021
17
 */
17
 */
2022
18
18
2026
19
import QtQuick 2.0
19
import QtQuick 2.4
2027
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.3
2028
21
import Ubuntu.Components.ListItems 0.1 as ListItem
21
import Ubuntu.Components.ListItems 1.3 as ListItem
2029
22
22
2030
23
ListItem.Standard {
23
ListItem.Standard {
2031
24
    id: itemEmpty
24
    id: itemEmpty
2032
25
25
2033
=== modified file 'src/qml/CategoryGrid.qml'
2034
--- src/qml/CategoryGrid.qml	2015-02-02 15:47:02 +0000
2035
+++ src/qml/CategoryGrid.qml	2015-10-20 14:51:06 +0000
2036
@@ -1,6 +1,6 @@
2040
1
import QtQuick 2.0
1
import QtQuick 2.4
2041
2
import Ubuntu.Components 0.1
2
import Ubuntu.Components 1.3
2042
3
import Ubuntu.Components.ListItems 0.1 as ListItem
3
import Ubuntu.Components.ListItems 1.3 as ListItem
2043
4
4
2044
5
Column {
5
Column {
2045
6
    anchors {
6
    anchors {
2046
7
7
2047
=== modified file 'src/qml/EntryComponent.qml'
2048
--- src/qml/EntryComponent.qml	2014-09-12 16:10:50 +0000
2049
+++ src/qml/EntryComponent.qml	2015-10-20 14:51:06 +0000
2050
@@ -18,8 +18,8 @@
2051
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
2052
19
 */
19
 */
2053
20
20
2056
21
import QtQuick 2.0
21
import QtQuick 2.4
2057
22
import Ubuntu.Components 1.1
22
import Ubuntu.Components 1.3
2058
23
import Ubuntu.Settings.Components 0.1
23
import Ubuntu.Settings.Components 0.1
2059
24
24
2060
25
Item {
25
Item {
2061
@@ -70,7 +70,7 @@
2062
70
            fill: root
70
            fill: root
2063
71
            margins: -units.gu(0.25)
71
            margins: -units.gu(0.25)
2064
72
        }
72
        }
2066
73
        color: UbuntuColors.darkGrey
73
        backgroundColor: UbuntuColors.darkGrey
2067
74
        opacity: 0.15
74
        opacity: 0.15
2068
75
    }
75
    }
2069
76
}
76
}
2070
77
77
2071
=== modified file 'src/qml/MainWindow.qml'
2072
--- src/qml/MainWindow.qml	2015-06-30 20:36:26 +0000
2073
+++ src/qml/MainWindow.qml	2015-10-20 14:51:06 +0000
2074
@@ -18,9 +18,9 @@
2075
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
2076
19
 */
19
 */
2077
20
20
2081
21
import QtQuick 2.0
21
import QtQuick 2.4
2082
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
2083
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
2084
24
import SystemSettings 1.0
24
import SystemSettings 1.0
2085
25
25
2086
26
MainView {
26
MainView {
2087
@@ -30,7 +30,6 @@
2088
30
    applicationName: "ubuntu-system-settings"
30
    applicationName: "ubuntu-system-settings"
2089
31
    objectName: "systemSettingsMainView"
31
    objectName: "systemSettingsMainView"
2090
32
    automaticOrientation: true
32
    automaticOrientation: true
2091
33
    useDeprecatedToolbar: false
2092
34
    anchorToKeyboard: true
33
    anchorToKeyboard: true
2093
35
34
2094
36
    function loadPluginByName(pluginName, pluginOptions) {
35
    function loadPluginByName(pluginName, pluginOptions) {
2095
37
36
2096
=== modified file 'src/qml/UncategorizedItemsView.qml'
2097
--- src/qml/UncategorizedItemsView.qml	2014-10-27 13:17:32 +0000
2098
+++ src/qml/UncategorizedItemsView.qml	2015-10-20 14:51:06 +0000
2099
@@ -18,9 +18,9 @@
2100
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
2101
19
 */
19
 */
2102
20
20
2106
21
import QtQuick 2.0
21
import QtQuick 2.4
2107
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
2108
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
2109
24
import SystemSettings 1.0
24
import SystemSettings 1.0
2110
25
25
2111
26
Column {
26
Column {
2112
27
27
2113
=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
2114
--- tests/autopilot/ubuntu_system_settings/__init__.py	2015-09-22 20:47:28 +0000
2115
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2015-10-20 14:51:06 +0000
2116
@@ -1400,8 +1400,8 @@
2117
1400
        return False
1400
        return False
2118
1401
1401
2119
1402
    def get_current_language(self):
1402
    def get_current_language(self):
2122
1403
        return self.select_single(
1403
        return self.wait_select_single(
2123
1404
            'Label', objectName='currentLanguage').currentLanguage
1404
            objectName='currentLanguage').currentLanguage
2124
1405
1405
2125
1406
    def _click_change_display_language(self):
1406
    def _click_change_display_language(self):
2126
1407
        item = self.select_single(objectName='displayLanguage')
1407
        item = self.select_single(objectName='displayLanguage')
2127
1408
1408
2128
=== modified file 'tests/test-plugin.cpp'
2129
--- tests/test-plugin.cpp	2015-08-13 20:45:09 +0000
2130
+++ tests/test-plugin.cpp	2015-10-20 14:51:06 +0000
2131
@@ -73,7 +73,7 @@
2132
73
{
73
{
2133
74
    if (m_pageComponent == NULL) {
74
    if (m_pageComponent == NULL) {
2134
75
        QQmlComponent *page = new QQmlComponent(engine, parent);
75
        QQmlComponent *page = new QQmlComponent(engine, parent);
2136
76
        page->setData("import QtQuick 2.0\n"
76
        page->setData("import QtQuick 2.4\n"
2137
77
                      "Rectangle {\n"
77
                      "Rectangle {\n"
2138
78
                      "  function reset() { console.log('Hello') }\n"
78
                      "  function reset() { console.log('Hello') }\n"
2139
79
                      "  width: 200; height: 200;\n"
79
                      "  width: 200; height: 200;\n"
Reviewer	Review Type	Date Requested	Status
Jonas G. Drange (community)		2015-08-14	Approve on 2015-10-21
PS Jenkins bot	continuous-integration	2015-08-14	Needs Fixing on 2015-10-20
Review via email: mp+268090@code.launchpad.net