Merge lp:~ken-vandine/ubuntu-system-settings/1_3_deprecations into lp:ubuntu-system-settings

Proposed by Ken VanDine on 2015-08-14
Status: Merged
Approved by: Jonas G. Drange on 2015-10-21
Approved revision: 1512
Merged at revision: 1545
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/1_3_deprecations
Merge into: lp:ubuntu-system-settings
Prerequisite: lp:~ken-vandine/ubuntu-system-settings/wifi_dismiss_osk
Diff against target: 2139 lines (+346/-348)
123 files modified
debian/control (+1/-1)
plugins/about/DevMode.qml (+3/-3)
plugins/about/EntryComponent.qml (+3/-3)
plugins/about/License.qml (+3/-3)
plugins/about/PageComponent.qml (+3/-3)
plugins/about/SingleValueStacked.qml (+3/-3)
plugins/about/Software.qml (+3/-3)
plugins/about/Storage.qml (+3/-3)
plugins/about/StorageBar.qml (+4/-4)
plugins/about/StorageItem.qml (+3/-3)
plugins/about/Version.qml (+3/-3)
plugins/background/Components/AddRemove.qml (+2/-2)
plugins/background/Components/HighlightedOverlay.qml (+2/-2)
plugins/background/Components/ListItemsHeader.qml (+3/-3)
plugins/background/Components/OverlayImage.qml (+2/-2)
plugins/background/Components/SelectedOverlay.qml (+1/-1)
plugins/background/MainPage.qml (+4/-4)
plugins/background/Preview.qml (+3/-4)
plugins/background/WallpaperGrid.qml (+4/-4)
plugins/battery/PageComponent.qml (+3/-3)
plugins/battery/SleepValues.qml (+3/-3)
plugins/bluetooth/ConfirmPasskeyDialog.qml (+3/-3)
plugins/bluetooth/DevicePage.qml (+3/-3)
plugins/bluetooth/DisplayPasskeyDialog.qml (+3/-3)
plugins/bluetooth/PageComponent.qml (+4/-4)
plugins/bluetooth/ProvidePasskeyDialog.qml (+3/-3)
plugins/bluetooth/ProvidePinCodeDialog.qml (+3/-3)
plugins/brightness/PageComponent.qml (+3/-3)
plugins/cellular/Components/DataMultiSim.qml (+3/-3)
plugins/cellular/Components/DefaultSim.qml (+3/-3)
plugins/cellular/Components/KeyboardRectangle.qml (+1/-1)
plugins/cellular/Components/LabelTextField.qml (+3/-3)
plugins/cellular/Components/MultiSim.qml (+3/-3)
plugins/cellular/Components/NoSim.qml (+2/-2)
plugins/cellular/Components/RadioSingleSim.qml (+3/-3)
plugins/cellular/Components/Sim.qml (+1/-1)
plugins/cellular/Components/SimEditor.qml (+3/-3)
plugins/cellular/Components/SingleSim.qml (+3/-3)
plugins/cellular/Components/StandardAnimation.qml (+1/-1)
plugins/cellular/PageApnEditor.qml (+4/-4)
plugins/cellular/PageCarrierAndApn.qml (+3/-3)
plugins/cellular/PageCarriersAndApns.qml (+3/-3)
plugins/cellular/PageChooseApn.qml (+4/-4)
plugins/cellular/PageChooseCarrier.qml (+3/-3)
plugins/cellular/PageComponent.qml (+3/-3)
plugins/example/PageComponent.qml (+2/-2)
plugins/flight-mode/EntryComponent.qml (+3/-3)
plugins/hotspot/Common.qml (+1/-1)
plugins/hotspot/HotspotSetup.qml (+4/-4)
plugins/hotspot/PageComponent.qml (+4/-4)
plugins/language/DisplayLanguage.qml (+4/-4)
plugins/language/KeyboardLayoutItem.qml (+3/-3)
plugins/language/KeyboardLayouts.qml (+1/-1)
plugins/language/PageComponent.qml (+4/-4)
plugins/language/RebootNecessary.qml (+3/-3)
plugins/language/SpellChecking.qml (+3/-3)
plugins/language/SubsetView.qml (+3/-3)
plugins/notifications/PageComponent.qml (+3/-3)
plugins/orientation-lock/EntryComponent.qml (+3/-3)
plugins/phone/CallForwardItem.qml (+3/-3)
plugins/phone/CallForwarding.qml (+4/-4)
plugins/phone/CallWaiting.qml (+3/-3)
plugins/phone/KeyboardRectangle.qml (+1/-1)
plugins/phone/MultiSim.qml (+3/-3)
plugins/phone/NoSims.qml (+3/-3)
plugins/phone/Ofono.qml (+1/-1)
plugins/phone/PageComponent.qml (+3/-3)
plugins/phone/ServiceInfo.qml (+3/-3)
plugins/phone/Services.qml (+3/-3)
plugins/phone/SingleSim.qml (+3/-3)
plugins/phone/VCardParser.qml (+1/-1)
plugins/reset/EntryComponent.qml (+3/-3)
plugins/reset/EraseEverything.qml (+3/-3)
plugins/reset/PageComponent.qml (+4/-4)
plugins/reset/ResetAllSettings.qml (+3/-3)
plugins/reset/ResetLauncherHome.qml (+3/-3)
plugins/security-privacy/AppAccess.qml (+3/-3)
plugins/security-privacy/AppAccessControl.qml (+3/-3)
plugins/security-privacy/Location.qml (+3/-3)
plugins/security-privacy/LockSecurity.qml (+4/-4)
plugins/security-privacy/Ofono.qml (+1/-1)
plugins/security-privacy/PageComponent.qml (+3/-3)
plugins/security-privacy/PhoneLocking.qml (+3/-3)
plugins/security-privacy/SimPin.qml (+4/-4)
plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml (+3/-3)
plugins/security-privacy/diagnostics/PageComponent.qml (+3/-3)
plugins/security-privacy/here-terms.qml (+2/-2)
plugins/sound/PageComponent.qml (+3/-3)
plugins/sound/SoundsList.qml (+3/-3)
plugins/system-update/Configuration.qml (+3/-3)
plugins/system-update/EntryComponent.qml (+3/-3)
plugins/system-update/PageComponent.qml (+4/-4)
plugins/time-date/ChooseTimeZone.qml (+3/-3)
plugins/time-date/PageComponent.qml (+4/-4)
plugins/time-date/Scroller.qml (+3/-3)
plugins/time-date/TimePicker.qml (+4/-4)
plugins/wifi/AccessPoint.qml (+3/-3)
plugins/wifi/BaseMenuItem.qml (+2/-2)
plugins/wifi/CertDialog.qml (+4/-4)
plugins/wifi/CertPicker.qml (+3/-3)
plugins/wifi/Common.qml (+1/-1)
plugins/wifi/DivMenuItem.qml (+2/-2)
plugins/wifi/FramedMenuItem.qml (+3/-3)
plugins/wifi/HLine.qml (+2/-2)
plugins/wifi/IndicatorBase.qml (+2/-2)
plugins/wifi/MenuItemFactory.qml (+1/-1)
plugins/wifi/NetworkDetails.qml (+3/-3)
plugins/wifi/NetworkDetailsBrief.qml (+3/-3)
plugins/wifi/OtherNetwork.qml (+4/-4)
plugins/wifi/PageComponent.qml (+4/-4)
plugins/wifi/PreviousNetworks.qml (+3/-3)
plugins/wifi/RemoveBackground.qml (+2/-2)
plugins/wifi/SectionMenuItem.qml (+3/-3)
plugins/wifi/StandardMenuItem.qml (+2/-2)
plugins/wifi/SwitchMenuItem.qml (+2/-2)
src/SystemSettings/ItemPage.qml (+2/-2)
src/SystemSettings/SettingsItemTitle.qml (+3/-3)
src/qml/CategoryGrid.qml (+3/-3)
src/qml/EntryComponent.qml (+3/-3)
src/qml/MainWindow.qml (+3/-4)
src/qml/UncategorizedItemsView.qml (+3/-3)
tests/autopilot/ubuntu_system_settings/__init__.py (+2/-2)
tests/test-plugin.cpp (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-system-settings/1_3_deprecations
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

This proposal supersedes a proposal from 2015-08-06.

Commit message

Bump Ubuntu.Components imports to 1.3 and fixed UbuntuShape deprecations

Description of the change

Bump Ubuntu.Components imports to 1.3 and fixed UbuntuShape deprecations

To post a comment you must log in.
Jonas G. Drange (jonas-drange) wrote : Posted in a previous version of this proposal

LGTM

review: Approve
1509. By Ken VanDine on 2015-08-21

merged trunk

1510. By Ken VanDine on 2015-09-18

merged trunk

1511. By Ken VanDine on 2015-10-16

Merged trunk

1512. By Ken VanDine on 2015-10-20

merged fix from jgdx

Jonas G. Drange (jonas-drange) wrote :

Security & Privacy -> Locking and unlocking -> Lock security -> Change passcode… gives me

2015-10-20 17:07:50,642 - WARNING - file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/ListItems/1.3/SingleControl.qml:60: TypeError: Cannot assign to read-only property "pressed"

Is this new? Something we need to do about it?

review: Needs Information
Jonas G. Drange (jonas-drange) wrote :

Storage takes 11 seconds on average to open. Is this due to suppressed warnings? I'm not seeing anything in stderr.

review: Needs Information
Ken VanDine (ken-vandine) wrote :

> Security & Privacy -> Locking and unlocking -> Lock security -> Change
> passcode… gives me
>
> 2015-10-20 17:07:50,642 - WARNING - file:///usr/lib/arm-linux-
> gnueabihf/qt5/qml/Ubuntu/Components/ListItems/1.3/SingleControl.qml:60:
> TypeError: Cannot assign to read-only property "pressed"
>
> Is this new? Something we need to do about it?

This is an API change in 1.3, i'll fix it.

Ken VanDine (ken-vandine) wrote :

> > Security & Privacy -> Locking and unlocking -> Lock security -> Change
> > passcode… gives me
> >
> > 2015-10-20 17:07:50,642 - WARNING - file:///usr/lib/arm-linux-
> > gnueabihf/qt5/qml/Ubuntu/Components/ListItems/1.3/SingleControl.qml:60:
> > TypeError: Cannot assign to read-only property "pressed"
> >
> > Is this new? Something we need to do about it?
>
> This is an API change in 1.3, i'll fix it.

Scratch that, it's a change in the API but not a part of the API we are using directly. So nothing we can do about it.

Jonas G. Drange (jonas-drange) wrote :

Looks good, works well.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 qml-module-qtsysteminfo,
6 qtdeclarative5-ubuntu-content1,
7 qtdeclarative5-ubuntu-settings-components (>> 0.6),
8- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1347) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1347),
9+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1584) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1584),
10 suru-icon-theme (>= 14.04+15.04.20150813~),
11 whoopsie-preferences (>= 0.9),
12 libsystemsettings1 (= ${binary:Version}),
13
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 *
19 */
20
21-import QtQuick 2.0
22+import QtQuick 2.4
23 import Qt.labs.folderlistmodel 1.0
24 import SystemSettings 1.0
25-import Ubuntu.Components 0.1
26-import Ubuntu.Components.ListItems 0.1 as ListItem
27+import Ubuntu.Components 1.3
28+import Ubuntu.Components.ListItems 1.3 as ListItem
29 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
30 import Ubuntu.SystemSettings.StorageAbout 1.0
31
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
38 */
39
40-import QtQuick 2.0
41-import Ubuntu.Components 0.1
42-import Ubuntu.Components.ListItems 0.1 as ListItem
43+import QtQuick 2.4
44+import Ubuntu.Components 1.3
45+import Ubuntu.Components.ListItems 1.3 as ListItem
46
47 ListItem.Standard {
48 id: root
49
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 @@
54-import QtQuick 2.0
55+import QtQuick 2.4
56 import SystemSettings 1.0
57-import Ubuntu.Components 0.1
58-import Ubuntu.Components.ListItems 0.1 as ListItem
59+import Ubuntu.Components 1.3
60+import Ubuntu.Components.ListItems 1.3 as ListItem
61 import Ubuntu.SystemSettings.StorageAbout 1.0
62
63 ItemPage {
64
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
70 */
71
72-import QtQuick 2.0
73+import QtQuick 2.4
74 import QtSystemInfo 5.0
75 import SystemSettings 1.0
76-import Ubuntu.Components 0.1
77-import Ubuntu.Components.ListItems 0.1 as ListItem
78+import Ubuntu.Components 1.3
79+import Ubuntu.Components.ListItems 1.3 as ListItem
80 import Ubuntu.SystemSettings.StorageAbout 1.0
81 import Ubuntu.SystemSettings.Update 1.0
82 import MeeGo.QOfono 0.2
83
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 * DRY
89 *
90 */
91-import QtQuick 2.0
92-import Ubuntu.Components 0.1
93-import Ubuntu.Components.ListItems 0.1 as ListItem
94+import QtQuick 2.4
95+import Ubuntu.Components 1.3
96+import Ubuntu.Components.ListItems 1.3 as ListItem
97
98 ListItem.SingleValue {
99
100
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 @@
105-import QtQuick 2.0
106+import QtQuick 2.4
107 import Qt.labs.folderlistmodel 1.0
108 import SystemSettings 1.0
109-import Ubuntu.Components 0.1
110-import Ubuntu.Components.ListItems 0.1 as ListItem
111+import Ubuntu.Components 1.3
112+import Ubuntu.Components.ListItems 1.3 as ListItem
113 import Ubuntu.SystemSettings.StorageAbout 1.0
114
115 ItemPage {
116
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 */
122
123 import GSettings 1.0
124-import QtQuick 2.0
125+import QtQuick 2.4
126 import QtSystemInfo 5.0
127 import SystemSettings 1.0
128-import Ubuntu.Components 0.1
129-import Ubuntu.Components.ListItems 0.1 as ListItem
130+import Ubuntu.Components 1.3
131+import Ubuntu.Components.ListItems 1.3 as ListItem
132 import Ubuntu.SystemSettings.StorageAbout 1.0
133
134 ItemPage {
135
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 @@
140-import QtQuick 2.0
141-import Ubuntu.Components 0.1
142+import QtQuick 2.4
143+import Ubuntu.Components 1.3
144
145 Item {
146 property bool ready: false
147@@ -9,11 +9,11 @@
148
149 UbuntuShape {
150 //border.width: 1
151- color: "white"
152+ backgroundColor: "white"
153 clip: true
154 height: units.gu(3)
155 width: parent.width
156- image: ses
157+ source: ses
158 }
159
160 ShaderEffectSource {
161
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 @@
166-import QtQuick 2.0
167-import Ubuntu.Components 0.1
168+import QtQuick 2.4
169+import Ubuntu.Components 1.3
170
171 Item {
172 property string label
173@@ -17,7 +17,7 @@
174 anchors.verticalCenter: parent.verticalCenter
175 width: units.gu(3)
176 height: units.gu(2)
177- color: colorName
178+ backgroundColor: colorName
179 }
180 Label { text: label }
181 }
182
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 *
188 */
189
190-import QtQuick 2.0
191+import QtQuick 2.4
192 import Qt.labs.folderlistmodel 1.0
193 import SystemSettings 1.0
194-import Ubuntu.Components 0.1
195-import Ubuntu.Components.ListItems 0.1 as ListItem
196+import Ubuntu.Components 1.3
197+import Ubuntu.Components.ListItems 1.3 as ListItem
198 import Ubuntu.SystemSettings.StorageAbout 1.0
199 import Ubuntu.SystemSettings.Update 1.0
200
201
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 *
207 */
208
209-import QtQuick 2.0
210+import QtQuick 2.4
211 import SystemSettings 1.0
212-import Ubuntu.Components 0.1
213+import Ubuntu.Components 1.3
214 import "../utilities.js" as Utilities
215
216 Row {
217
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 *
223 */
224
225-import QtQuick 2.0
226-import Ubuntu.Components 0.1
227+import QtQuick 2.4
228+import Ubuntu.Components 1.3
229
230 Rectangle {
231 border.width: units.gu(1)
232
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
238 */
239
240-import QtQuick 2.0
241-import Ubuntu.Components 0.1
242-import Ubuntu.Components.ListItems 0.1 as ListItem
243+import QtQuick 2.4
244+import Ubuntu.Components 1.3
245+import Ubuntu.Components.ListItems 1.3 as ListItem
246
247 Item {
248 property alias text: label.text
249
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 *
255 */
256
257-import QtQuick 2.0
258-import Ubuntu.Components 0.1
259+import QtQuick 2.4
260+import Ubuntu.Components 1.3
261
262 Item {
263 id: overlayImage
264
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 *
270 */
271
272-import QtQuick 2.0
273+import QtQuick 2.4
274
275 Image {
276 anchors.right: parent.right
277
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 *
283 */
284
285-import QtQuick 2.0
286+import QtQuick 2.4
287 import GSettings 1.0
288 import SystemSettings 1.0
289 import Ubuntu.Content 0.1
290-import Ubuntu.Components 0.1
291-import Ubuntu.Components.ListItems 0.1 as ListItem
292-import Ubuntu.Components.Popups 0.1
293+import Ubuntu.Components 1.3
294+import Ubuntu.Components.ListItems 1.3 as ListItem
295+import Ubuntu.Components.Popups 1.3
296 import Ubuntu.SystemSettings.Background 1.0
297 import "utilities.js" as Utilities
298
299
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 *
305 */
306
307-import QtQuick 2.0
308+import QtQuick 2.4
309 import SystemSettings 1.0
310-import Ubuntu.Components 0.1
311-import Ubuntu.Components.ListItems 0.1 as ListItem
312+import Ubuntu.Components 1.3
313+import Ubuntu.Components.ListItems 1.3 as ListItem
314
315 ItemPage {
316 id: preview
317@@ -35,7 +35,6 @@
318 property Item headerStyle: header.__styleInstance ?
319 header.__styleInstance : null
320
321- tools: null
322 Component.onCompleted: {
323 /* change the header text color to make it more readable over the background */
324 if (headerStyle.hasOwnProperty("textColor"))
325
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 *
331 */
332
333-import QtQuick 2.0
334-import Ubuntu.Components 0.1
335-import Ubuntu.Components.ListItems 0.1 as ListItem
336-import Ubuntu.Components.Popups 0.1
337+import QtQuick 2.4
338+import Ubuntu.Components 1.3
339+import Ubuntu.Components.ListItems 1.3 as ListItem
340+import Ubuntu.Components.Popups 1.3
341 import "Components"
342 import "utilities.js" as Utilities
343
344
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
350 import GSettings 1.0
351 import QMenuModel 0.1
352-import QtQuick 2.0
353+import QtQuick 2.4
354 import QtSystemInfo 5.0
355 import SystemSettings 1.0
356-import Ubuntu.Components 0.1
357-import Ubuntu.Components.ListItems 0.1 as ListItem
358+import Ubuntu.Components 1.3
359+import Ubuntu.Components.ListItems 1.3 as ListItem
360 import Ubuntu.SystemSettings.Battery 1.0
361 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
362 import Ubuntu.Settings.Components 0.1 as USC
363
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 // IF YOU RENAME IT YOU MUST UPDATE THE REFERENCE THERE.
369
370 import GSettings 1.0
371-import QtQuick 2.0
372-import Ubuntu.Components 0.1
373-import Ubuntu.Components.ListItems 0.1 as ListItem
374+import QtQuick 2.4
375+import Ubuntu.Components 1.3
376+import Ubuntu.Components.ListItems 1.3 as ListItem
377 import SystemSettings 1.0
378 import Ubuntu.SystemSettings.Battery 1.0
379
380
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 */
386
387
388-import QtQuick 2.0
389-import Ubuntu.Components 0.1
390-import Ubuntu.Components.Popups 0.1
391+import QtQuick 2.4
392+import Ubuntu.Components 1.3
393+import Ubuntu.Components.Popups 1.3
394
395 Dialog {
396 id: root
397
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 import QMenuModel 0.1
403 import QtQuick 2.0
404 import SystemSettings 1.0
405-import Ubuntu.Components 0.1
406-import Ubuntu.Components.Popups 0.1
407-import Ubuntu.Components.ListItems 0.1 as ListItem
408+import Ubuntu.Components 1.3
409+import Ubuntu.Components.Popups 1.3
410+import Ubuntu.Components.ListItems 1.3 as ListItem
411 import Ubuntu.SystemSettings.Bluetooth 1.0
412
413 Page {
414
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 */
420
421
422-import QtQuick 2.0
423-import Ubuntu.Components 0.1
424-import Ubuntu.Components.Popups 0.1
425+import QtQuick 2.4
426+import Ubuntu.Components 1.3
427+import Ubuntu.Components.Popups 1.3
428
429 Dialog {
430 id: root
431
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 */
437
438 import QMenuModel 0.1
439-import QtQuick 2.0
440+import QtQuick 2.4
441 import SystemSettings 1.0
442-import Ubuntu.Components 0.1
443-import Ubuntu.Components.Popups 0.1
444-import Ubuntu.Components.ListItems 0.1 as ListItem
445+import Ubuntu.Components 1.3
446+import Ubuntu.Components.Popups 1.3
447+import Ubuntu.Components.ListItems 1.3 as ListItem
448 import Ubuntu.SystemSettings.Bluetooth 1.0
449 import Ubuntu.Settings.Components 0.1 as USC
450
451
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 */
457
458
459-import QtQuick 2.0
460-import Ubuntu.Components 0.1
461-import Ubuntu.Components.Popups 0.1
462+import QtQuick 2.4
463+import Ubuntu.Components 1.3
464+import Ubuntu.Components.Popups 1.3
465
466 Dialog {
467 id: root
468
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 */
474
475
476-import QtQuick 2.0
477-import Ubuntu.Components 0.1
478-import Ubuntu.Components.Popups 0.1
479+import QtQuick 2.4
480+import Ubuntu.Components 1.3
481+import Ubuntu.Components.Popups 1.3
482
483 Dialog {
484 id: root
485
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 */
491
492 import GSettings 1.0
493-import QtQuick 2.0
494+import QtQuick 2.4
495 import SystemSettings 1.0
496-import Ubuntu.Components 0.1
497-import Ubuntu.Components.ListItems 0.1 as ListItem
498+import Ubuntu.Components 1.3
499+import Ubuntu.Components.ListItems 1.3 as ListItem
500 import Ubuntu.SystemSettings.Brightness 1.0
501 import Ubuntu.Settings.Menus 0.1 as Menus
502 import Ubuntu.Settings.Components 0.1 as USC
503
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 * Jonas G. Drange <jonas.drange@canonical.com>
509 *
510 */
511-import QtQuick 2.0
512+import QtQuick 2.4
513 import SystemSettings 1.0
514-import Ubuntu.Components 0.1
515-import Ubuntu.Components.ListItems 0.1 as ListItem
516+import Ubuntu.Components 1.3
517+import Ubuntu.Components.ListItems 1.3 as ListItem
518
519 Column {
520
521
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 * Jonas G. Drange <jonas.drange@canonical.com>
527 *
528 */
529-import QtQuick 2.0
530+import QtQuick 2.4
531 import SystemSettings 1.0
532-import Ubuntu.Components 0.1
533-import Ubuntu.Components.ListItems 0.1 as ListItem
534+import Ubuntu.Components 1.3
535+import Ubuntu.Components.ListItems 1.3 as ListItem
536
537 Column {
538
539
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
545 */
546
547-import QtQuick 2.2
548+import QtQuick 2.4
549
550 Item {
551 id: keyboardRect
552
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
558 */
559
560-import QtQuick 2.0
561-import Ubuntu.Components 1.1
562-import Ubuntu.Components.Themes.Ambiance 0.1
563+import QtQuick 2.4
564+import Ubuntu.Components 1.3
565+import Ubuntu.Components.Themes.Ambiance 1.3
566 import Ubuntu.Keyboard 0.1
567 import SystemSettings 1.0
568
569
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 * Jonas G. Drange <jonas.drange@canonical.com>
575 *
576 */
577-import QtQuick 2.0
578+import QtQuick 2.4
579 import GSettings 1.0
580 import SystemSettings 1.0
581-import Ubuntu.Components 0.1
582-import Ubuntu.Components.ListItems 0.1 as ListItem
583+import Ubuntu.Components 1.3
584+import Ubuntu.Components.ListItems 1.3 as ListItem
585
586 /* This is a temporary solution to the issue of Hotspots failing on mako. If
587 the device is mako, we hide the hotspot entry. Will be removed once lp:1434591
588
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 * Jonas G. Drange <jonas.drange@canonical.com>
594 *
595 */
596-import QtQuick 2.0
597-import Ubuntu.Components 1.1
598+import QtQuick 2.4
599+import Ubuntu.Components 1.3
600
601 Column {
602
603
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 * Jonas G. Drange <jonas.drange@canonical.com>
609 *
610 */
611-import QtQuick 2.0
612+import QtQuick 2.4
613 import SystemSettings 1.0
614-import Ubuntu.Components 0.1
615-import Ubuntu.Components.ListItems 0.1 as ListItem
616+import Ubuntu.Components 1.3
617+import Ubuntu.Components.ListItems 1.3 as ListItem
618
619 Column {
620 id: radioSingleSim
621
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 * Jonas G. Drange <jonas.drange@canonical.com>
627 *
628 */
629-import QtQuick 2.0
630+import QtQuick 2.4
631 import MeeGo.QOfono 0.2
632
633 Item {
634
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 * Jonas G. Drange <jonas.drange@canonical.com>
640 *
641 */
642-import QtQuick 2.0
643+import QtQuick 2.4
644 import SystemSettings 1.0
645-import Ubuntu.Components 1.1
646-import Ubuntu.Components.ListItems 0.1 as ListItem
647+import Ubuntu.Components 1.3
648+import Ubuntu.Components.ListItems 1.3 as ListItem
649
650 Column {
651 id: simList
652
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 * Jonas G. Drange <jonas.drange@canonical.com>
658 *
659 */
660-import QtQuick 2.0
661+import QtQuick 2.4
662 import SystemSettings 1.0
663-import Ubuntu.Components 0.1
664-import Ubuntu.Components.ListItems 0.1 as ListItem
665+import Ubuntu.Components 1.3
666+import Ubuntu.Components.ListItems 1.3 as ListItem
667
668 Column {
669
670
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
676 */
677
678-import QtQuick 2.2
679+import QtQuick 2.4
680
681 NumberAnimation {
682 duration: 300
683
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
689 */
690
691-import QtQuick 2.0
692+import QtQuick 2.4
693 import SystemSettings 1.0
694-import Ubuntu.Components 1.1
695-import Ubuntu.Components.Popups 1.0
696-import Ubuntu.Components.ListItems 1.0 as ListItem
697+import Ubuntu.Components 1.3
698+import Ubuntu.Components.Popups 1.3
699+import Ubuntu.Components.ListItems 1.3 as ListItem
700 import MeeGo.QOfono 0.2
701 import "Components" as LocalComponents
702 import "apn_editor.js" as Editor
703
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 * Jonas G. Drange <jonas.drange@canonical.com>
709 *
710 */
711-import QtQuick 2.0
712+import QtQuick 2.4
713 import SystemSettings 1.0
714-import Ubuntu.Components 0.1
715-import Ubuntu.Components.ListItems 0.1 as ListItem
716+import Ubuntu.Components 1.3
717+import Ubuntu.Components.ListItems 1.3 as ListItem
718
719 ItemPage {
720 id: root
721
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 * Jonas G. Drange <jonas.drange@canonical.com>
727 *
728 */
729-import QtQuick 2.0
730+import QtQuick 2.4
731 import SystemSettings 1.0
732-import Ubuntu.Components 0.1
733-import Ubuntu.Components.ListItems 0.1 as ListItem
734+import Ubuntu.Components 1.3
735+import Ubuntu.Components.ListItems 1.3 as ListItem
736
737 ItemPage {
738 id: root
739
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 *
745 */
746
747-import QtQuick 2.0
748+import QtQuick 2.4
749 import SystemSettings 1.0
750-import Ubuntu.Components 1.1
751-import Ubuntu.Components.Popups 1.0
752-import Ubuntu.Components.ListItems 1.0 as ListItem
753+import Ubuntu.Components 1.3
754+import Ubuntu.Components.Popups 1.3
755+import Ubuntu.Components.ListItems 1.3 as ListItem
756 import MeeGo.QOfono 0.2
757 import Ubuntu.SystemSettings.Cellular 1.0
758 import "apn_manager.js" as Manager
759
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
765 */
766
767-import QtQuick 2.0
768+import QtQuick 2.4
769 import QtQuick.Layouts 1.1
770 import SystemSettings 1.0
771-import Ubuntu.Components 1.1
772-import Ubuntu.Components.ListItems 1.0 as ListItem
773+import Ubuntu.Components 1.3
774+import Ubuntu.Components.ListItems 1.3 as ListItem
775 import MeeGo.QOfono 0.2
776 import "carriers.js" as CHelper
777
778
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
784 */
785
786-import QtQuick 2.0
787+import QtQuick 2.4
788 import SystemSettings 1.0
789 import Ubuntu.SystemSettings.Cellular 1.0
790-import Ubuntu.Components 0.1
791-import Ubuntu.Components.ListItems 0.1 as ListItem
792+import Ubuntu.Components 1.3
793+import Ubuntu.Components.ListItems 1.3 as ListItem
794 import MeeGo.QOfono 0.2
795 import QMenuModel 0.1
796 import "Components" as LocalComponents
797
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
803 */
804
805-import QtQuick 2.0
806-import Ubuntu.Components 0.1
807+import QtQuick 2.4
808+import Ubuntu.Components 1.3
809 import SystemSettings 1.0
810
811 ItemPage {
812
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
818 */
819
820-import QtQuick 2.0
821-import Ubuntu.Components 0.1
822-import Ubuntu.Components.ListItems 0.1 as ListItem
823+import QtQuick 2.4
824+import Ubuntu.Components 1.3
825+import Ubuntu.Components.ListItems 1.3 as ListItem
826 import Ubuntu.SystemSettings.FlightMode 1.0 as FlightMode
827 import Ubuntu.Settings.Components 0.1 as USC
828
829
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 * Jonas G. Drange <jonas.drange@canonical.com>
835 *
836 */
837-import QtQuick 2.0
838+import QtQuick 2.4
839
840 Item {
841 /*
842
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
848 */
849
850-import QtQuick 2.0
851+import QtQuick 2.4
852 import QtQuick.Layouts 1.1
853 import SystemSettings 1.0
854-import Ubuntu.Components 0.1
855-import Ubuntu.Components.ListItems 0.1 as ListItem
856+import Ubuntu.Components 1.3
857+import Ubuntu.Components.ListItems 1.3 as ListItem
858+import Ubuntu.Components.Popups 1.3
859 import Ubuntu.Connectivity 1.0
860 import Ubuntu.SystemSettings.Cellular 1.0
861-import Ubuntu.Components.Popups 0.1
862
863 Component {
864 id: hotspotSetup
865
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
871 */
872
873-import QtQuick 2.0
874+import QtQuick 2.4
875 import SystemSettings 1.0
876-import Ubuntu.Components 0.1
877-import Ubuntu.Components.ListItems 0.1 as ListItem
878-import Ubuntu.Components.Popups 0.1
879+import Ubuntu.Components 1.3
880+import Ubuntu.Components.ListItems 1.3 as ListItem
881+import Ubuntu.Components.Popups 1.3
882 import Ubuntu.Connectivity 1.0
883
884 ItemPage {
885
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
891 */
892
893-import QtQuick 2.0
894-import Ubuntu.Components 0.1
895-import Ubuntu.Components.Popups 0.1
896-import Ubuntu.Components.ListItems 0.1 as ListItem
897+import QtQuick 2.4
898+import Ubuntu.Components 1.3
899+import Ubuntu.Components.Popups 1.3
900+import Ubuntu.Components.ListItems 1.3 as ListItem
901 import Ubuntu.SystemSettings.LanguagePlugin 1.0
902
903 SheetBase {
904
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
910 */
911
912-import QtQuick 2.0
913-import Ubuntu.Components 0.1
914-import Ubuntu.Components.ListItems 0.1 as ListItem
915+import QtQuick 2.4
916+import Ubuntu.Components 1.3
917+import Ubuntu.Components.ListItems 1.3 as ListItem
918
919 ListItem.Base {
920 property alias name: name.text
921
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 */
927
928 import SystemSettings 1.0
929-import Ubuntu.Components.ListItems 0.1 as ListItem
930+import Ubuntu.Components.ListItems 1.3 as ListItem
931 import Ubuntu.SystemSettings.LanguagePlugin 1.0
932
933 ItemPage {
934
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
940 */
941
942-import QtQuick 2.0
943+import QtQuick 2.4
944 import GSettings 1.0
945 import SystemSettings 1.0
946-import Ubuntu.Components 0.1
947-import Ubuntu.Components.Popups 0.1
948-import Ubuntu.Components.ListItems 0.1 as ListItem
949+import Ubuntu.Components 1.3
950+import Ubuntu.Components.Popups 1.3
951+import Ubuntu.Components.ListItems 1.3 as ListItem
952 import Ubuntu.Settings.Menus 0.1 as Menus
953 import Ubuntu.SystemSettings.LanguagePlugin 1.0
954
955
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
961 */
962
963-import QtQuick 2.0
964-import Ubuntu.Components 0.1
965-import Ubuntu.Components.Popups 0.1
966+import QtQuick 2.4
967+import Ubuntu.Components 1.3
968+import Ubuntu.Components.Popups 1.3
969
970 Dialog {
971 id: dialog
972
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
978 */
979
980-import QtQuick 2.0
981+import QtQuick 2.4
982 import GSettings 1.0
983 import SystemSettings 1.0
984-import Ubuntu.Components 0.1
985-import Ubuntu.Components.ListItems 0.1 as ListItem
986+import Ubuntu.Components 1.3
987+import Ubuntu.Components.ListItems 1.3 as ListItem
988 import Ubuntu.SystemSettings.LanguagePlugin 1.0
989
990 ItemPage {
991
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
997 */
998
999-import QtQuick 2.0
1000+import QtQuick 2.4
1001 import SystemSettings 1.0
1002-import Ubuntu.Components 0.1
1003-import Ubuntu.Components.ListItems 0.1 as ListItem
1004+import Ubuntu.Components 1.3
1005+import Ubuntu.Components.ListItems 1.3 as ListItem
1006
1007 ListView {
1008 id: root
1009
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1015 */
1016
1017-import QtQuick 2.0
1018-import Ubuntu.Components 0.1
1019-import Ubuntu.Components.ListItems 0.1 as ListItem
1020+import QtQuick 2.4
1021+import Ubuntu.Components 1.3
1022+import Ubuntu.Components.ListItems 1.3 as ListItem
1023 import Ubuntu.SystemSettings.Notifications 1.0
1024 import SystemSettings 1.0
1025
1026
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 */
1032
1033 import GSettings 1.0
1034-import QtQuick 2.0
1035+import QtQuick 2.4
1036 import QtQuick.Window 2.1
1037-import Ubuntu.Components 0.1
1038-import Ubuntu.Components.ListItems 0.1 as ListItem
1039+import Ubuntu.Components 1.3
1040+import Ubuntu.Components.ListItems 1.3 as ListItem
1041
1042
1043 ListItem.Standard {
1044
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1050 */
1051
1052-import QtQuick 2.0
1053-import Ubuntu.Components 1.1
1054-import Ubuntu.Components.ListItems 0.1 as ListItem
1055+import QtQuick 2.4
1056+import Ubuntu.Components 1.3
1057+import Ubuntu.Components.ListItems 1.3 as ListItem
1058 import Ubuntu.Components.Themes.Ambiance 0.1
1059 import MeeGo.QOfono 0.2
1060 import "callForwardingUtils.js" as Utils
1061
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 * “Contact {carrier name} for more information.”.
1067 */
1068
1069-import QtQuick 2.0
1070+import QtQuick 2.4
1071 import QtContacts 5.0
1072 import SystemSettings 1.0
1073-import Ubuntu.Components 1.1
1074-import Ubuntu.Components.ListItems 0.1 as ListItem
1075-import Ubuntu.Components.Popups 0.1
1076+import Ubuntu.Components 1.3
1077+import Ubuntu.Components.ListItems 1.3 as ListItem
1078+import Ubuntu.Components.Popups 1.3
1079 import Ubuntu.Components.Themes.Ambiance 0.1
1080 import Ubuntu.Content 0.1
1081 import "callForwardingUtils.js" as Utils
1082
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1088 */
1089
1090-import QtQuick 2.0
1091+import QtQuick 2.4
1092 import SystemSettings 1.0
1093-import Ubuntu.Components 0.1
1094-import Ubuntu.Components.ListItems 0.1 as ListItem
1095+import Ubuntu.Components 1.3
1096+import Ubuntu.Components.ListItems 1.3 as ListItem
1097 import MeeGo.QOfono 0.2
1098
1099 ItemPage {
1100
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1106 */
1107
1108-import QtQuick 2.2
1109+import QtQuick 2.4
1110
1111 Item {
1112 id: keyboardRect
1113
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 * Jonas G. Drange <jonas.drange@canonical.com>
1119 *
1120 */
1121-import QtQuick 2.0
1122+import QtQuick 2.4
1123 import GSettings 1.0
1124 import SystemSettings 1.0
1125-import Ubuntu.Components 1.1
1126-import Ubuntu.Components.ListItems 0.1 as ListItem
1127+import Ubuntu.Components 1.3
1128+import Ubuntu.Components.ListItems 1.3 as ListItem
1129
1130 Column {
1131
1132
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 * Jonas G. Drange <jonas.drange@canonical.com>
1138 *
1139 */
1140-import QtQuick 2.0
1141-import Ubuntu.Components 1.1
1142-import Ubuntu.Components.ListItems 0.1 as ListItem
1143+import QtQuick 2.4
1144+import Ubuntu.Components 1.3
1145+import Ubuntu.Components.ListItems 1.3 as ListItem
1146
1147 Column {
1148
1149
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 * Jonas G. Drange <jonas.drange@canonical.com>
1155 *
1156 */
1157-import QtQuick 2.0
1158+import QtQuick 2.4
1159 import MeeGo.QOfono 0.2
1160
1161 Item {
1162
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1168 */
1169
1170-import QtQuick 2.0
1171+import QtQuick 2.4
1172 import SystemSettings 1.0
1173-import Ubuntu.Components 0.1
1174-import Ubuntu.Components.ListItems 0.1 as ListItem
1175+import Ubuntu.Components 1.3
1176+import Ubuntu.Components.ListItems 1.3 as ListItem
1177 import Ubuntu.SystemSettings.Sound 1.0
1178 import MeeGo.QOfono 0.2
1179 import "sims.js" as Sims
1180
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1186 */
1187
1188-import QtQuick 2.0
1189+import QtQuick 2.4
1190 import SystemSettings 1.0
1191-import Ubuntu.Components 0.1
1192-import Ubuntu.Components.ListItems 0.1 as ListItem
1193+import Ubuntu.Components 1.3
1194+import Ubuntu.Components.ListItems 1.3 as ListItem
1195 import Ubuntu.History 0.1
1196 import "dateUtils.js" as DateUtils
1197
1198
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1204 */
1205
1206-import QtQuick 2.0
1207+import QtQuick 2.4
1208 import SystemSettings 1.0
1209-import Ubuntu.Components 0.1
1210-import Ubuntu.Components.ListItems 0.1 as ListItem
1211+import Ubuntu.Components 1.3
1212+import Ubuntu.Components.ListItems 1.3 as ListItem
1213
1214 ItemPage {
1215 id: root
1216
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 * Jonas G. Drange <jonas.drange@canonical.com>
1222 *
1223 */
1224-import QtQuick 2.0
1225-import Ubuntu.Components 1.1
1226-import Ubuntu.Components.ListItems 0.1 as ListItem
1227+import QtQuick 2.4
1228+import Ubuntu.Components 1.3
1229+import Ubuntu.Components.ListItems 1.3 as ListItem
1230
1231 Column {
1232
1233
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1239 */
1240
1241-import QtQuick 2.2
1242+import QtQuick 2.4
1243 import QtContacts 5.0
1244
1245 QtObject {
1246
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1252 */
1253
1254-import QtQuick 2.0
1255-import Ubuntu.Components 0.1
1256-import Ubuntu.Components.ListItems 0.1 as ListItem
1257+import QtQuick 2.4
1258+import Ubuntu.Components 1.3
1259+import Ubuntu.Components.ListItems 1.3 as ListItem
1260
1261 ListItem.Standard {
1262 id: root
1263
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1269 */
1270
1271-import QtQuick 2.0
1272-import Ubuntu.Components 0.1
1273-import Ubuntu.Components.Popups 0.1
1274+import QtQuick 2.4
1275+import Ubuntu.Components 1.3
1276+import Ubuntu.Components.Popups 1.3
1277
1278 Component {
1279 id: eraseEverything
1280
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 */
1286
1287 import GSettings 1.0
1288-import QtQuick 2.0
1289+import QtQuick 2.4
1290 import SystemSettings 1.0
1291-import Ubuntu.Components 0.1
1292-import Ubuntu.Components.ListItems 0.1 as ListItem
1293-import Ubuntu.Components.Popups 0.1
1294+import Ubuntu.Components 1.3
1295+import Ubuntu.Components.ListItems 1.3 as ListItem
1296+import Ubuntu.Components.Popups 1.3
1297 import Ubuntu.SystemSettings.Reset 1.0
1298
1299 ItemPage {
1300
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1306 */
1307
1308-import QtQuick 2.0
1309-import Ubuntu.Components 0.1
1310-import Ubuntu.Components.Popups 0.1
1311+import QtQuick 2.4
1312+import Ubuntu.Components 1.3
1313+import Ubuntu.Components.Popups 1.3
1314
1315 Component {
1316 id: resetAllSettings
1317
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1323 */
1324
1325-import QtQuick 2.0
1326-import Ubuntu.Components 0.1
1327-import Ubuntu.Components.Popups 0.1
1328+import QtQuick 2.4
1329+import Ubuntu.Components 1.3
1330+import Ubuntu.Components.Popups 1.3
1331
1332 Component {
1333 id: resetLauncherHome
1334
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 * Alberto Mardegan <alberto.mardegan@canonical.com>
1340 */
1341
1342-import QtQuick 2.0
1343-import Ubuntu.Components 0.1
1344-import Ubuntu.Components.ListItems 0.1 as ListItem
1345+import QtQuick 2.4
1346+import Ubuntu.Components 1.3
1347+import Ubuntu.Components.ListItems 1.3 as ListItem
1348 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1349 import SystemSettings 1.0
1350
1351
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 * Alberto Mardegan <alberto.mardegan@canonical.com>
1357 */
1358
1359-import QtQuick 2.0
1360-import Ubuntu.Components 0.1
1361-import Ubuntu.Components.ListItems 0.1 as ListItem
1362+import QtQuick 2.4
1363+import Ubuntu.Components 1.3
1364+import Ubuntu.Components.ListItems 1.3 as ListItem
1365 import SystemSettings 1.0
1366
1367 ItemPage {
1368
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 import GSettings 1.0
1374 import QMenuModel 0.1
1375 import Qt.labs.folderlistmodel 2.1
1376-import QtQuick 2.3
1377-import Ubuntu.Components 1.1
1378-import Ubuntu.Components.ListItems 0.1 as ListItem
1379+import QtQuick 2.4
1380+import Ubuntu.Components 1.3
1381+import Ubuntu.Components.ListItems 1.3 as ListItem
1382 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1383 import SystemSettings 1.0
1384
1385
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 */
1391
1392 import GSettings 1.0
1393-import QtQuick 2.0
1394+import QtQuick 2.4
1395 import QtQuick.Layouts 1.1
1396-import Ubuntu.Components 1.1
1397-import Ubuntu.Components.ListItems 0.1 as ListItem
1398-import Ubuntu.Components.Popups 0.1
1399+import Ubuntu.Components 1.3
1400+import Ubuntu.Components.ListItems 1.3 as ListItem
1401+import Ubuntu.Components.Popups 1.3
1402 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1403 import SystemSettings 1.0
1404
1405
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 * Jonas G. Drange <jonas.drange@canonical.com>
1411 *
1412 */
1413-import QtQuick 2.0
1414+import QtQuick 2.4
1415 import MeeGo.QOfono 0.2
1416
1417 Item {
1418
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
1424 import GSettings 1.0
1425 import QMenuModel 0.1
1426-import QtQuick 2.0
1427-import Ubuntu.Components 0.1
1428-import Ubuntu.Components.ListItems 0.1 as ListItem
1429+import QtQuick 2.4
1430+import Ubuntu.Components 1.3
1431+import Ubuntu.Components.ListItems 1.3 as ListItem
1432 import SystemSettings 1.0
1433 import Ubuntu.SystemSettings.Battery 1.0
1434 import Ubuntu.SystemSettings.Diagnostics 1.0
1435
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 */
1441
1442 import GSettings 1.0
1443-import QtQuick 2.0
1444+import QtQuick 2.4
1445 import SystemSettings 1.0
1446-import Ubuntu.Components 0.1
1447-import Ubuntu.Components.ListItems 0.1 as ListItem
1448+import Ubuntu.Components 1.3
1449+import Ubuntu.Components.ListItems 1.3 as ListItem
1450 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1451
1452 ItemPage {
1453
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 */
1459
1460 import GSettings 1.0
1461-import QtQuick 2.0
1462+import QtQuick 2.4
1463 import QtQuick.Layouts 1.1
1464-import Ubuntu.Components 1.1
1465-import Ubuntu.Components.ListItems 0.1 as ListItem
1466-import Ubuntu.Components.Popups 0.1
1467+import Ubuntu.Components 1.3
1468+import Ubuntu.Components.ListItems 1.3 as ListItem
1469+import Ubuntu.Components.Popups 1.3
1470 import SystemSettings 1.0
1471 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1472 import MeeGo.QOfono 0.2
1473
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1479 */
1480
1481-import QtQuick 2.0
1482-import Ubuntu.Components 0.1
1483-import Ubuntu.Components.ListItems 0.1 as ListItem
1484+import QtQuick 2.4
1485+import Ubuntu.Components 1.3
1486+import Ubuntu.Components.ListItems 1.3 as ListItem
1487
1488 ListItem.Base {
1489 property string textEntry: "";
1490
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1496 */
1497
1498-import QtQuick 2.0
1499+import QtQuick 2.4
1500 import SystemSettings 1.0
1501-import Ubuntu.Components 0.1
1502-import Ubuntu.Components.ListItems 0.1 as ListItem
1503+import Ubuntu.Components 1.3
1504+import Ubuntu.Components.ListItems 1.3 as ListItem
1505 import Ubuntu.SystemSettings.Diagnostics 1.0
1506
1507 ItemPage {
1508
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1514 */
1515
1516-import QtQuick 2.3
1517+import QtQuick 2.4
1518 import Qt.labs.folderlistmodel 2.1
1519 import SystemSettings 1.0
1520-import Ubuntu.Components 1.1
1521+import Ubuntu.Components 1.3
1522 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1523
1524 ItemPage {
1525
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 */
1531
1532 import GSettings 1.0
1533-import QtQuick 2.0
1534-import Ubuntu.Components 0.1
1535-import Ubuntu.Components.ListItems 0.1 as ListItem
1536+import QtQuick 2.4
1537+import Ubuntu.Components 1.3
1538+import Ubuntu.Components.ListItems 1.3 as ListItem
1539 import SystemSettings 1.0
1540 import Ubuntu.SystemSettings.Sound 1.0
1541 import Ubuntu.Settings.Menus 0.1 as Menus
1542
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 import GSettings 1.0
1548-import QtQuick 2.0
1549+import QtQuick 2.4
1550 import QtMultimedia 5.0
1551 import SystemSettings 1.0
1552-import Ubuntu.Components 0.1
1553-import Ubuntu.Components.ListItems 0.1 as ListItem
1554+import Ubuntu.Components 1.3
1555+import Ubuntu.Components.ListItems 1.3 as ListItem
1556 import Ubuntu.SystemSettings.Sound 1.0
1557 import QMenuModel 0.1
1558
1559
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1565 */
1566
1567-import QtQuick 2.0
1568+import QtQuick 2.4
1569 import SystemSettings 1.0
1570-import Ubuntu.Components 0.1
1571-import Ubuntu.Components.ListItems 0.1 as ListItem
1572+import Ubuntu.Components 1.3
1573+import Ubuntu.Components.ListItems 1.3 as ListItem
1574 import Ubuntu.SystemSettings.Update 1.0
1575
1576
1577
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1583 */
1584
1585-import QtQuick 2.0
1586-import Ubuntu.Components 0.1
1587-import Ubuntu.Components.ListItems 0.1 as ListItem
1588+import QtQuick 2.4
1589+import Ubuntu.Components 1.3
1590+import Ubuntu.Components.ListItems 1.3 as ListItem
1591 import Ubuntu.SystemSettings.Update 1.0
1592
1593 ListItem.SingleValue {
1594
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 */
1600
1601 import QMenuModel 0.1
1602-import QtQuick 2.0
1603+import QtQuick 2.4
1604 import SystemSettings 1.0
1605-import Ubuntu.Components 0.1
1606-import Ubuntu.Components.ListItems 0.1 as ListItem
1607-import Ubuntu.Components.Popups 0.1
1608+import Ubuntu.Components 1.3
1609+import Ubuntu.Components.ListItems 1.3 as ListItem
1610+import Ubuntu.Components.Popups 1.3
1611 import Ubuntu.OnlineAccounts.Client 0.1
1612 import Ubuntu.SystemSettings.Update 1.0
1613 import Ubuntu.Connectivity 1.0
1614
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1620 */
1621
1622-import QtQuick 2.0
1623+import QtQuick 2.4
1624 import SystemSettings 1.0
1625-import Ubuntu.Components 0.1
1626-import Ubuntu.Components.ListItems 0.1 as ListItem
1627+import Ubuntu.Components 1.3
1628+import Ubuntu.Components.ListItems 1.3 as ListItem
1629 import Ubuntu.SystemSettings.TimeDate 1.0
1630
1631 ItemPage {
1632
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1638 */
1639
1640-import QtQuick 2.0
1641+import QtQuick 2.4
1642 import SystemSettings 1.0
1643-import Ubuntu.Components 0.1
1644-import Ubuntu.Components.ListItems 0.1 as ListItem
1645-import Ubuntu.Components.Popups 0.1
1646+import Ubuntu.Components 1.3
1647+import Ubuntu.Components.ListItems 1.3 as ListItem
1648+import Ubuntu.Components.Popups 1.3
1649 import Ubuntu.SystemSettings.TimeDate 1.0
1650
1651 ItemPage {
1652
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1658 */
1659
1660-import QtQuick 2.0
1661-import Ubuntu.Components 0.1
1662-import Ubuntu.Components.ListItems 0.1 as ListItems
1663+import QtQuick 2.4
1664+import Ubuntu.Components 1.3
1665+import Ubuntu.Components.ListItems 1.3 as ListItems
1666
1667 Item {
1668 id: root
1669
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1675 */
1676
1677-import QtQuick 2.0
1678-import Ubuntu.Components 0.1
1679-import Ubuntu.Components.ListItems 0.1 as ListItem
1680-import Ubuntu.Components.Popups 0.1
1681+import QtQuick 2.4
1682+import Ubuntu.Components 1.3
1683+import Ubuntu.Components.ListItems 1.3 as ListItem
1684+import Ubuntu.Components.Popups 1.3
1685
1686 Dialog {
1687 id: root
1688
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 * Renato Araujo Oliveira Filho <renato@canonical.com>
1694 */
1695
1696-import QtQuick 2.0
1697-import Ubuntu.Components 0.1
1698-import Ubuntu.Components.ListItems 0.1 as ListItem
1699+import QtQuick 2.4
1700+import Ubuntu.Components 1.3
1701+import Ubuntu.Components.ListItems 1.3 as ListItem
1702
1703 FramedMenuItem {
1704 id: accessPoint
1705
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 * Nick Dedekind <nick.dedekind@canonical.com>
1711 */
1712
1713-import QtQuick 2.0
1714-import Ubuntu.Components.ListItems 0.1 as ListItem
1715+import QtQuick 2.4
1716+import Ubuntu.Components.ListItems 1.3 as ListItem
1717
1718 ListItem.Standard {
1719 id: baseMenu
1720
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 @@
1725-import QtQuick 2.0
1726+import QtQuick 2.4
1727 import QtQuick.Layouts 1.1
1728-import Ubuntu.Components.Popups 0.1
1729-import Ubuntu.Components 0.1
1730-import Ubuntu.Components.ListItems 0.1 as ListItem
1731+import Ubuntu.Components.Popups 1.3
1732+import Ubuntu.Components 1.3
1733+import Ubuntu.Components.ListItems 1.3 as ListItem
1734 import Ubuntu.SystemSettings.Wifi 1.0
1735
1736 Component {
1737
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 @@
1742-import QtQuick 2.0
1743+import QtQuick 2.4
1744 import QtQuick.Layouts 1.1
1745-import Ubuntu.Components 0.1
1746-import Ubuntu.Components.Popups 0.1
1747+import Ubuntu.Components 1.3
1748+import Ubuntu.Components.Popups 1.3
1749 import Ubuntu.Content 0.1
1750
1751 PopupBase {
1752
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 * Jonas G. Drange <jonas.drange@canonical.com>
1758 *
1759 */
1760-import QtQuick 2.0
1761+import QtQuick 2.4
1762
1763 Item {
1764
1765
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 * Olivier Tilloy <olivier.tilloy@canonical.com>
1771 */
1772
1773-import QtQuick 2.0
1774-import Ubuntu.Components.ListItems 0.1 as ListItem
1775+import QtQuick 2.4
1776+import Ubuntu.Components.ListItems 1.3 as ListItem
1777
1778 ListItem.Empty {
1779 height: units.gu(3)
1780
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 * Nick Dedekind <nick.dedekind@canonical.com>
1786 */
1787
1788-import QtQuick 2.0
1789-import Ubuntu.Components 0.1
1790-import Ubuntu.Components.ListItems 0.1 as ListItem
1791+import QtQuick 2.4
1792+import Ubuntu.Components 1.3
1793+import Ubuntu.Components.ListItems 1.3 as ListItem
1794
1795 ListItem.Standard {}
1796
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 * Renato Araujo Oliveira Filho <renato@canonical.com>
1802 */
1803
1804-import QtQuick 2.0
1805-import Ubuntu.Components 0.1
1806+import QtQuick 2.4
1807+import Ubuntu.Components 1.3
1808
1809 Rectangle {
1810 height: units.dp(1)
1811
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 * Nick Dedekind <nick.dedekind@canonical.com>
1817 */
1818
1819-import QtQuick 2.0
1820+import QtQuick 2.4
1821 import QMenuModel 0.1 as QMenuModel
1822 import SystemSettings 1.0
1823-import Ubuntu.Components 0.1
1824+import Ubuntu.Components 1.3
1825
1826 ItemPage {
1827 id: indicatorItem
1828
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 * Nick Dedekind <nick.dedekind@canonical.com>
1834 */
1835
1836-import QtQuick 2.0
1837+import QtQuick 2.4
1838 import QMenuModel 0.1 as QMenuModel
1839 import Ubuntu.Settings.Menus 0.1 as Menus
1840 import Ubuntu.Settings.Components 0.1 as USC
1841
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1847 */
1848
1849-import QtQuick 2.0
1850+import QtQuick 2.4
1851 import QtQuick.Layouts 1.1
1852 import SystemSettings 1.0
1853-import Ubuntu.Components 0.1
1854-import Ubuntu.Components.ListItems 0.1 as ListItem
1855+import Ubuntu.Components 1.3
1856+import Ubuntu.Components.ListItems 1.3 as ListItem
1857 import Ubuntu.SystemSettings.Wifi 1.0
1858
1859 ItemPage {
1860
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
1866 */
1867
1868-import QtQuick 2.0
1869+import QtQuick 2.4
1870 import QtQuick.Layouts 1.1
1871 import SystemSettings 1.0
1872-import Ubuntu.Components 0.1
1873-import Ubuntu.Components.ListItems 0.1 as ListItem
1874+import Ubuntu.Components 1.3
1875+import Ubuntu.Components.ListItems 1.3 as ListItem
1876 import Ubuntu.SystemSettings.Wifi 1.0
1877
1878 ItemPage {
1879
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1885 */
1886
1887-import QtQuick 2.0
1888+import QtQuick 2.4
1889 import QtQuick.Layouts 1.1
1890 import SystemSettings 1.0
1891-import Ubuntu.Components 0.1
1892-import Ubuntu.Components.ListItems 0.1 as ListItem
1893-import Ubuntu.Components.Popups 0.1
1894+import Ubuntu.Components 1.3
1895+import Ubuntu.Components.ListItems 1.3 as ListItem
1896+import Ubuntu.Components.Popups 1.3
1897 import Ubuntu.SystemSettings.Wifi 1.0
1898 import QMenuModel 0.1
1899
1900
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1906 */
1907
1908-import QtQuick 2.0
1909+import QtQuick 2.4
1910 import SystemSettings 1.0
1911-import Ubuntu.Components 0.1
1912-import Ubuntu.Components.ListItems 0.1 as ListItem
1913-import Ubuntu.Components.Popups 0.1
1914+import Ubuntu.Components 1.3
1915+import Ubuntu.Components.ListItems 1.3 as ListItem
1916+import Ubuntu.Components.Popups 1.3
1917 import Ubuntu.SystemSettings.Wifi 1.0
1918 import QMenuModel 0.1
1919
1920
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1926 */
1927
1928-import QtQuick 2.0
1929+import QtQuick 2.4
1930 import SystemSettings 1.0
1931-import Ubuntu.Components 0.1
1932-import Ubuntu.Components.ListItems 0.1 as ListItem
1933+import Ubuntu.Components 1.3
1934+import Ubuntu.Components.ListItems 1.3 as ListItem
1935 import Ubuntu.SystemSettings.Wifi 1.0
1936 import QMenuModel 0.1
1937
1938
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 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1944 */
1945
1946-import QtQuick 2.0
1947-import Ubuntu.Components 0.1
1948+import QtQuick 2.4
1949+import Ubuntu.Components 1.3
1950
1951 Rectangle {
1952 anchors.fill: parent
1953
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 * Renato Araujo Oliveira Filho <renato@canonical.com>
1959 */
1960
1961-import QtQuick 2.0
1962-import Ubuntu.Components 0.1
1963-import Ubuntu.Components.ListItems 0.1 as ListItem
1964+import QtQuick 2.4
1965+import Ubuntu.Components 1.3
1966+import Ubuntu.Components.ListItems 1.3 as ListItem
1967
1968 BaseMenuItem {
1969 id: menuItem
1970
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 * Nick Dedekind <nick.dedekind@canonical.com>
1976 */
1977
1978-import QtQuick 2.0
1979-import Ubuntu.Components 0.1
1980+import QtQuick 2.4
1981+import Ubuntu.Components 1.3
1982
1983 FramedMenuItem {
1984 id: menuItem
1985
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 * Nick Dedekind <nick.dedekind@canonical.com>
1991 */
1992
1993-import QtQuick 2.0
1994-import Ubuntu.Components 0.1
1995+import QtQuick 2.4
1996+import Ubuntu.Components 1.3
1997
1998 FramedMenuItem {
1999 id: menuItem
2000
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
2006 */
2007
2008-import QtQuick 2.0
2009-import Ubuntu.Components 1.1
2010+import QtQuick 2.4
2011+import Ubuntu.Components 1.3
2012
2013 Page {
2014 id: root
2015
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
2021 */
2022
2023-import QtQuick 2.0
2024-import Ubuntu.Components 0.1
2025-import Ubuntu.Components.ListItems 0.1 as ListItem
2026+import QtQuick 2.4
2027+import Ubuntu.Components 1.3
2028+import Ubuntu.Components.ListItems 1.3 as ListItem
2029
2030 ListItem.Standard {
2031 id: itemEmpty
2032
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 @@
2037-import QtQuick 2.0
2038-import Ubuntu.Components 0.1
2039-import Ubuntu.Components.ListItems 0.1 as ListItem
2040+import QtQuick 2.4
2041+import Ubuntu.Components 1.3
2042+import Ubuntu.Components.ListItems 1.3 as ListItem
2043
2044 Column {
2045 anchors {
2046
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
2052 */
2053
2054-import QtQuick 2.0
2055-import Ubuntu.Components 1.1
2056+import QtQuick 2.4
2057+import Ubuntu.Components 1.3
2058 import Ubuntu.Settings.Components 0.1
2059
2060 Item {
2061@@ -70,7 +70,7 @@
2062 fill: root
2063 margins: -units.gu(0.25)
2064 }
2065- color: UbuntuColors.darkGrey
2066+ backgroundColor: UbuntuColors.darkGrey
2067 opacity: 0.15
2068 }
2069 }
2070
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
2076 */
2077
2078-import QtQuick 2.0
2079-import Ubuntu.Components 0.1
2080-import Ubuntu.Components.ListItems 0.1 as ListItem
2081+import QtQuick 2.4
2082+import Ubuntu.Components 1.3
2083+import Ubuntu.Components.ListItems 1.3 as ListItem
2084 import SystemSettings 1.0
2085
2086 MainView {
2087@@ -30,7 +30,6 @@
2088 applicationName: "ubuntu-system-settings"
2089 objectName: "systemSettingsMainView"
2090 automaticOrientation: true
2091- useDeprecatedToolbar: false
2092 anchorToKeyboard: true
2093
2094 function loadPluginByName(pluginName, pluginOptions) {
2095
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 * with this program. If not, see <http://www.gnu.org/licenses/>.
2101 */
2102
2103-import QtQuick 2.0
2104-import Ubuntu.Components 0.1
2105-import Ubuntu.Components.ListItems 0.1 as ListItem
2106+import QtQuick 2.4
2107+import Ubuntu.Components 1.3
2108+import Ubuntu.Components.ListItems 1.3 as ListItem
2109 import SystemSettings 1.0
2110
2111 Column {
2112
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 return False
2118
2119 def get_current_language(self):
2120- return self.select_single(
2121- 'Label', objectName='currentLanguage').currentLanguage
2122+ return self.wait_select_single(
2123+ objectName='currentLanguage').currentLanguage
2124
2125 def _click_change_display_language(self):
2126 item = self.select_single(objectName='displayLanguage')
2127
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 {
2133 if (m_pageComponent == NULL) {
2134 QQmlComponent *page = new QQmlComponent(engine, parent);
2135- page->setData("import QtQuick 2.0\n"
2136+ page->setData("import QtQuick 2.4\n"
2137 "Rectangle {\n"
2138 " function reset() { console.log('Hello') }\n"
2139 " width: 200; height: 200;\n"

Subscribers

People subscribed via source and target branches