Merge lp:~ken-vandine/ubuntu-system-settings/uitk_api_bump into lp:ubuntu-system-settings
- uitk_api_bump
- Merge into trunk
Status: | Work in progress |
---|---|
Proposed branch: | lp:~ken-vandine/ubuntu-system-settings/uitk_api_bump |
Merge into: | lp:ubuntu-system-settings |
Diff against target: |
1589 lines (+200/-200) 109 files modified
plugins/about/DevMode.qml (+2/-2) plugins/about/EntryComponent.qml (+2/-2) plugins/about/License.qml (+2/-2) plugins/about/PageComponent.qml (+2/-2) plugins/about/PhoneNumber.qml (+1/-1) plugins/about/PhoneNumbers.qml (+1/-1) plugins/about/SingleValueStacked.qml (+2/-2) plugins/about/Software.qml (+2/-2) plugins/about/Storage.qml (+2/-2) plugins/about/StorageBar.qml (+1/-1) plugins/about/StorageItem.qml (+1/-1) plugins/about/Version.qml (+2/-2) plugins/background/Components/AddRemove.qml (+1/-1) plugins/background/Components/HighlightedOverlay.qml (+1/-1) plugins/background/Components/ListItemsHeader.qml (+2/-2) plugins/background/Components/OverlayImage.qml (+1/-1) plugins/background/MainPage.qml (+3/-3) plugins/background/Preview.qml (+2/-2) plugins/background/WallpaperGrid.qml (+3/-3) plugins/battery/PageComponent.qml (+2/-2) plugins/battery/SleepValues.qml (+2/-2) plugins/bluetooth/ConfirmPasskeyDialog.qml (+2/-2) plugins/bluetooth/PageComponent.qml (+3/-3) plugins/bluetooth/ProvidePasskeyDialog.qml (+2/-2) plugins/bluetooth/ProvidePinCodeDialog.qml (+2/-2) plugins/brightness/BrightnessSlider.qml (+2/-2) plugins/brightness/PageComponent.qml (+2/-2) plugins/cellular/Components/CellularMultiSim.qml (+2/-2) plugins/cellular/Components/CellularSingleSim.qml (+2/-2) plugins/cellular/Components/DefaultSim.qml (+2/-2) plugins/cellular/Components/MultiSim.qml (+2/-2) plugins/cellular/Components/NoSim.qml (+2/-2) plugins/cellular/Components/SimEditor.qml (+1/-1) plugins/cellular/Components/SingleSim.qml (+2/-2) plugins/cellular/Hotspot.qml (+2/-2) plugins/cellular/HotspotSetup.qml (+2/-2) plugins/cellular/PageChooseCarrier.qml (+2/-2) plugins/cellular/PageChooseCarriers.qml (+2/-2) plugins/cellular/PageComponent.qml (+2/-2) plugins/example/PageComponent.qml (+1/-1) plugins/flight-mode/EntryComponent.qml (+2/-2) plugins/language/DisplayLanguage.qml (+3/-3) plugins/language/KeyboardLayoutItem.qml (+2/-2) plugins/language/KeyboardLayouts.qml (+1/-1) plugins/language/PageComponent.qml (+3/-3) plugins/language/RebootNecessary.qml (+2/-2) plugins/language/SpellChecking.qml (+2/-2) plugins/language/SubsetView.qml (+2/-2) plugins/notifications/PageComponent.qml (+2/-2) plugins/orientation-lock/EntryComponent.qml (+2/-2) plugins/phone/CallForwarding.qml (+2/-2) plugins/phone/CallWaiting.qml (+2/-2) plugins/phone/MultiSim.qml (+1/-1) plugins/phone/NoSims.qml (+1/-1) plugins/phone/PageComponent.qml (+2/-2) plugins/phone/ServiceInfo.qml (+2/-2) plugins/phone/Services.qml (+2/-2) plugins/phone/SingleSim.qml (+1/-1) plugins/reset/EntryComponent.qml (+2/-2) plugins/reset/EraseEverything.qml (+2/-2) plugins/reset/PageComponent.qml (+3/-3) plugins/reset/ResetAllSettings.qml (+2/-2) plugins/reset/ResetLauncherHome.qml (+2/-2) plugins/security-privacy/AppAccess.qml (+2/-2) plugins/security-privacy/AppAccessControl.qml (+2/-2) plugins/security-privacy/Dash.qml (+2/-2) plugins/security-privacy/Location.qml (+2/-2) plugins/security-privacy/LockSecurity.qml (+2/-2) plugins/security-privacy/PageComponent.qml (+2/-2) plugins/security-privacy/PhoneLocking.qml (+2/-2) plugins/security-privacy/SimPin.qml (+2/-2) plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml (+2/-2) plugins/security-privacy/diagnostics/PageComponent.qml (+2/-2) plugins/sound/PageComponent.qml (+2/-2) plugins/sound/SilentModeWarning.qml (+2/-2) plugins/sound/SoundsList.qml (+2/-2) plugins/system-update/Configuration.qml (+2/-2) plugins/system-update/EntryComponent.qml (+2/-2) plugins/system-update/PageComponent.qml (+3/-3) plugins/time-date/ChooseTimeZone.qml (+2/-2) plugins/time-date/PageComponent.qml (+3/-3) plugins/time-date/Scroller.qml (+2/-2) plugins/time-date/TimePicker.qml (+3/-3) plugins/wifi/AccessPoint.qml (+2/-2) plugins/wifi/BaseMenuItem.qml (+1/-1) plugins/wifi/DivMenuItem.qml (+1/-1) plugins/wifi/FramedMenuItem.qml (+2/-2) plugins/wifi/HLine.qml (+1/-1) plugins/wifi/IndicatorBase.qml (+1/-1) plugins/wifi/NetworkDetails.qml (+2/-2) plugins/wifi/NetworkDetailsBrief.qml (+2/-2) plugins/wifi/OtherNetwork.qml (+2/-2) plugins/wifi/PageComponent.qml (+2/-2) plugins/wifi/PreviousNetworks.qml (+2/-2) plugins/wifi/RemoveBackground.qml (+1/-1) plugins/wifi/SectionMenuItem.qml (+2/-2) plugins/wifi/StandardMenuItem.qml (+1/-1) plugins/wifi/SwitchMenuItem.qml (+1/-1) src/SystemSettings/ItemPage.qml (+1/-1) src/qml/CategoryGrid.qml (+2/-2) src/qml/MainWindow.qml (+2/-2) src/qml/UncategorizedItemsView.qml (+2/-2) wizard/qml/Components/InputMethod.qml (+1/-1) wizard/qml/Pages/10-welcome.qml (+1/-1) wizard/qml/Pages/15-passwd.qml (+1/-1) wizard/qml/Pages/20-wifi.qml (+2/-2) wizard/qml/Pages/40-reporting.qml (+1/-1) wizard/qml/Pages/80-finished.qml (+1/-1) wizard/qml/Pages/no-sim.qml (+1/-1) |
To merge this branch: | bzr merge lp:~ken-vandine/ubuntu-system-settings/uitk_api_bump |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Jonas G. Drange (community) | Approve | ||
Review via email: mp+234463@code.launchpad.net |
Commit message
Updated API versions for all the Ubuntu SDK imports to the latest
Description of the change
Updated API versions for all the Ubuntu SDK imports to the latest
PS Jenkins bot (ps-jenkins) wrote : | # |
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:1033
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:1033
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
- 1034. By Ken VanDine
-
merged trunk
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:1034
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
- 1035. By Ken VanDine
-
merged trunk
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1034
http://
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
- 1036. By Ken VanDine
-
merged trunk
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:1034
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
- 1037. By Ken VanDine
-
merged trunk
Unmerged revisions
- 1037. By Ken VanDine
-
merged trunk
- 1036. By Ken VanDine
-
merged trunk
- 1035. By Ken VanDine
-
merged trunk
- 1034. By Ken VanDine
-
merged trunk
- 1033. By Ken VanDine
-
merged trunk
- 1032. By Ken VanDine
-
Merged dialpad_test_fixes branch
- 1031. By Ken VanDine
-
updated uitk imports to use latest API versions
Preview Diff
1 | === modified file 'plugins/about/DevMode.qml' |
2 | --- plugins/about/DevMode.qml 2014-09-04 14:59:18 +0000 |
3 | +++ plugins/about/DevMode.qml 2014-09-19 14:54:39 +0000 |
4 | @@ -24,8 +24,8 @@ |
5 | import QtQuick 2.0 |
6 | import Qt.labs.folderlistmodel 1.0 |
7 | import SystemSettings 1.0 |
8 | -import Ubuntu.Components 0.1 |
9 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
10 | +import Ubuntu.Components 1.1 |
11 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
12 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
13 | import Ubuntu.SystemSettings.StorageAbout 1.0 |
14 | |
15 | |
16 | === modified file 'plugins/about/EntryComponent.qml' |
17 | --- plugins/about/EntryComponent.qml 2014-04-10 13:48:36 +0000 |
18 | +++ plugins/about/EntryComponent.qml 2014-09-19 14:54:39 +0000 |
19 | @@ -19,8 +19,8 @@ |
20 | */ |
21 | |
22 | import QtQuick 2.0 |
23 | -import Ubuntu.Components 0.1 |
24 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
25 | +import Ubuntu.Components 1.1 |
26 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
27 | |
28 | ListItem.Standard { |
29 | id: root |
30 | |
31 | === modified file 'plugins/about/License.qml' |
32 | --- plugins/about/License.qml 2014-09-02 08:42:27 +0000 |
33 | +++ plugins/about/License.qml 2014-09-19 14:54:39 +0000 |
34 | @@ -1,7 +1,7 @@ |
35 | import QtQuick 2.0 |
36 | import SystemSettings 1.0 |
37 | -import Ubuntu.Components 0.1 |
38 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
39 | +import Ubuntu.Components 1.1 |
40 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
41 | import Ubuntu.SystemSettings.StorageAbout 1.0 |
42 | |
43 | ItemPage { |
44 | |
45 | === modified file 'plugins/about/PageComponent.qml' |
46 | --- plugins/about/PageComponent.qml 2014-09-05 21:23:06 +0000 |
47 | +++ plugins/about/PageComponent.qml 2014-09-19 14:54:39 +0000 |
48 | @@ -21,8 +21,8 @@ |
49 | import QtQuick 2.0 |
50 | import QtSystemInfo 5.0 |
51 | import SystemSettings 1.0 |
52 | -import Ubuntu.Components 0.1 |
53 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
54 | +import Ubuntu.Components 1.1 |
55 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
56 | import Ubuntu.SystemSettings.StorageAbout 1.0 |
57 | import Ubuntu.SystemSettings.Update 1.0 |
58 | import MeeGo.QOfono 0.2 |
59 | |
60 | === modified file 'plugins/about/PhoneNumber.qml' |
61 | --- plugins/about/PhoneNumber.qml 2014-09-01 16:10:30 +0000 |
62 | +++ plugins/about/PhoneNumber.qml 2014-09-19 14:54:39 +0000 |
63 | @@ -20,7 +20,7 @@ |
64 | |
65 | import QtQuick 2.0 |
66 | import MeeGo.QOfono 0.2 |
67 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
68 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
69 | |
70 | ListItem.SingleValue { |
71 | |
72 | |
73 | === modified file 'plugins/about/PhoneNumbers.qml' |
74 | --- plugins/about/PhoneNumbers.qml 2014-09-01 16:10:30 +0000 |
75 | +++ plugins/about/PhoneNumbers.qml 2014-09-19 14:54:39 +0000 |
76 | @@ -21,7 +21,7 @@ |
77 | import QtQuick 2.0 |
78 | import GSettings 1.0 |
79 | import MeeGo.QOfono 0.2 |
80 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
81 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
82 | |
83 | Column { |
84 | |
85 | |
86 | === modified file 'plugins/about/SingleValueStacked.qml' |
87 | --- plugins/about/SingleValueStacked.qml 2014-09-05 14:38:39 +0000 |
88 | +++ plugins/about/SingleValueStacked.qml 2014-09-19 14:54:39 +0000 |
89 | @@ -23,8 +23,8 @@ |
90 | * |
91 | */ |
92 | import QtQuick 2.0 |
93 | -import Ubuntu.Components 0.1 |
94 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
95 | +import Ubuntu.Components 1.1 |
96 | +import Ubuntu.Components.ListItems 1.0 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 2014-09-19 14:54:39 +0000 |
104 | @@ -1,8 +1,8 @@ |
105 | import QtQuick 2.0 |
106 | import Qt.labs.folderlistmodel 1.0 |
107 | import SystemSettings 1.0 |
108 | -import Ubuntu.Components 0.1 |
109 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
110 | +import Ubuntu.Components 1.1 |
111 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
112 | import Ubuntu.SystemSettings.StorageAbout 1.0 |
113 | |
114 | ItemPage { |
115 | |
116 | === modified file 'plugins/about/Storage.qml' |
117 | --- plugins/about/Storage.qml 2014-07-02 09:03:50 +0000 |
118 | +++ plugins/about/Storage.qml 2014-09-19 14:54:39 +0000 |
119 | @@ -22,8 +22,8 @@ |
120 | import QtQuick 2.0 |
121 | import QtSystemInfo 5.0 |
122 | import SystemSettings 1.0 |
123 | -import Ubuntu.Components 0.1 |
124 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
125 | +import Ubuntu.Components 1.1 |
126 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
127 | import Ubuntu.SystemSettings.StorageAbout 1.0 |
128 | |
129 | ItemPage { |
130 | |
131 | === modified file 'plugins/about/StorageBar.qml' |
132 | --- plugins/about/StorageBar.qml 2013-09-20 16:14:23 +0000 |
133 | +++ plugins/about/StorageBar.qml 2014-09-19 14:54:39 +0000 |
134 | @@ -1,5 +1,5 @@ |
135 | import QtQuick 2.0 |
136 | -import Ubuntu.Components 0.1 |
137 | +import Ubuntu.Components 1.1 |
138 | |
139 | Item { |
140 | property bool ready: false |
141 | |
142 | === modified file 'plugins/about/StorageItem.qml' |
143 | --- plugins/about/StorageItem.qml 2014-01-27 10:41:38 +0000 |
144 | +++ plugins/about/StorageItem.qml 2014-09-19 14:54:39 +0000 |
145 | @@ -1,5 +1,5 @@ |
146 | import QtQuick 2.0 |
147 | -import Ubuntu.Components 0.1 |
148 | +import Ubuntu.Components 1.1 |
149 | |
150 | Item { |
151 | property string label |
152 | |
153 | === modified file 'plugins/about/Version.qml' |
154 | --- plugins/about/Version.qml 2014-09-10 19:46:02 +0000 |
155 | +++ plugins/about/Version.qml 2014-09-19 14:54:39 +0000 |
156 | @@ -25,8 +25,8 @@ |
157 | import QtQuick 2.0 |
158 | import Qt.labs.folderlistmodel 1.0 |
159 | import SystemSettings 1.0 |
160 | -import Ubuntu.Components 0.1 |
161 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
162 | +import Ubuntu.Components 1.1 |
163 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
164 | import Ubuntu.SystemSettings.StorageAbout 1.0 |
165 | import Ubuntu.SystemSettings.Update 1.0 |
166 | |
167 | |
168 | === modified file 'plugins/background/Components/AddRemove.qml' |
169 | --- plugins/background/Components/AddRemove.qml 2014-09-04 15:14:39 +0000 |
170 | +++ plugins/background/Components/AddRemove.qml 2014-09-19 14:54:39 +0000 |
171 | @@ -20,7 +20,7 @@ |
172 | |
173 | import QtQuick 2.0 |
174 | import SystemSettings 1.0 |
175 | -import Ubuntu.Components 0.1 |
176 | +import Ubuntu.Components 1.1 |
177 | import "../utilities.js" as Utilities |
178 | |
179 | Row { |
180 | |
181 | === modified file 'plugins/background/Components/HighlightedOverlay.qml' |
182 | --- plugins/background/Components/HighlightedOverlay.qml 2014-07-04 12:00:55 +0000 |
183 | +++ plugins/background/Components/HighlightedOverlay.qml 2014-09-19 14:54:39 +0000 |
184 | @@ -19,7 +19,7 @@ |
185 | */ |
186 | |
187 | import QtQuick 2.0 |
188 | -import Ubuntu.Components 0.1 |
189 | +import Ubuntu.Components 1.1 |
190 | |
191 | Rectangle { |
192 | border.width: units.gu(1) |
193 | |
194 | === modified file 'plugins/background/Components/ListItemsHeader.qml' |
195 | --- plugins/background/Components/ListItemsHeader.qml 2014-06-30 15:37:42 +0000 |
196 | +++ plugins/background/Components/ListItemsHeader.qml 2014-09-19 14:54:39 +0000 |
197 | @@ -15,8 +15,8 @@ |
198 | */ |
199 | |
200 | import QtQuick 2.0 |
201 | -import Ubuntu.Components 0.1 |
202 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
203 | +import Ubuntu.Components 1.1 |
204 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
205 | |
206 | Item { |
207 | property alias text: label.text |
208 | |
209 | === modified file 'plugins/background/Components/OverlayImage.qml' |
210 | --- plugins/background/Components/OverlayImage.qml 2014-07-04 12:02:53 +0000 |
211 | +++ plugins/background/Components/OverlayImage.qml 2014-09-19 14:54:39 +0000 |
212 | @@ -19,7 +19,7 @@ |
213 | */ |
214 | |
215 | import QtQuick 2.0 |
216 | -import Ubuntu.Components 0.1 |
217 | +import Ubuntu.Components 1.1 |
218 | |
219 | Item { |
220 | id: overlayImage |
221 | |
222 | === modified file 'plugins/background/MainPage.qml' |
223 | --- plugins/background/MainPage.qml 2014-09-05 13:43:10 +0000 |
224 | +++ plugins/background/MainPage.qml 2014-09-19 14:54:39 +0000 |
225 | @@ -22,9 +22,9 @@ |
226 | import GSettings 1.0 |
227 | import SystemSettings 1.0 |
228 | import Ubuntu.Content 0.1 |
229 | -import Ubuntu.Components 0.1 |
230 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
231 | -import Ubuntu.Components.Popups 0.1 |
232 | +import Ubuntu.Components 1.1 |
233 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
234 | +import Ubuntu.Components.Popups 1.0 |
235 | import Ubuntu.SystemSettings.Background 1.0 |
236 | import "utilities.js" as Utilities |
237 | |
238 | |
239 | === modified file 'plugins/background/Preview.qml' |
240 | --- plugins/background/Preview.qml 2014-09-05 14:00:00 +0000 |
241 | +++ plugins/background/Preview.qml 2014-09-19 14:54:39 +0000 |
242 | @@ -20,8 +20,8 @@ |
243 | |
244 | import QtQuick 2.0 |
245 | import SystemSettings 1.0 |
246 | -import Ubuntu.Components 0.1 |
247 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
248 | +import Ubuntu.Components 1.1 |
249 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
250 | |
251 | ItemPage { |
252 | id: preview |
253 | |
254 | === modified file 'plugins/background/WallpaperGrid.qml' |
255 | --- plugins/background/WallpaperGrid.qml 2014-09-05 13:33:21 +0000 |
256 | +++ plugins/background/WallpaperGrid.qml 2014-09-19 14:54:39 +0000 |
257 | @@ -19,9 +19,9 @@ |
258 | */ |
259 | |
260 | import QtQuick 2.0 |
261 | -import Ubuntu.Components 0.1 |
262 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
263 | -import Ubuntu.Components.Popups 0.1 |
264 | +import Ubuntu.Components 1.1 |
265 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
266 | +import Ubuntu.Components.Popups 1.0 |
267 | import "Components" |
268 | import "utilities.js" as Utilities |
269 | |
270 | |
271 | === modified file 'plugins/battery/PageComponent.qml' |
272 | --- plugins/battery/PageComponent.qml 2014-08-29 09:11:11 +0000 |
273 | +++ plugins/battery/PageComponent.qml 2014-09-19 14:54:39 +0000 |
274 | @@ -23,8 +23,8 @@ |
275 | import QtQuick 2.0 |
276 | import QtSystemInfo 5.0 |
277 | import SystemSettings 1.0 |
278 | -import Ubuntu.Components 0.1 |
279 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
280 | +import Ubuntu.Components 1.1 |
281 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
282 | import Ubuntu.SystemSettings.Battery 1.0 |
283 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
284 | |
285 | |
286 | === modified file 'plugins/battery/SleepValues.qml' |
287 | --- plugins/battery/SleepValues.qml 2014-08-26 01:54:11 +0000 |
288 | +++ plugins/battery/SleepValues.qml 2014-09-19 14:54:39 +0000 |
289 | @@ -24,8 +24,8 @@ |
290 | import GSettings 1.0 |
291 | import QtQuick 2.0 |
292 | import QtSystemInfo 5.0 |
293 | -import Ubuntu.Components 0.1 |
294 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
295 | +import Ubuntu.Components 1.1 |
296 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
297 | import SystemSettings 1.0 |
298 | import Ubuntu.SystemSettings.Battery 1.0 |
299 | |
300 | |
301 | === modified file 'plugins/bluetooth/ConfirmPasskeyDialog.qml' |
302 | --- plugins/bluetooth/ConfirmPasskeyDialog.qml 2013-09-30 15:37:50 +0000 |
303 | +++ plugins/bluetooth/ConfirmPasskeyDialog.qml 2014-09-19 14:54:39 +0000 |
304 | @@ -20,8 +20,8 @@ |
305 | |
306 | |
307 | import QtQuick 2.0 |
308 | -import Ubuntu.Components 0.1 |
309 | -import Ubuntu.Components.Popups 0.1 |
310 | +import Ubuntu.Components 1.1 |
311 | +import Ubuntu.Components.Popups 1.0 |
312 | |
313 | Dialog { |
314 | id: root |
315 | |
316 | === modified file 'plugins/bluetooth/PageComponent.qml' |
317 | --- plugins/bluetooth/PageComponent.qml 2014-08-26 17:15:57 +0000 |
318 | +++ plugins/bluetooth/PageComponent.qml 2014-09-19 14:54:39 +0000 |
319 | @@ -21,9 +21,9 @@ |
320 | import QMenuModel 0.1 |
321 | import QtQuick 2.0 |
322 | import SystemSettings 1.0 |
323 | -import Ubuntu.Components 0.1 |
324 | -import Ubuntu.Components.Popups 0.1 |
325 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
326 | +import Ubuntu.Components 1.1 |
327 | +import Ubuntu.Components.Popups 1.0 |
328 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
329 | import Ubuntu.SystemSettings.Bluetooth 1.0 |
330 | |
331 | |
332 | |
333 | === modified file 'plugins/bluetooth/ProvidePasskeyDialog.qml' |
334 | --- plugins/bluetooth/ProvidePasskeyDialog.qml 2014-01-27 17:09:51 +0000 |
335 | +++ plugins/bluetooth/ProvidePasskeyDialog.qml 2014-09-19 14:54:39 +0000 |
336 | @@ -20,8 +20,8 @@ |
337 | |
338 | |
339 | import QtQuick 2.0 |
340 | -import Ubuntu.Components 0.1 |
341 | -import Ubuntu.Components.Popups 0.1 |
342 | +import Ubuntu.Components 1.1 |
343 | +import Ubuntu.Components.Popups 1.0 |
344 | |
345 | Dialog { |
346 | id: root |
347 | |
348 | === modified file 'plugins/bluetooth/ProvidePinCodeDialog.qml' |
349 | --- plugins/bluetooth/ProvidePinCodeDialog.qml 2014-01-27 17:09:51 +0000 |
350 | +++ plugins/bluetooth/ProvidePinCodeDialog.qml 2014-09-19 14:54:39 +0000 |
351 | @@ -20,8 +20,8 @@ |
352 | |
353 | |
354 | import QtQuick 2.0 |
355 | -import Ubuntu.Components 0.1 |
356 | -import Ubuntu.Components.Popups 0.1 |
357 | +import Ubuntu.Components 1.1 |
358 | +import Ubuntu.Components.Popups 1.0 |
359 | |
360 | Dialog { |
361 | id: root |
362 | |
363 | === modified file 'plugins/brightness/BrightnessSlider.qml' |
364 | --- plugins/brightness/BrightnessSlider.qml 2014-08-11 16:13:17 +0000 |
365 | +++ plugins/brightness/BrightnessSlider.qml 2014-09-19 14:54:39 +0000 |
366 | @@ -18,8 +18,8 @@ |
367 | * with this program. If not, see <http://www.gnu.org/licenses/>. |
368 | */ |
369 | |
370 | -import Ubuntu.Components 0.1 |
371 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
372 | +import Ubuntu.Components 1.1 |
373 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
374 | import QtQuick 2.0 |
375 | import QMenuModel 0.1 |
376 | |
377 | |
378 | === modified file 'plugins/brightness/PageComponent.qml' |
379 | --- plugins/brightness/PageComponent.qml 2014-08-12 13:32:30 +0000 |
380 | +++ plugins/brightness/PageComponent.qml 2014-09-19 14:54:39 +0000 |
381 | @@ -21,8 +21,8 @@ |
382 | import GSettings 1.0 |
383 | import QtQuick 2.0 |
384 | import SystemSettings 1.0 |
385 | -import Ubuntu.Components 0.1 |
386 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
387 | +import Ubuntu.Components 1.1 |
388 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
389 | import Ubuntu.SystemSettings.Brightness 1.0 |
390 | |
391 | ItemPage { |
392 | |
393 | === modified file 'plugins/cellular/Components/CellularMultiSim.qml' |
394 | --- plugins/cellular/Components/CellularMultiSim.qml 2014-08-25 14:58:16 +0000 |
395 | +++ plugins/cellular/Components/CellularMultiSim.qml 2014-09-19 14:54:39 +0000 |
396 | @@ -18,8 +18,8 @@ |
397 | * |
398 | */ |
399 | import QtQuick 2.0 |
400 | -import Ubuntu.Components 0.1 |
401 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
402 | +import Ubuntu.Components 1.1 |
403 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
404 | |
405 | Column { |
406 | id: root |
407 | |
408 | === modified file 'plugins/cellular/Components/CellularSingleSim.qml' |
409 | --- plugins/cellular/Components/CellularSingleSim.qml 2014-08-21 20:25:08 +0000 |
410 | +++ plugins/cellular/Components/CellularSingleSim.qml 2014-09-19 14:54:39 +0000 |
411 | @@ -18,8 +18,8 @@ |
412 | * |
413 | */ |
414 | import QtQuick 2.0 |
415 | -import Ubuntu.Components 0.1 |
416 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
417 | +import Ubuntu.Components 1.1 |
418 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
419 | |
420 | Column { |
421 | height: childrenRect.height |
422 | |
423 | === modified file 'plugins/cellular/Components/DefaultSim.qml' |
424 | --- plugins/cellular/Components/DefaultSim.qml 2014-08-19 23:24:04 +0000 |
425 | +++ plugins/cellular/Components/DefaultSim.qml 2014-09-19 14:54:39 +0000 |
426 | @@ -18,8 +18,8 @@ |
427 | * |
428 | */ |
429 | import QtQuick 2.0 |
430 | -import Ubuntu.Components 0.1 |
431 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
432 | +import Ubuntu.Components 1.1 |
433 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
434 | |
435 | Column { |
436 | |
437 | |
438 | === modified file 'plugins/cellular/Components/MultiSim.qml' |
439 | --- plugins/cellular/Components/MultiSim.qml 2014-08-19 23:24:04 +0000 |
440 | +++ plugins/cellular/Components/MultiSim.qml 2014-09-19 14:54:39 +0000 |
441 | @@ -19,8 +19,8 @@ |
442 | */ |
443 | import QtQuick 2.0 |
444 | import GSettings 1.0 |
445 | -import Ubuntu.Components 0.1 |
446 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
447 | +import Ubuntu.Components 1.1 |
448 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
449 | |
450 | Column { |
451 | |
452 | |
453 | === modified file 'plugins/cellular/Components/NoSim.qml' |
454 | --- plugins/cellular/Components/NoSim.qml 2014-08-19 10:58:01 +0000 |
455 | +++ plugins/cellular/Components/NoSim.qml 2014-09-19 14:54:39 +0000 |
456 | @@ -18,8 +18,8 @@ |
457 | * |
458 | */ |
459 | import QtQuick 2.0 |
460 | -import Ubuntu.Components 0.1 |
461 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
462 | +import Ubuntu.Components 1.1 |
463 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
464 | |
465 | Column { |
466 | |
467 | |
468 | === modified file 'plugins/cellular/Components/SimEditor.qml' |
469 | --- plugins/cellular/Components/SimEditor.qml 2014-08-20 13:48:58 +0000 |
470 | +++ plugins/cellular/Components/SimEditor.qml 2014-09-19 14:54:39 +0000 |
471 | @@ -19,7 +19,7 @@ |
472 | */ |
473 | import QtQuick 2.0 |
474 | import Ubuntu.Components 1.1 |
475 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
476 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
477 | |
478 | Column { |
479 | |
480 | |
481 | === modified file 'plugins/cellular/Components/SingleSim.qml' |
482 | --- plugins/cellular/Components/SingleSim.qml 2014-08-22 10:53:16 +0000 |
483 | +++ plugins/cellular/Components/SingleSim.qml 2014-09-19 14:54:39 +0000 |
484 | @@ -18,8 +18,8 @@ |
485 | * |
486 | */ |
487 | import QtQuick 2.0 |
488 | -import Ubuntu.Components 0.1 |
489 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
490 | +import Ubuntu.Components 1.1 |
491 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
492 | |
493 | Column { |
494 | |
495 | |
496 | === modified file 'plugins/cellular/Hotspot.qml' |
497 | --- plugins/cellular/Hotspot.qml 2014-07-29 15:39:08 +0000 |
498 | +++ plugins/cellular/Hotspot.qml 2014-09-19 14:54:39 +0000 |
499 | @@ -18,8 +18,8 @@ |
500 | |
501 | import QtQuick 2.0 |
502 | import SystemSettings 1.0 |
503 | -import Ubuntu.Components 0.1 |
504 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
505 | +import Ubuntu.Components 1.1 |
506 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
507 | import Ubuntu.SystemSettings.Cellular 1.0 |
508 | |
509 | ItemPage { |
510 | |
511 | === modified file 'plugins/cellular/HotspotSetup.qml' |
512 | --- plugins/cellular/HotspotSetup.qml 2014-07-04 11:32:33 +0000 |
513 | +++ plugins/cellular/HotspotSetup.qml 2014-09-19 14:54:39 +0000 |
514 | @@ -19,8 +19,8 @@ |
515 | import QtQuick 2.0 |
516 | import QtQuick.Layouts 1.1 |
517 | import SystemSettings 1.0 |
518 | -import Ubuntu.Components 0.1 |
519 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
520 | +import Ubuntu.Components 1.1 |
521 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
522 | import Ubuntu.SystemSettings.Cellular 1.0 |
523 | |
524 | ItemPage { |
525 | |
526 | === modified file 'plugins/cellular/PageChooseCarrier.qml' |
527 | --- plugins/cellular/PageChooseCarrier.qml 2014-07-24 19:00:45 +0000 |
528 | +++ plugins/cellular/PageChooseCarrier.qml 2014-09-19 14:54:39 +0000 |
529 | @@ -20,8 +20,8 @@ |
530 | |
531 | import QtQuick 2.0 |
532 | import SystemSettings 1.0 |
533 | -import Ubuntu.Components 0.1 |
534 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
535 | +import Ubuntu.Components 1.1 |
536 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
537 | import MeeGo.QOfono 0.2 |
538 | |
539 | ItemPage { |
540 | |
541 | === modified file 'plugins/cellular/PageChooseCarriers.qml' |
542 | --- plugins/cellular/PageChooseCarriers.qml 2014-08-17 14:50:51 +0000 |
543 | +++ plugins/cellular/PageChooseCarriers.qml 2014-09-19 14:54:39 +0000 |
544 | @@ -19,8 +19,8 @@ |
545 | */ |
546 | import QtQuick 2.0 |
547 | import SystemSettings 1.0 |
548 | -import Ubuntu.Components 0.1 |
549 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
550 | +import Ubuntu.Components 1.1 |
551 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
552 | import MeeGo.QOfono 0.2 |
553 | |
554 | ItemPage { |
555 | |
556 | === modified file 'plugins/cellular/PageComponent.qml' |
557 | --- plugins/cellular/PageComponent.qml 2014-08-19 10:58:01 +0000 |
558 | +++ plugins/cellular/PageComponent.qml 2014-09-19 14:54:39 +0000 |
559 | @@ -20,8 +20,8 @@ |
560 | |
561 | import QtQuick 2.0 |
562 | import SystemSettings 1.0 |
563 | -import Ubuntu.Components 0.1 |
564 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
565 | +import Ubuntu.Components 1.1 |
566 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
567 | import MeeGo.QOfono 0.2 |
568 | import QMenuModel 0.1 |
569 | import "Components" as LocalComponents |
570 | |
571 | === modified file 'plugins/example/PageComponent.qml' |
572 | --- plugins/example/PageComponent.qml 2013-05-30 08:06:10 +0000 |
573 | +++ plugins/example/PageComponent.qml 2014-09-19 14:54:39 +0000 |
574 | @@ -19,7 +19,7 @@ |
575 | */ |
576 | |
577 | import QtQuick 2.0 |
578 | -import Ubuntu.Components 0.1 |
579 | +import Ubuntu.Components 1.1 |
580 | import SystemSettings 1.0 |
581 | |
582 | ItemPage { |
583 | |
584 | === modified file 'plugins/flight-mode/EntryComponent.qml' |
585 | --- plugins/flight-mode/EntryComponent.qml 2014-06-12 08:19:01 +0000 |
586 | +++ plugins/flight-mode/EntryComponent.qml 2014-09-19 14:54:39 +0000 |
587 | @@ -19,8 +19,8 @@ |
588 | */ |
589 | |
590 | import QtQuick 2.0 |
591 | -import Ubuntu.Components 0.1 |
592 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
593 | +import Ubuntu.Components 1.1 |
594 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
595 | import Ubuntu.SystemSettings.FlightMode 1.0 as FlightMode |
596 | |
597 | ListItem.Standard { |
598 | |
599 | === modified file 'plugins/language/DisplayLanguage.qml' |
600 | --- plugins/language/DisplayLanguage.qml 2014-09-03 22:01:57 +0000 |
601 | +++ plugins/language/DisplayLanguage.qml 2014-09-19 14:54:39 +0000 |
602 | @@ -19,9 +19,9 @@ |
603 | */ |
604 | |
605 | import QtQuick 2.0 |
606 | -import Ubuntu.Components 0.1 |
607 | -import Ubuntu.Components.Popups 0.1 |
608 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
609 | +import Ubuntu.Components 1.1 |
610 | +import Ubuntu.Components.Popups 1.0 |
611 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
612 | import Ubuntu.SystemSettings.LanguagePlugin 1.0 |
613 | |
614 | SheetBase { |
615 | |
616 | === modified file 'plugins/language/KeyboardLayoutItem.qml' |
617 | --- plugins/language/KeyboardLayoutItem.qml 2013-11-28 16:28:54 +0000 |
618 | +++ plugins/language/KeyboardLayoutItem.qml 2014-09-19 14:54:39 +0000 |
619 | @@ -19,8 +19,8 @@ |
620 | */ |
621 | |
622 | import QtQuick 2.0 |
623 | -import Ubuntu.Components 0.1 |
624 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
625 | +import Ubuntu.Components 1.1 |
626 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
627 | |
628 | ListItem.Base { |
629 | property alias name: name.text |
630 | |
631 | === modified file 'plugins/language/KeyboardLayouts.qml' |
632 | --- plugins/language/KeyboardLayouts.qml 2013-11-28 16:28:54 +0000 |
633 | +++ plugins/language/KeyboardLayouts.qml 2014-09-19 14:54:39 +0000 |
634 | @@ -19,7 +19,7 @@ |
635 | */ |
636 | |
637 | import SystemSettings 1.0 |
638 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
639 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
640 | import Ubuntu.SystemSettings.LanguagePlugin 1.0 |
641 | |
642 | ItemPage { |
643 | |
644 | === modified file 'plugins/language/PageComponent.qml' |
645 | --- plugins/language/PageComponent.qml 2014-09-03 14:43:44 +0000 |
646 | +++ plugins/language/PageComponent.qml 2014-09-19 14:54:39 +0000 |
647 | @@ -21,9 +21,9 @@ |
648 | import QtQuick 2.0 |
649 | import GSettings 1.0 |
650 | import SystemSettings 1.0 |
651 | -import Ubuntu.Components 0.1 |
652 | -import Ubuntu.Components.Popups 0.1 |
653 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
654 | +import Ubuntu.Components 1.1 |
655 | +import Ubuntu.Components.Popups 1.0 |
656 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
657 | import Ubuntu.Settings.Menus 0.1 as Menus |
658 | import Ubuntu.SystemSettings.LanguagePlugin 1.0 |
659 | |
660 | |
661 | === modified file 'plugins/language/RebootNecessary.qml' |
662 | --- plugins/language/RebootNecessary.qml 2014-09-03 15:18:38 +0000 |
663 | +++ plugins/language/RebootNecessary.qml 2014-09-19 14:54:39 +0000 |
664 | @@ -19,8 +19,8 @@ |
665 | */ |
666 | |
667 | import QtQuick 2.0 |
668 | -import Ubuntu.Components 0.1 |
669 | -import Ubuntu.Components.Popups 0.1 |
670 | +import Ubuntu.Components 1.1 |
671 | +import Ubuntu.Components.Popups 1.0 |
672 | |
673 | Dialog { |
674 | id: dialog |
675 | |
676 | === modified file 'plugins/language/SpellChecking.qml' |
677 | --- plugins/language/SpellChecking.qml 2014-01-30 11:32:47 +0000 |
678 | +++ plugins/language/SpellChecking.qml 2014-09-19 14:54:39 +0000 |
679 | @@ -19,8 +19,8 @@ |
680 | */ |
681 | |
682 | import SystemSettings 1.0 |
683 | -import Ubuntu.Components 0.1 |
684 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
685 | +import Ubuntu.Components 1.1 |
686 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
687 | import Ubuntu.SystemSettings.LanguagePlugin 1.0 |
688 | |
689 | ItemPage { |
690 | |
691 | === modified file 'plugins/language/SubsetView.qml' |
692 | --- plugins/language/SubsetView.qml 2014-09-08 13:04:38 +0000 |
693 | +++ plugins/language/SubsetView.qml 2014-09-19 14:54:39 +0000 |
694 | @@ -20,8 +20,8 @@ |
695 | |
696 | import QtQuick 2.0 |
697 | import SystemSettings 1.0 |
698 | -import Ubuntu.Components 0.1 |
699 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
700 | +import Ubuntu.Components 1.1 |
701 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
702 | |
703 | ListView { |
704 | id: root |
705 | |
706 | === modified file 'plugins/notifications/PageComponent.qml' |
707 | --- plugins/notifications/PageComponent.qml 2014-08-29 09:17:39 +0000 |
708 | +++ plugins/notifications/PageComponent.qml 2014-09-19 14:54:39 +0000 |
709 | @@ -17,8 +17,8 @@ |
710 | */ |
711 | |
712 | import QtQuick 2.0 |
713 | -import Ubuntu.Components 0.1 |
714 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
715 | +import Ubuntu.Components 1.1 |
716 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
717 | import Ubuntu.SystemSettings.Notifications 1.0 |
718 | import SystemSettings 1.0 |
719 | |
720 | |
721 | === modified file 'plugins/orientation-lock/EntryComponent.qml' |
722 | --- plugins/orientation-lock/EntryComponent.qml 2014-09-04 11:47:52 +0000 |
723 | +++ plugins/orientation-lock/EntryComponent.qml 2014-09-19 14:54:39 +0000 |
724 | @@ -21,8 +21,8 @@ |
725 | import GSettings 1.0 |
726 | import QtQuick 2.0 |
727 | import QtQuick.Window 2.1 |
728 | -import Ubuntu.Components 0.1 |
729 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
730 | +import Ubuntu.Components 1.1 |
731 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
732 | |
733 | |
734 | ListItem.Standard { |
735 | |
736 | === modified file 'plugins/phone/CallForwarding.qml' |
737 | --- plugins/phone/CallForwarding.qml 2014-08-08 08:37:12 +0000 |
738 | +++ plugins/phone/CallForwarding.qml 2014-09-19 14:54:39 +0000 |
739 | @@ -20,8 +20,8 @@ |
740 | |
741 | import QtQuick 2.0 |
742 | import SystemSettings 1.0 |
743 | -import Ubuntu.Components 0.1 |
744 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
745 | +import Ubuntu.Components 1.1 |
746 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
747 | |
748 | ItemPage { |
749 | |
750 | |
751 | === modified file 'plugins/phone/CallWaiting.qml' |
752 | --- plugins/phone/CallWaiting.qml 2014-08-23 19:52:39 +0000 |
753 | +++ plugins/phone/CallWaiting.qml 2014-09-19 14:54:39 +0000 |
754 | @@ -20,8 +20,8 @@ |
755 | |
756 | import QtQuick 2.0 |
757 | import SystemSettings 1.0 |
758 | -import Ubuntu.Components 0.1 |
759 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
760 | +import Ubuntu.Components 1.1 |
761 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
762 | import MeeGo.QOfono 0.2 |
763 | |
764 | ItemPage { |
765 | |
766 | === modified file 'plugins/phone/MultiSim.qml' |
767 | --- plugins/phone/MultiSim.qml 2014-08-19 15:59:18 +0000 |
768 | +++ plugins/phone/MultiSim.qml 2014-09-19 14:54:39 +0000 |
769 | @@ -21,7 +21,7 @@ |
770 | import QtQuick 2.0 |
771 | import GSettings 1.0 |
772 | import Ubuntu.Components 1.1 |
773 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
774 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
775 | |
776 | Column { |
777 | |
778 | |
779 | === modified file 'plugins/phone/NoSims.qml' |
780 | --- plugins/phone/NoSims.qml 2014-08-19 15:59:18 +0000 |
781 | +++ plugins/phone/NoSims.qml 2014-09-19 14:54:39 +0000 |
782 | @@ -20,7 +20,7 @@ |
783 | */ |
784 | import QtQuick 2.0 |
785 | import Ubuntu.Components 1.1 |
786 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
787 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
788 | |
789 | Column { |
790 | |
791 | |
792 | === modified file 'plugins/phone/PageComponent.qml' |
793 | --- plugins/phone/PageComponent.qml 2014-08-28 17:33:40 +0000 |
794 | +++ plugins/phone/PageComponent.qml 2014-09-19 14:54:39 +0000 |
795 | @@ -20,8 +20,8 @@ |
796 | |
797 | import QtQuick 2.0 |
798 | import SystemSettings 1.0 |
799 | -import Ubuntu.Components 0.1 |
800 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
801 | +import Ubuntu.Components 1.1 |
802 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
803 | import Ubuntu.SystemSettings.Sound 1.0 |
804 | import MeeGo.QOfono 0.2 |
805 | import "sims.js" as Sims |
806 | |
807 | === modified file 'plugins/phone/ServiceInfo.qml' |
808 | --- plugins/phone/ServiceInfo.qml 2014-06-19 05:27:55 +0000 |
809 | +++ plugins/phone/ServiceInfo.qml 2014-09-19 14:54:39 +0000 |
810 | @@ -20,8 +20,8 @@ |
811 | |
812 | import QtQuick 2.0 |
813 | import SystemSettings 1.0 |
814 | -import Ubuntu.Components 0.1 |
815 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
816 | +import Ubuntu.Components 1.1 |
817 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
818 | import Ubuntu.History 0.1 |
819 | import "dateUtils.js" as DateUtils |
820 | |
821 | |
822 | === modified file 'plugins/phone/Services.qml' |
823 | --- plugins/phone/Services.qml 2014-08-06 12:12:31 +0000 |
824 | +++ plugins/phone/Services.qml 2014-09-19 14:54:39 +0000 |
825 | @@ -20,8 +20,8 @@ |
826 | |
827 | import QtQuick 2.0 |
828 | import SystemSettings 1.0 |
829 | -import Ubuntu.Components 0.1 |
830 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
831 | +import Ubuntu.Components 1.1 |
832 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
833 | |
834 | ItemPage { |
835 | objectName: "servicesPage" |
836 | |
837 | === modified file 'plugins/phone/SingleSim.qml' |
838 | --- plugins/phone/SingleSim.qml 2014-08-19 15:59:18 +0000 |
839 | +++ plugins/phone/SingleSim.qml 2014-09-19 14:54:39 +0000 |
840 | @@ -20,7 +20,7 @@ |
841 | */ |
842 | import QtQuick 2.0 |
843 | import Ubuntu.Components 1.1 |
844 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
845 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
846 | |
847 | Column { |
848 | |
849 | |
850 | === modified file 'plugins/reset/EntryComponent.qml' |
851 | --- plugins/reset/EntryComponent.qml 2014-07-30 22:16:33 +0000 |
852 | +++ plugins/reset/EntryComponent.qml 2014-09-19 14:54:39 +0000 |
853 | @@ -19,8 +19,8 @@ |
854 | */ |
855 | |
856 | import QtQuick 2.0 |
857 | -import Ubuntu.Components 0.1 |
858 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
859 | +import Ubuntu.Components 1.1 |
860 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
861 | |
862 | ListItem.Standard { |
863 | id: root |
864 | |
865 | === modified file 'plugins/reset/EraseEverything.qml' |
866 | --- plugins/reset/EraseEverything.qml 2014-07-30 22:16:33 +0000 |
867 | +++ plugins/reset/EraseEverything.qml 2014-09-19 14:54:39 +0000 |
868 | @@ -19,8 +19,8 @@ |
869 | */ |
870 | |
871 | import QtQuick 2.0 |
872 | -import Ubuntu.Components 0.1 |
873 | -import Ubuntu.Components.Popups 0.1 |
874 | +import Ubuntu.Components 1.1 |
875 | +import Ubuntu.Components.Popups 1.0 |
876 | |
877 | Component { |
878 | id: eraseEverything |
879 | |
880 | === modified file 'plugins/reset/PageComponent.qml' |
881 | --- plugins/reset/PageComponent.qml 2014-07-30 22:16:33 +0000 |
882 | +++ plugins/reset/PageComponent.qml 2014-09-19 14:54:39 +0000 |
883 | @@ -21,9 +21,9 @@ |
884 | import GSettings 1.0 |
885 | import QtQuick 2.0 |
886 | import SystemSettings 1.0 |
887 | -import Ubuntu.Components 0.1 |
888 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
889 | -import Ubuntu.Components.Popups 0.1 |
890 | +import Ubuntu.Components 1.1 |
891 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
892 | +import Ubuntu.Components.Popups 1.0 |
893 | import Ubuntu.SystemSettings.Reset 1.0 |
894 | |
895 | ItemPage { |
896 | |
897 | === modified file 'plugins/reset/ResetAllSettings.qml' |
898 | --- plugins/reset/ResetAllSettings.qml 2014-02-27 12:55:28 +0000 |
899 | +++ plugins/reset/ResetAllSettings.qml 2014-09-19 14:54:39 +0000 |
900 | @@ -19,8 +19,8 @@ |
901 | */ |
902 | |
903 | import QtQuick 2.0 |
904 | -import Ubuntu.Components 0.1 |
905 | -import Ubuntu.Components.Popups 0.1 |
906 | +import Ubuntu.Components 1.1 |
907 | +import Ubuntu.Components.Popups 1.0 |
908 | |
909 | Component { |
910 | id: resetAllSettings |
911 | |
912 | === modified file 'plugins/reset/ResetLauncherHome.qml' |
913 | --- plugins/reset/ResetLauncherHome.qml 2014-08-07 10:21:37 +0000 |
914 | +++ plugins/reset/ResetLauncherHome.qml 2014-09-19 14:54:39 +0000 |
915 | @@ -19,8 +19,8 @@ |
916 | */ |
917 | |
918 | import QtQuick 2.0 |
919 | -import Ubuntu.Components 0.1 |
920 | -import Ubuntu.Components.Popups 0.1 |
921 | +import Ubuntu.Components 1.1 |
922 | +import Ubuntu.Components.Popups 1.0 |
923 | |
924 | Component { |
925 | id: resetLauncherHome |
926 | |
927 | === modified file 'plugins/security-privacy/AppAccess.qml' |
928 | --- plugins/security-privacy/AppAccess.qml 2014-08-05 09:20:11 +0000 |
929 | +++ plugins/security-privacy/AppAccess.qml 2014-09-19 14:54:39 +0000 |
930 | @@ -18,8 +18,8 @@ |
931 | */ |
932 | |
933 | import QtQuick 2.0 |
934 | -import Ubuntu.Components 0.1 |
935 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
936 | +import Ubuntu.Components 1.1 |
937 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
938 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
939 | import SystemSettings 1.0 |
940 | |
941 | |
942 | === modified file 'plugins/security-privacy/AppAccessControl.qml' |
943 | --- plugins/security-privacy/AppAccessControl.qml 2014-08-15 12:54:13 +0000 |
944 | +++ plugins/security-privacy/AppAccessControl.qml 2014-09-19 14:54:39 +0000 |
945 | @@ -18,8 +18,8 @@ |
946 | */ |
947 | |
948 | import QtQuick 2.0 |
949 | -import Ubuntu.Components 0.1 |
950 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
951 | +import Ubuntu.Components 1.1 |
952 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
953 | import SystemSettings 1.0 |
954 | |
955 | ItemPage { |
956 | |
957 | === modified file 'plugins/security-privacy/Dash.qml' |
958 | --- plugins/security-privacy/Dash.qml 2014-02-13 14:37:42 +0000 |
959 | +++ plugins/security-privacy/Dash.qml 2014-09-19 14:54:39 +0000 |
960 | @@ -20,8 +20,8 @@ |
961 | |
962 | import GSettings 1.0 |
963 | import QtQuick 2.0 |
964 | -import Ubuntu.Components 0.1 |
965 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
966 | +import Ubuntu.Components 1.1 |
967 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
968 | import SystemSettings 1.0 |
969 | |
970 | ItemPage { |
971 | |
972 | === modified file 'plugins/security-privacy/Location.qml' |
973 | --- plugins/security-privacy/Location.qml 2014-09-05 08:50:28 +0000 |
974 | +++ plugins/security-privacy/Location.qml 2014-09-19 14:54:39 +0000 |
975 | @@ -21,8 +21,8 @@ |
976 | import GSettings 1.0 |
977 | import QMenuModel 0.1 |
978 | import QtQuick 2.0 |
979 | -import Ubuntu.Components 0.1 |
980 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
981 | +import Ubuntu.Components 1.1 |
982 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
983 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
984 | import SystemSettings 1.0 |
985 | |
986 | |
987 | === modified file 'plugins/security-privacy/LockSecurity.qml' |
988 | --- plugins/security-privacy/LockSecurity.qml 2014-08-28 18:43:10 +0000 |
989 | +++ plugins/security-privacy/LockSecurity.qml 2014-09-19 14:54:39 +0000 |
990 | @@ -22,8 +22,8 @@ |
991 | import QtQuick 2.0 |
992 | import QtQuick.Layouts 1.1 |
993 | import Ubuntu.Components 1.1 |
994 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
995 | -import Ubuntu.Components.Popups 0.1 |
996 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
997 | +import Ubuntu.Components.Popups 1.0 |
998 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
999 | import SystemSettings 1.0 |
1000 | |
1001 | |
1002 | === modified file 'plugins/security-privacy/PageComponent.qml' |
1003 | --- plugins/security-privacy/PageComponent.qml 2014-09-05 09:01:20 +0000 |
1004 | +++ plugins/security-privacy/PageComponent.qml 2014-09-19 14:54:39 +0000 |
1005 | @@ -21,8 +21,8 @@ |
1006 | import GSettings 1.0 |
1007 | import QMenuModel 0.1 |
1008 | import QtQuick 2.0 |
1009 | -import Ubuntu.Components 0.1 |
1010 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1011 | +import Ubuntu.Components 1.1 |
1012 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1013 | import SystemSettings 1.0 |
1014 | import Ubuntu.SystemSettings.Battery 1.0 |
1015 | import Ubuntu.SystemSettings.Diagnostics 1.0 |
1016 | |
1017 | === modified file 'plugins/security-privacy/PhoneLocking.qml' |
1018 | --- plugins/security-privacy/PhoneLocking.qml 2014-09-02 09:44:12 +0000 |
1019 | +++ plugins/security-privacy/PhoneLocking.qml 2014-09-19 14:54:39 +0000 |
1020 | @@ -21,8 +21,8 @@ |
1021 | import GSettings 1.0 |
1022 | import QtQuick 2.0 |
1023 | import SystemSettings 1.0 |
1024 | -import Ubuntu.Components 0.1 |
1025 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1026 | +import Ubuntu.Components 1.1 |
1027 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1028 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
1029 | |
1030 | ItemPage { |
1031 | |
1032 | === modified file 'plugins/security-privacy/SimPin.qml' |
1033 | --- plugins/security-privacy/SimPin.qml 2014-09-11 11:40:24 +0000 |
1034 | +++ plugins/security-privacy/SimPin.qml 2014-09-19 14:54:39 +0000 |
1035 | @@ -22,8 +22,8 @@ |
1036 | import QtQuick 2.0 |
1037 | import QtQuick.Layouts 1.1 |
1038 | import Ubuntu.Components 1.1 |
1039 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1040 | -import Ubuntu.Components.Popups 0.1 |
1041 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1042 | +import Ubuntu.Components.Popups 1.0 |
1043 | import SystemSettings 1.0 |
1044 | import MeeGo.QOfono 0.2 |
1045 | import "sims.js" as Sims |
1046 | |
1047 | === modified file 'plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml' |
1048 | --- plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml 2013-07-26 11:12:18 +0000 |
1049 | +++ plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml 2014-09-19 14:54:39 +0000 |
1050 | @@ -19,8 +19,8 @@ |
1051 | */ |
1052 | |
1053 | import QtQuick 2.0 |
1054 | -import Ubuntu.Components 0.1 |
1055 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1056 | +import Ubuntu.Components 1.1 |
1057 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1058 | |
1059 | ListItem.Base { |
1060 | property string textEntry: ""; |
1061 | |
1062 | === modified file 'plugins/security-privacy/diagnostics/PageComponent.qml' |
1063 | --- plugins/security-privacy/diagnostics/PageComponent.qml 2013-07-29 15:04:03 +0000 |
1064 | +++ plugins/security-privacy/diagnostics/PageComponent.qml 2014-09-19 14:54:39 +0000 |
1065 | @@ -20,8 +20,8 @@ |
1066 | |
1067 | import QtQuick 2.0 |
1068 | import SystemSettings 1.0 |
1069 | -import Ubuntu.Components 0.1 |
1070 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1071 | +import Ubuntu.Components 1.1 |
1072 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1073 | import Ubuntu.SystemSettings.Diagnostics 1.0 |
1074 | |
1075 | ItemPage { |
1076 | |
1077 | === modified file 'plugins/sound/PageComponent.qml' |
1078 | --- plugins/sound/PageComponent.qml 2014-09-10 09:48:31 +0000 |
1079 | +++ plugins/sound/PageComponent.qml 2014-09-19 14:54:39 +0000 |
1080 | @@ -20,8 +20,8 @@ |
1081 | |
1082 | import GSettings 1.0 |
1083 | import QtQuick 2.0 |
1084 | -import Ubuntu.Components 0.1 |
1085 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1086 | +import Ubuntu.Components 1.1 |
1087 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1088 | import SystemSettings 1.0 |
1089 | import Ubuntu.SystemSettings.Sound 1.0 |
1090 | import Ubuntu.Settings.Menus 0.1 as Menus |
1091 | |
1092 | === modified file 'plugins/sound/SilentModeWarning.qml' |
1093 | --- plugins/sound/SilentModeWarning.qml 2014-07-28 15:14:46 +0000 |
1094 | +++ plugins/sound/SilentModeWarning.qml 2014-09-19 14:54:39 +0000 |
1095 | @@ -1,7 +1,7 @@ |
1096 | import QtQuick 2.0 |
1097 | import SystemSettings 1.0 |
1098 | -import Ubuntu.Components 0.1 |
1099 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1100 | +import Ubuntu.Components 1.1 |
1101 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1102 | |
1103 | ListItem.Base { |
1104 | objectName: "silentModeWarning" |
1105 | |
1106 | === modified file 'plugins/sound/SoundsList.qml' |
1107 | --- plugins/sound/SoundsList.qml 2014-09-05 20:17:34 +0000 |
1108 | +++ plugins/sound/SoundsList.qml 2014-09-19 14:54:39 +0000 |
1109 | @@ -2,8 +2,8 @@ |
1110 | import QtQuick 2.0 |
1111 | import QtMultimedia 5.0 |
1112 | import SystemSettings 1.0 |
1113 | -import Ubuntu.Components 0.1 |
1114 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1115 | +import Ubuntu.Components 1.1 |
1116 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1117 | import Ubuntu.SystemSettings.Sound 1.0 |
1118 | |
1119 | import "utilities.js" as Utilities |
1120 | |
1121 | === modified file 'plugins/system-update/Configuration.qml' |
1122 | --- plugins/system-update/Configuration.qml 2014-09-05 18:23:22 +0000 |
1123 | +++ plugins/system-update/Configuration.qml 2014-09-19 14:54:39 +0000 |
1124 | @@ -18,8 +18,8 @@ |
1125 | |
1126 | import QtQuick 2.0 |
1127 | import SystemSettings 1.0 |
1128 | -import Ubuntu.Components 0.1 |
1129 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1130 | +import Ubuntu.Components 1.1 |
1131 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1132 | import Ubuntu.SystemSettings.Update 1.0 |
1133 | |
1134 | |
1135 | |
1136 | === modified file 'plugins/system-update/EntryComponent.qml' |
1137 | --- plugins/system-update/EntryComponent.qml 2014-09-17 05:02:01 +0000 |
1138 | +++ plugins/system-update/EntryComponent.qml 2014-09-19 14:54:39 +0000 |
1139 | @@ -19,8 +19,8 @@ |
1140 | */ |
1141 | |
1142 | import QtQuick 2.0 |
1143 | -import Ubuntu.Components 0.1 |
1144 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1145 | +import Ubuntu.Components 1.1 |
1146 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1147 | import Ubuntu.SystemSettings.Update 1.0 |
1148 | |
1149 | ListItem.SingleValue { |
1150 | |
1151 | === modified file 'plugins/system-update/PageComponent.qml' |
1152 | --- plugins/system-update/PageComponent.qml 2014-09-17 13:19:24 +0000 |
1153 | +++ plugins/system-update/PageComponent.qml 2014-09-19 14:54:39 +0000 |
1154 | @@ -23,9 +23,9 @@ |
1155 | import QtQuick 2.0 |
1156 | import QtSystemInfo 5.0 |
1157 | import SystemSettings 1.0 |
1158 | -import Ubuntu.Components 0.1 |
1159 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1160 | -import Ubuntu.Components.Popups 0.1 |
1161 | +import Ubuntu.Components 1.1 |
1162 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1163 | +import Ubuntu.Components.Popups 1.0 |
1164 | import Ubuntu.OnlineAccounts.Client 0.1 |
1165 | import Ubuntu.SystemSettings.Update 1.0 |
1166 | |
1167 | |
1168 | === modified file 'plugins/time-date/ChooseTimeZone.qml' |
1169 | --- plugins/time-date/ChooseTimeZone.qml 2014-06-11 13:05:23 +0000 |
1170 | +++ plugins/time-date/ChooseTimeZone.qml 2014-09-19 14:54:39 +0000 |
1171 | @@ -20,8 +20,8 @@ |
1172 | |
1173 | import QtQuick 2.0 |
1174 | import SystemSettings 1.0 |
1175 | -import Ubuntu.Components 0.1 |
1176 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1177 | +import Ubuntu.Components 1.1 |
1178 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1179 | import Ubuntu.SystemSettings.TimeDate 1.0 |
1180 | |
1181 | ItemPage { |
1182 | |
1183 | === modified file 'plugins/time-date/PageComponent.qml' |
1184 | --- plugins/time-date/PageComponent.qml 2014-01-29 13:34:37 +0000 |
1185 | +++ plugins/time-date/PageComponent.qml 2014-09-19 14:54:39 +0000 |
1186 | @@ -20,9 +20,9 @@ |
1187 | |
1188 | import QtQuick 2.0 |
1189 | import SystemSettings 1.0 |
1190 | -import Ubuntu.Components 0.1 |
1191 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1192 | -import Ubuntu.Components.Popups 0.1 |
1193 | +import Ubuntu.Components 1.1 |
1194 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1195 | +import Ubuntu.Components.Popups 1.0 |
1196 | import Ubuntu.SystemSettings.TimeDate 1.0 |
1197 | |
1198 | ItemPage { |
1199 | |
1200 | === modified file 'plugins/time-date/Scroller.qml' |
1201 | --- plugins/time-date/Scroller.qml 2013-10-09 15:42:36 +0000 |
1202 | +++ plugins/time-date/Scroller.qml 2014-09-19 14:54:39 +0000 |
1203 | @@ -17,8 +17,8 @@ |
1204 | */ |
1205 | |
1206 | import QtQuick 2.0 |
1207 | -import Ubuntu.Components 0.1 |
1208 | -import Ubuntu.Components.ListItems 0.1 as ListItems |
1209 | +import Ubuntu.Components 1.1 |
1210 | +import Ubuntu.Components.ListItems 1.0 as ListItems |
1211 | |
1212 | Item { |
1213 | id: root |
1214 | |
1215 | === modified file 'plugins/time-date/TimePicker.qml' |
1216 | --- plugins/time-date/TimePicker.qml 2013-10-07 11:02:12 +0000 |
1217 | +++ plugins/time-date/TimePicker.qml 2014-09-19 14:54:39 +0000 |
1218 | @@ -17,9 +17,9 @@ |
1219 | */ |
1220 | |
1221 | import QtQuick 2.0 |
1222 | -import Ubuntu.Components 0.1 |
1223 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1224 | -import Ubuntu.Components.Popups 0.1 |
1225 | +import Ubuntu.Components 1.1 |
1226 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1227 | +import Ubuntu.Components.Popups 1.0 |
1228 | |
1229 | Dialog { |
1230 | id: root |
1231 | |
1232 | === modified file 'plugins/wifi/AccessPoint.qml' |
1233 | --- plugins/wifi/AccessPoint.qml 2014-08-29 12:49:17 +0000 |
1234 | +++ plugins/wifi/AccessPoint.qml 2014-09-19 14:54:39 +0000 |
1235 | @@ -18,8 +18,8 @@ |
1236 | */ |
1237 | |
1238 | import QtQuick 2.0 |
1239 | -import Ubuntu.Components 0.1 |
1240 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1241 | +import Ubuntu.Components 1.1 |
1242 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1243 | |
1244 | FramedMenuItem { |
1245 | id: accessPoint |
1246 | |
1247 | === modified file 'plugins/wifi/BaseMenuItem.qml' |
1248 | --- plugins/wifi/BaseMenuItem.qml 2013-09-18 19:41:37 +0000 |
1249 | +++ plugins/wifi/BaseMenuItem.qml 2014-09-19 14:54:39 +0000 |
1250 | @@ -19,7 +19,7 @@ |
1251 | */ |
1252 | |
1253 | import QtQuick 2.0 |
1254 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1255 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1256 | |
1257 | ListItem.Standard { |
1258 | id: baseMenu |
1259 | |
1260 | === modified file 'plugins/wifi/DivMenuItem.qml' |
1261 | --- plugins/wifi/DivMenuItem.qml 2013-10-18 10:30:18 +0000 |
1262 | +++ plugins/wifi/DivMenuItem.qml 2014-09-19 14:54:39 +0000 |
1263 | @@ -18,7 +18,7 @@ |
1264 | */ |
1265 | |
1266 | import QtQuick 2.0 |
1267 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1268 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1269 | |
1270 | ListItem.Empty { |
1271 | height: units.gu(3) |
1272 | |
1273 | === modified file 'plugins/wifi/FramedMenuItem.qml' |
1274 | --- plugins/wifi/FramedMenuItem.qml 2013-10-09 16:32:18 +0000 |
1275 | +++ plugins/wifi/FramedMenuItem.qml 2014-09-19 14:54:39 +0000 |
1276 | @@ -19,7 +19,7 @@ |
1277 | */ |
1278 | |
1279 | import QtQuick 2.0 |
1280 | -import Ubuntu.Components 0.1 |
1281 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1282 | +import Ubuntu.Components 1.1 |
1283 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1284 | |
1285 | ListItem.Standard {} |
1286 | |
1287 | === modified file 'plugins/wifi/HLine.qml' |
1288 | --- plugins/wifi/HLine.qml 2013-09-18 19:41:37 +0000 |
1289 | +++ plugins/wifi/HLine.qml 2014-09-19 14:54:39 +0000 |
1290 | @@ -18,7 +18,7 @@ |
1291 | */ |
1292 | |
1293 | import QtQuick 2.0 |
1294 | -import Ubuntu.Components 0.1 |
1295 | +import Ubuntu.Components 1.1 |
1296 | |
1297 | Rectangle { |
1298 | height: units.dp(1) |
1299 | |
1300 | === modified file 'plugins/wifi/IndicatorBase.qml' |
1301 | --- plugins/wifi/IndicatorBase.qml 2013-09-18 19:41:37 +0000 |
1302 | +++ plugins/wifi/IndicatorBase.qml 2014-09-19 14:54:39 +0000 |
1303 | @@ -20,7 +20,7 @@ |
1304 | import QtQuick 2.0 |
1305 | import QMenuModel 0.1 as QMenuModel |
1306 | import SystemSettings 1.0 |
1307 | -import Ubuntu.Components 0.1 |
1308 | +import Ubuntu.Components 1.1 |
1309 | |
1310 | ItemPage { |
1311 | id: indicatorItem |
1312 | |
1313 | === modified file 'plugins/wifi/NetworkDetails.qml' |
1314 | --- plugins/wifi/NetworkDetails.qml 2014-07-15 07:08:24 +0000 |
1315 | +++ plugins/wifi/NetworkDetails.qml 2014-09-19 14:54:39 +0000 |
1316 | @@ -21,8 +21,8 @@ |
1317 | import QtQuick 2.0 |
1318 | import QtQuick.Layouts 1.1 |
1319 | import SystemSettings 1.0 |
1320 | -import Ubuntu.Components 0.1 |
1321 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1322 | +import Ubuntu.Components 1.1 |
1323 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1324 | import Ubuntu.SystemSettings.Wifi 1.0 |
1325 | |
1326 | ItemPage { |
1327 | |
1328 | === modified file 'plugins/wifi/NetworkDetailsBrief.qml' |
1329 | --- plugins/wifi/NetworkDetailsBrief.qml 2014-08-29 18:12:33 +0000 |
1330 | +++ plugins/wifi/NetworkDetailsBrief.qml 2014-09-19 14:54:39 +0000 |
1331 | @@ -21,8 +21,8 @@ |
1332 | import QtQuick 2.0 |
1333 | import QtQuick.Layouts 1.1 |
1334 | import SystemSettings 1.0 |
1335 | -import Ubuntu.Components 0.1 |
1336 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1337 | +import Ubuntu.Components 1.1 |
1338 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1339 | import Ubuntu.SystemSettings.Wifi 1.0 |
1340 | |
1341 | ItemPage { |
1342 | |
1343 | === modified file 'plugins/wifi/OtherNetwork.qml' |
1344 | --- plugins/wifi/OtherNetwork.qml 2014-09-13 02:44:36 +0000 |
1345 | +++ plugins/wifi/OtherNetwork.qml 2014-09-19 14:54:39 +0000 |
1346 | @@ -17,8 +17,8 @@ |
1347 | import QtQuick 2.0 |
1348 | import QtQuick.Layouts 1.1 |
1349 | import SystemSettings 1.0 |
1350 | -import Ubuntu.Components 0.1 |
1351 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1352 | +import Ubuntu.Components 1.1 |
1353 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1354 | import Ubuntu.SystemSettings.Wifi 1.0 |
1355 | import QMenuModel 0.1 |
1356 | |
1357 | |
1358 | === modified file 'plugins/wifi/PageComponent.qml' |
1359 | --- plugins/wifi/PageComponent.qml 2014-09-13 02:44:36 +0000 |
1360 | +++ plugins/wifi/PageComponent.qml 2014-09-19 14:54:39 +0000 |
1361 | @@ -16,8 +16,8 @@ |
1362 | |
1363 | import QtQuick 2.0 |
1364 | import SystemSettings 1.0 |
1365 | -import Ubuntu.Components 0.1 |
1366 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1367 | +import Ubuntu.Components 1.1 |
1368 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1369 | import Ubuntu.SystemSettings.Wifi 1.0 |
1370 | import QMenuModel 0.1 |
1371 | |
1372 | |
1373 | === modified file 'plugins/wifi/PreviousNetworks.qml' |
1374 | --- plugins/wifi/PreviousNetworks.qml 2014-06-23 17:29:13 +0000 |
1375 | +++ plugins/wifi/PreviousNetworks.qml 2014-09-19 14:54:39 +0000 |
1376 | @@ -16,8 +16,8 @@ |
1377 | |
1378 | import QtQuick 2.0 |
1379 | import SystemSettings 1.0 |
1380 | -import Ubuntu.Components 0.1 |
1381 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1382 | +import Ubuntu.Components 1.1 |
1383 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1384 | import Ubuntu.SystemSettings.Wifi 1.0 |
1385 | import QMenuModel 0.1 |
1386 | |
1387 | |
1388 | === modified file 'plugins/wifi/RemoveBackground.qml' |
1389 | --- plugins/wifi/RemoveBackground.qml 2013-09-18 19:41:37 +0000 |
1390 | +++ plugins/wifi/RemoveBackground.qml 2014-09-19 14:54:39 +0000 |
1391 | @@ -15,7 +15,7 @@ |
1392 | */ |
1393 | |
1394 | import QtQuick 2.0 |
1395 | -import Ubuntu.Components 0.1 |
1396 | +import Ubuntu.Components 1.1 |
1397 | |
1398 | Rectangle { |
1399 | anchors.fill: parent |
1400 | |
1401 | === modified file 'plugins/wifi/SectionMenuItem.qml' |
1402 | --- plugins/wifi/SectionMenuItem.qml 2013-09-18 19:41:37 +0000 |
1403 | +++ plugins/wifi/SectionMenuItem.qml 2014-09-19 14:54:39 +0000 |
1404 | @@ -18,8 +18,8 @@ |
1405 | */ |
1406 | |
1407 | import QtQuick 2.0 |
1408 | -import Ubuntu.Components 0.1 |
1409 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1410 | +import Ubuntu.Components 1.1 |
1411 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1412 | |
1413 | BaseMenuItem { |
1414 | id: menuItem |
1415 | |
1416 | === modified file 'plugins/wifi/StandardMenuItem.qml' |
1417 | --- plugins/wifi/StandardMenuItem.qml 2013-10-18 10:34:32 +0000 |
1418 | +++ plugins/wifi/StandardMenuItem.qml 2014-09-19 14:54:39 +0000 |
1419 | @@ -18,7 +18,7 @@ |
1420 | */ |
1421 | |
1422 | import QtQuick 2.0 |
1423 | -import Ubuntu.Components 0.1 |
1424 | +import Ubuntu.Components 1.1 |
1425 | |
1426 | FramedMenuItem { |
1427 | id: menuItem |
1428 | |
1429 | === modified file 'plugins/wifi/SwitchMenuItem.qml' |
1430 | --- plugins/wifi/SwitchMenuItem.qml 2013-10-18 10:33:28 +0000 |
1431 | +++ plugins/wifi/SwitchMenuItem.qml 2014-09-19 14:54:39 +0000 |
1432 | @@ -19,7 +19,7 @@ |
1433 | */ |
1434 | |
1435 | import QtQuick 2.0 |
1436 | -import Ubuntu.Components 0.1 |
1437 | +import Ubuntu.Components 1.1 |
1438 | |
1439 | FramedMenuItem { |
1440 | id: menuItem |
1441 | |
1442 | === modified file 'src/SystemSettings/ItemPage.qml' |
1443 | --- src/SystemSettings/ItemPage.qml 2013-07-30 14:09:08 +0000 |
1444 | +++ src/SystemSettings/ItemPage.qml 2014-09-19 14:54:39 +0000 |
1445 | @@ -19,7 +19,7 @@ |
1446 | */ |
1447 | |
1448 | import QtQuick 2.0 |
1449 | -import Ubuntu.Components 0.1 |
1450 | +import Ubuntu.Components 1.1 |
1451 | |
1452 | Page { |
1453 | id: root |
1454 | |
1455 | === modified file 'src/qml/CategoryGrid.qml' |
1456 | --- src/qml/CategoryGrid.qml 2014-09-11 10:46:01 +0000 |
1457 | +++ src/qml/CategoryGrid.qml 2014-09-19 14:54:39 +0000 |
1458 | @@ -1,6 +1,6 @@ |
1459 | import QtQuick 2.0 |
1460 | -import Ubuntu.Components 0.1 |
1461 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1462 | +import Ubuntu.Components 1.1 |
1463 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1464 | |
1465 | Column { |
1466 | anchors { |
1467 | |
1468 | === modified file 'src/qml/MainWindow.qml' |
1469 | --- src/qml/MainWindow.qml 2014-09-12 19:32:31 +0000 |
1470 | +++ src/qml/MainWindow.qml 2014-09-19 14:54:39 +0000 |
1471 | @@ -19,8 +19,8 @@ |
1472 | */ |
1473 | |
1474 | import QtQuick 2.0 |
1475 | -import Ubuntu.Components 0.1 |
1476 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1477 | +import Ubuntu.Components 1.1 |
1478 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1479 | import SystemSettings 1.0 |
1480 | |
1481 | MainView { |
1482 | |
1483 | === modified file 'src/qml/UncategorizedItemsView.qml' |
1484 | --- src/qml/UncategorizedItemsView.qml 2013-09-17 17:01:49 +0000 |
1485 | +++ src/qml/UncategorizedItemsView.qml 2014-09-19 14:54:39 +0000 |
1486 | @@ -19,8 +19,8 @@ |
1487 | */ |
1488 | |
1489 | import QtQuick 2.0 |
1490 | -import Ubuntu.Components 0.1 |
1491 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1492 | +import Ubuntu.Components 1.1 |
1493 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1494 | import SystemSettings 1.0 |
1495 | |
1496 | Column { |
1497 | |
1498 | === modified file 'wizard/qml/Components/InputMethod.qml' |
1499 | --- wizard/qml/Components/InputMethod.qml 2014-07-18 14:22:53 +0000 |
1500 | +++ wizard/qml/Components/InputMethod.qml 2014-09-19 14:54:39 +0000 |
1501 | @@ -16,7 +16,7 @@ |
1502 | |
1503 | import QtQuick 2.0 |
1504 | import Unity.Application 0.1 |
1505 | -import Ubuntu.Components 0.1 |
1506 | +import Ubuntu.Components 1.1 |
1507 | |
1508 | // TODO: try to share this code with that from the unity8 shell |
1509 | |
1510 | |
1511 | === modified file 'wizard/qml/Pages/10-welcome.qml' |
1512 | --- wizard/qml/Pages/10-welcome.qml 2014-08-29 19:46:45 +0000 |
1513 | +++ wizard/qml/Pages/10-welcome.qml 2014-09-19 14:54:39 +0000 |
1514 | @@ -16,7 +16,7 @@ |
1515 | |
1516 | import QtQuick 2.3 |
1517 | import Ubuntu.Components 1.1 |
1518 | -import Ubuntu.Components.ListItems 0.1 |
1519 | +import Ubuntu.Components.ListItems 1.0 |
1520 | import Ubuntu.SystemSettings.LanguagePlugin 1.0 |
1521 | import Ubuntu.SystemSettings.Wizard.Utils 0.1 |
1522 | import "../Components" as LocalComponents |
1523 | |
1524 | === modified file 'wizard/qml/Pages/15-passwd.qml' |
1525 | --- wizard/qml/Pages/15-passwd.qml 2014-08-27 17:31:12 +0000 |
1526 | +++ wizard/qml/Pages/15-passwd.qml 2014-09-19 14:54:39 +0000 |
1527 | @@ -17,7 +17,7 @@ |
1528 | import QtQuick 2.3 |
1529 | import MeeGo.QOfono 0.2 |
1530 | import Ubuntu.Components 1.1 |
1531 | -import Ubuntu.Components.ListItems 0.1 |
1532 | +import Ubuntu.Components.ListItems 1.0 |
1533 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
1534 | import "../Components" as LocalComponents |
1535 | |
1536 | |
1537 | === modified file 'wizard/qml/Pages/20-wifi.qml' |
1538 | --- wizard/qml/Pages/20-wifi.qml 2014-09-03 09:51:27 +0000 |
1539 | +++ wizard/qml/Pages/20-wifi.qml 2014-09-19 14:54:39 +0000 |
1540 | @@ -16,8 +16,8 @@ |
1541 | |
1542 | import QtQuick 2.0 |
1543 | import QMenuModel 0.1 as QMenuModel |
1544 | -import Ubuntu.Components 0.1 |
1545 | -import Ubuntu.Components.ListItems 0.1 as ListItem |
1546 | +import Ubuntu.Components 1.1 |
1547 | +import Ubuntu.Components.ListItems 1.0 as ListItem |
1548 | import Ubuntu.SystemSettings.Wizard.Utils 0.1 |
1549 | import Ubuntu.Settings.Menus 0.1 as Menus |
1550 | import "../Components" as LocalComponents |
1551 | |
1552 | === modified file 'wizard/qml/Pages/40-reporting.qml' |
1553 | --- wizard/qml/Pages/40-reporting.qml 2014-08-27 15:47:17 +0000 |
1554 | +++ wizard/qml/Pages/40-reporting.qml 2014-09-19 14:54:39 +0000 |
1555 | @@ -15,7 +15,7 @@ |
1556 | */ |
1557 | |
1558 | import QtQuick 2.0 |
1559 | -import Ubuntu.Components 0.1 |
1560 | +import Ubuntu.Components 1.1 |
1561 | import "../Components" as LocalComponents |
1562 | |
1563 | LocalComponents.Page { |
1564 | |
1565 | === modified file 'wizard/qml/Pages/80-finished.qml' |
1566 | --- wizard/qml/Pages/80-finished.qml 2014-08-27 15:47:17 +0000 |
1567 | +++ wizard/qml/Pages/80-finished.qml 2014-09-19 14:54:39 +0000 |
1568 | @@ -15,7 +15,7 @@ |
1569 | */ |
1570 | |
1571 | import QtQuick 2.0 |
1572 | -import Ubuntu.Components 0.1 |
1573 | +import Ubuntu.Components 1.1 |
1574 | import "../Components" as LocalComponents |
1575 | |
1576 | LocalComponents.Page { |
1577 | |
1578 | === modified file 'wizard/qml/Pages/no-sim.qml' |
1579 | --- wizard/qml/Pages/no-sim.qml 2014-08-26 21:19:55 +0000 |
1580 | +++ wizard/qml/Pages/no-sim.qml 2014-09-19 14:54:39 +0000 |
1581 | @@ -15,7 +15,7 @@ |
1582 | */ |
1583 | |
1584 | import QtQuick 2.0 |
1585 | -import Ubuntu.Components 0.1 |
1586 | +import Ubuntu.Components 1.1 |
1587 | import "../Components" as LocalComponents |
1588 | |
1589 | LocalComponents.Page { |
FAILED: Continuous integration, rev:1033 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- ci/1466/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/4770/ console jenkins. qa.ubuntu. com/job/ generic- mediumtests- utopic/ 3499 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- utopic- i386-ci/ 658 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/4538/ console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/6022 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/6022/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 13123 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-utopic/ 2898 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/3804 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/3804/ artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- system- settings- ci/1466/ rebuild
http://