Merge lp:~fboucault/camera-app/toolkit13 into lp:camera-app

Proposed by Florian Boucault
Status: Merged
Approved by: Florian Boucault
Approved revision: 591
Merged at revision: 586
Proposed branch: lp:~fboucault/camera-app/toolkit13
Merge into: lp:camera-app
Diff against target: 518 lines (+71/-71)
31 files modified
BottomEdgeIndicators.qml (+2/-2)
CircleButton.qml (+3/-3)
DeleteDialog.qml (+3/-3)
FocusRing.qml (+2/-2)
GalleryView.qml (+2/-2)
GalleryViewHeader.qml (+5/-5)
GalleryViewLoader.qml (+1/-1)
IconButton.qml (+2/-2)
NoSpaceHint.qml (+2/-2)
OptionButton.qml (+1/-1)
OptionValueButton.qml (+2/-2)
OptionsOverlay.qml (+2/-2)
PhotoEditorLoader.qml (+1/-1)
PhotoRollHint.qml (+2/-2)
PhotogridView.qml (+3/-3)
SharePopover.qml (+4/-4)
ShootButton.qml (+2/-2)
SlideshowView.qml (+5/-5)
Snapshot.qml (+3/-3)
StopWatch.qml (+3/-3)
ThinSliderStyle.qml (+2/-2)
ViewFinderExportConfirmation.qml (+2/-2)
ViewFinderGeometry.qml (+1/-1)
ViewFinderOverlay.qml (+4/-4)
ViewFinderOverlayLoader.qml (+1/-1)
ViewFinderView.qml (+3/-3)
ZoomControl.qml (+2/-2)
camera-app.qml (+3/-3)
tests/unittests/tst_BottomEdgeIndicators.qml (+1/-1)
tests/unittests/tst_StopWatch.qml (+1/-1)
tests/unittests/tst_ViewFinderGeometry.qml (+1/-1)
To merge this branch: bzr merge lp:~fboucault/camera-app/toolkit13
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+275325@code.launchpad.net

Commit message

Migrated to using Ubuntu UI Toolkit version 1.3 only.
Migrated to using QtQuick 2.4 and QtQuick.Window 2.2 only.

To post a comment you must log in.
lp:~fboucault/camera-app/toolkit13 updated
587. By Florian Boucault

Switched to QtQuick 2.4 and QtQuick.Window 2.2

588. By Florian Boucault

Switched to QtQuick 2.4 and QtQuick.Window 2.2

589. By Florian Boucault

Switched to QtQuick 2.4 and QtQuick.Window 2.2

590. By Florian Boucault

Tag bug

591. By Florian Boucault

Fixed used of Theme

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Florian Boucault (fboucault) wrote :

AP tests still pass.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'BottomEdgeIndicators.qml'
2--- BottomEdgeIndicators.qml 2015-03-11 20:03:21 +0000
3+++ BottomEdgeIndicators.qml 2015-10-22 12:46:40 +0000
4@@ -14,8 +14,8 @@
5 * along with this program. If not, see <http://www.gnu.org/licenses/>.
6 */
7
8-import QtQuick 2.2
9-import Ubuntu.Components 1.1
10+import QtQuick 2.4
11+import Ubuntu.Components 1.3
12
13 Item {
14 id: bottomEdgeIndicators
15
16=== modified file 'CircleButton.qml'
17--- CircleButton.qml 2015-07-03 10:32:14 +0000
18+++ CircleButton.qml 2015-10-22 12:46:40 +0000
19@@ -14,9 +14,9 @@
20 * along with this program. If not, see <http://www.gnu.org/licenses/>.
21 */
22
23-import QtQuick 2.2
24-import QtQuick.Window 2.0
25-import Ubuntu.Components 1.1
26+import QtQuick 2.4
27+import QtQuick.Window 2.2
28+import Ubuntu.Components 1.3
29
30 AbstractButton {
31 id: button
32
33=== modified file 'DeleteDialog.qml'
34--- DeleteDialog.qml 2014-11-20 22:02:12 +0000
35+++ DeleteDialog.qml 2015-10-22 12:46:40 +0000
36@@ -14,9 +14,9 @@
37 * along with this program. If not, see <http://www.gnu.org/licenses/>.
38 */
39
40-import QtQuick 2.2
41-import Ubuntu.Components 1.0
42-import Ubuntu.Components.Popups 1.0
43+import QtQuick 2.4
44+import Ubuntu.Components 1.3
45+import Ubuntu.Components.Popups 1.3
46
47 Dialog {
48 signal deleteFiles()
49
50=== modified file 'FocusRing.qml'
51--- FocusRing.qml 2014-08-26 23:46:49 +0000
52+++ FocusRing.qml 2015-10-22 12:46:40 +0000
53@@ -14,8 +14,8 @@
54 * along with this program. If not, see <http://www.gnu.org/licenses/>.
55 */
56
57-import QtQuick 2.2
58-import Ubuntu.Components 1.0
59+import QtQuick 2.4
60+import Ubuntu.Components 1.3
61
62 Image {
63 id: focusRing
64
65=== modified file 'GalleryView.qml'
66--- GalleryView.qml 2015-02-12 19:25:00 +0000
67+++ GalleryView.qml 2015-10-22 12:46:40 +0000
68@@ -14,8 +14,8 @@
69 * along with this program. If not, see <http://www.gnu.org/licenses/>.
70 */
71
72-import QtQuick 2.2
73-import Ubuntu.Components 1.1
74+import QtQuick 2.4
75+import Ubuntu.Components 1.3
76 import Ubuntu.Content 0.1
77 import CameraApp 0.1
78 import "MimeTypeMapper.js" as MimeTypeMapper
79
80=== modified file 'GalleryViewHeader.qml'
81--- GalleryViewHeader.qml 2015-06-10 12:42:46 +0000
82+++ GalleryViewHeader.qml 2015-10-22 12:46:40 +0000
83@@ -14,8 +14,8 @@
84 * along with this program. If not, see <http://www.gnu.org/licenses/>.
85 */
86
87-import QtQuick 2.2
88-import Ubuntu.Components 1.0
89+import QtQuick 2.4
90+import Ubuntu.Components 1.3
91 import QtQuick.Layouts 1.1
92
93 Item {
94@@ -70,7 +70,7 @@
95 }
96 width: units.gu(8)
97 iconName: "back"
98- iconColor: Theme.palette.normal.foregroundText
99+ iconColor: theme.palette.normal.foregroundText
100 onClicked: editMode ? header.exitEditor() : header.exit()
101 }
102
103@@ -78,7 +78,7 @@
104 text: main.contentExportMode || userSelectionMode ? i18n.tr("Select") :
105 (editMode ? i18n.tr("Edit Photo") : i18n.tr("Photo Roll"))
106 fontSize: "x-large"
107- color: Theme.palette.normal.foregroundText
108+ color: theme.palette.normal.foregroundText
109 elide: Text.ElideRight
110 Layout.fillWidth: true
111 }
112@@ -225,7 +225,7 @@
113 }
114 text: model.text
115 elide: Text.ElideRight
116- color: action.enabled ? Theme.palette.normal.foregroundText : Qt.darker(Theme.palette.normal.foregroundText, 2.0)
117+ color: action.enabled ? theme.palette.normal.foregroundText : Qt.darker(theme.palette.normal.foregroundText, 2.0)
118 }
119
120 Icon {
121
122=== modified file 'GalleryViewLoader.qml'
123--- GalleryViewLoader.qml 2015-01-24 12:52:12 +0000
124+++ GalleryViewLoader.qml 2015-10-22 12:46:40 +0000
125@@ -14,7 +14,7 @@
126 * along with this program. If not, see <http://www.gnu.org/licenses/>.
127 */
128
129-import QtQuick 2.2
130+import QtQuick 2.4
131
132 Loader {
133 id: loader
134
135=== modified file 'IconButton.qml'
136--- IconButton.qml 2014-11-24 17:34:33 +0000
137+++ IconButton.qml 2015-10-22 12:46:40 +0000
138@@ -14,8 +14,8 @@
139 * along with this program. If not, see <http://www.gnu.org/licenses/>.
140 */
141
142-import QtQuick 2.0
143-import Ubuntu.Components 1.0
144+import QtQuick 2.4
145+import Ubuntu.Components 1.3
146
147 AbstractButton {
148 id: button
149
150=== modified file 'NoSpaceHint.qml'
151--- NoSpaceHint.qml 2015-01-23 19:29:32 +0000
152+++ NoSpaceHint.qml 2015-10-22 12:46:40 +0000
153@@ -14,8 +14,8 @@
154 * along with this program. If not, see <http://www.gnu.org/licenses/>.
155 */
156
157-import QtQuick 2.2
158-import Ubuntu.Components 1.1
159+import QtQuick 2.4
160+import Ubuntu.Components 1.3
161
162 Item {
163 id: noSpaceHint
164
165=== modified file 'OptionButton.qml'
166--- OptionButton.qml 2015-07-03 10:32:14 +0000
167+++ OptionButton.qml 2015-10-22 12:46:40 +0000
168@@ -14,7 +14,7 @@
169 * along with this program. If not, see <http://www.gnu.org/licenses/>.
170 */
171
172-import QtQuick 2.2
173+import QtQuick 2.4
174
175 CircleButton {
176 id: optionButton
177
178=== modified file 'OptionValueButton.qml'
179--- OptionValueButton.qml 2015-01-27 15:22:59 +0000
180+++ OptionValueButton.qml 2015-10-22 12:46:40 +0000
181@@ -14,8 +14,8 @@
182 * along with this program. If not, see <http://www.gnu.org/licenses/>.
183 */
184
185-import QtQuick 2.0
186-import Ubuntu.Components 1.0
187+import QtQuick 2.4
188+import Ubuntu.Components 1.3
189
190 AbstractButton {
191 id: optionValueButton
192
193=== modified file 'OptionsOverlay.qml'
194--- OptionsOverlay.qml 2015-07-03 10:32:14 +0000
195+++ OptionsOverlay.qml 2015-10-22 12:46:40 +0000
196@@ -14,8 +14,8 @@
197 * along with this program. If not, see <http://www.gnu.org/licenses/>.
198 */
199
200-import QtQuick 2.2
201-import Ubuntu.Components 1.1
202+import QtQuick 2.4
203+import Ubuntu.Components 1.3
204
205 Item {
206 id: optionsOverlay
207
208=== modified file 'PhotoEditorLoader.qml'
209--- PhotoEditorLoader.qml 2015-02-11 15:14:12 +0000
210+++ PhotoEditorLoader.qml 2015-10-22 12:46:40 +0000
211@@ -14,7 +14,7 @@
212 * along with this program. If not, see <http://www.gnu.org/licenses/>.
213 */
214
215-import QtQuick 2.0
216+import QtQuick 2.4
217 import Ubuntu.Components.Extras 0.2
218
219 PhotoEditor {
220
221=== modified file 'PhotoRollHint.qml'
222--- PhotoRollHint.qml 2015-07-03 10:32:14 +0000
223+++ PhotoRollHint.qml 2015-10-22 12:46:40 +0000
224@@ -14,8 +14,8 @@
225 * along with this program. If not, see <http://www.gnu.org/licenses/>.
226 */
227
228-import QtQuick 2.2
229-import Ubuntu.Components 1.1
230+import QtQuick 2.4
231+import Ubuntu.Components 1.3
232 import Qt.labs.settings 1.0
233
234 Item {
235
236=== modified file 'PhotogridView.qml'
237--- PhotogridView.qml 2015-01-28 14:28:27 +0000
238+++ PhotogridView.qml 2015-10-22 12:46:40 +0000
239@@ -14,9 +14,9 @@
240 * along with this program. If not, see <http://www.gnu.org/licenses/>.
241 */
242
243-import QtQuick 2.2
244-import Ubuntu.Components 1.0
245-import Ubuntu.Components.Popups 1.0
246+import QtQuick 2.4
247+import Ubuntu.Components 1.3
248+import Ubuntu.Components.Popups 1.3
249 import Ubuntu.Thumbnailer 0.1
250 import Ubuntu.Content 0.1
251 import CameraApp 0.1
252
253=== modified file 'SharePopover.qml'
254--- SharePopover.qml 2014-11-12 18:41:54 +0000
255+++ SharePopover.qml 2015-10-22 12:46:40 +0000
256@@ -14,9 +14,9 @@
257 * along with this program. If not, see <http://www.gnu.org/licenses/>.
258 */
259
260-import QtQuick 2.2
261-import Ubuntu.Components 1.0
262-import Ubuntu.Components.Popups 1.0
263+import QtQuick 2.4
264+import Ubuntu.Components 1.3
265+import Ubuntu.Components.Popups 1.3
266 import Ubuntu.Content 0.1
267
268 PopupBase {
269@@ -34,7 +34,7 @@
270 // FIXME: ContentPeerPicker should either have a background or not, not half of one
271 Rectangle {
272 anchors.fill: parent
273- color: Theme.palette.normal.overlay
274+ color: theme.palette.normal.overlay
275 }
276
277 ContentPeerPicker {
278
279=== modified file 'ShootButton.qml'
280--- ShootButton.qml 2014-08-27 00:09:02 +0000
281+++ ShootButton.qml 2015-10-22 12:46:40 +0000
282@@ -14,8 +14,8 @@
283 * along with this program. If not, see <http://www.gnu.org/licenses/>.
284 */
285
286-import QtQuick 2.0
287-import Ubuntu.Components 1.0
288+import QtQuick 2.4
289+import Ubuntu.Components 1.3
290
291 Item {
292 id: shootButton
293
294=== modified file 'SlideshowView.qml'
295--- SlideshowView.qml 2015-02-18 18:04:35 +0000
296+++ SlideshowView.qml 2015-10-22 12:46:40 +0000
297@@ -14,10 +14,10 @@
298 * along with this program. If not, see <http://www.gnu.org/licenses/>.
299 */
300
301-import QtQuick 2.2
302-import Ubuntu.Components 1.0
303-import Ubuntu.Components.ListItems 1.0 as ListItems
304-import Ubuntu.Components.Popups 1.0
305+import QtQuick 2.4
306+import Ubuntu.Components 1.3
307+import Ubuntu.Components.ListItems 1.3 as ListItems
308+import Ubuntu.Components.Popups 1.3
309 import Ubuntu.Content 0.1
310 import Ubuntu.Thumbnailer 0.1
311 import CameraApp 0.1
312@@ -69,7 +69,7 @@
313 Component.onCompleted: {
314 // The PhotoEditor is only available in Ubuntu.Components.Extras 0.2
315 // If we succeed here we add the edit button to the list of actions.
316- try { Qt.createQmlObject('import QtQuick 2.0; import Ubuntu.Components.Extras 0.2; Item {}', slideshowView) }
317+ try { Qt.createQmlObject('import QtQuick 2.4; import Ubuntu.Components.Extras 0.2; Item {}', slideshowView) }
318 catch (e) { return; }
319
320 editingAvailable = true;
321
322=== modified file 'Snapshot.qml'
323--- Snapshot.qml 2015-07-03 10:32:14 +0000
324+++ Snapshot.qml 2015-10-22 12:46:40 +0000
325@@ -14,9 +14,9 @@
326 * along with this program. If not, see <http://www.gnu.org/licenses/>.
327 */
328
329-import QtQuick 2.2
330-import QtQuick.Window 2.0
331-import Ubuntu.Components 1.0
332+import QtQuick 2.4
333+import QtQuick.Window 2.2
334+import Ubuntu.Components 1.3
335
336 Item {
337 id: snapshotRoot
338
339=== modified file 'StopWatch.qml'
340--- StopWatch.qml 2014-12-09 11:32:51 +0000
341+++ StopWatch.qml 2015-10-22 12:46:40 +0000
342@@ -14,9 +14,9 @@
343 * along with this program. If not, see <http://www.gnu.org/licenses/>.
344 */
345
346-import QtQuick 2.2
347-import QtQuick.Window 2.0
348-import Ubuntu.Components 1.0
349+import QtQuick 2.4
350+import QtQuick.Window 2.2
351+import Ubuntu.Components 1.3
352
353 Item {
354 property int time: 0
355
356=== modified file 'ThinSliderStyle.qml'
357--- ThinSliderStyle.qml 2014-08-26 23:46:49 +0000
358+++ ThinSliderStyle.qml 2015-10-22 12:46:40 +0000
359@@ -14,8 +14,8 @@
360 * along with this program. If not, see <http://www.gnu.org/licenses/>.
361 */
362
363-import QtQuick 2.0
364-import Ubuntu.Components 1.0
365+import QtQuick 2.4
366+import Ubuntu.Components 1.3
367
368 /*
369 This delegate is styled using the following properties:
370
371=== modified file 'ViewFinderExportConfirmation.qml'
372--- ViewFinderExportConfirmation.qml 2014-08-27 00:44:55 +0000
373+++ ViewFinderExportConfirmation.qml 2015-10-22 12:46:40 +0000
374@@ -14,8 +14,8 @@
375 * along with this program. If not, see <http://www.gnu.org/licenses/>.
376 */
377
378-import QtQuick 2.2
379-import Ubuntu.Components 1.1
380+import QtQuick 2.4
381+import Ubuntu.Components 1.3
382
383 Item {
384 id: viewFinderExportConfirmation
385
386=== modified file 'ViewFinderGeometry.qml'
387--- ViewFinderGeometry.qml 2013-02-07 13:13:23 +0000
388+++ ViewFinderGeometry.qml 2015-10-22 12:46:40 +0000
389@@ -14,7 +14,7 @@
390 * along with this program. If not, see <http://www.gnu.org/licenses/>.
391 */
392
393-import QtQuick 2.0
394+import QtQuick 2.4
395
396 Item {
397 property size cameraResolution;
398
399=== modified file 'ViewFinderOverlay.qml'
400--- ViewFinderOverlay.qml 2015-10-02 19:51:31 +0000
401+++ ViewFinderOverlay.qml 2015-10-22 12:46:40 +0000
402@@ -14,10 +14,10 @@
403 * along with this program. If not, see <http://www.gnu.org/licenses/>.
404 */
405
406-import QtQuick 2.2
407-import QtQuick.Window 2.0
408-import Ubuntu.Components 1.1
409-import Ubuntu.Components.Popups 1.0
410+import QtQuick 2.4
411+import QtQuick.Window 2.2
412+import Ubuntu.Components 1.3
413+import Ubuntu.Components.Popups 1.3
414 import QtMultimedia 5.0
415 import QtPositioning 5.2
416 import QtSensors 5.0
417
418=== modified file 'ViewFinderOverlayLoader.qml'
419--- ViewFinderOverlayLoader.qml 2014-12-05 18:57:32 +0000
420+++ ViewFinderOverlayLoader.qml 2015-10-22 12:46:40 +0000
421@@ -14,7 +14,7 @@
422 * along with this program. If not, see <http://www.gnu.org/licenses/>.
423 */
424
425-import QtQuick 2.2
426+import QtQuick 2.4
427
428 Loader {
429 id: loader
430
431=== modified file 'ViewFinderView.qml'
432--- ViewFinderView.qml 2015-07-03 11:03:42 +0000
433+++ ViewFinderView.qml 2015-10-22 12:46:40 +0000
434@@ -14,9 +14,9 @@
435 * along with this program. If not, see <http://www.gnu.org/licenses/>.
436 */
437
438-import QtQuick 2.2
439-import QtQuick.Window 2.0
440-import Ubuntu.Components 1.1
441+import QtQuick 2.4
442+import QtQuick.Window 2.2
443+import Ubuntu.Components 1.3
444 import QtMultimedia 5.0
445 import CameraApp 0.1
446 import QtGraphicalEffects 1.0
447
448=== modified file 'ZoomControl.qml'
449--- ZoomControl.qml 2014-08-26 23:46:49 +0000
450+++ ZoomControl.qml 2015-10-22 12:46:40 +0000
451@@ -14,8 +14,8 @@
452 * along with this program. If not, see <http://www.gnu.org/licenses/>.
453 */
454
455-import QtQuick 2.0
456-import Ubuntu.Components 1.0
457+import QtQuick 2.4
458+import Ubuntu.Components 1.3
459
460 Item {
461 id: zoomControl
462
463=== modified file 'camera-app.qml'
464--- camera-app.qml 2015-07-03 10:32:14 +0000
465+++ camera-app.qml 2015-10-22 12:46:40 +0000
466@@ -14,10 +14,10 @@
467 * along with this program. If not, see <http://www.gnu.org/licenses/>.
468 */
469
470-import QtQuick 2.2
471-import QtQuick.Window 2.0
472+import QtQuick 2.4
473+import QtQuick.Window 2.2
474 import QtMultimedia 5.0
475-import Ubuntu.Components 1.0
476+import Ubuntu.Components 1.3
477 import Ubuntu.Unity.Action 1.1 as UnityActions
478 import UserMetrics 0.1
479 import Ubuntu.Content 0.1
480
481=== modified file 'tests/unittests/tst_BottomEdgeIndicators.qml'
482--- tests/unittests/tst_BottomEdgeIndicators.qml 2015-03-27 14:42:16 +0000
483+++ tests/unittests/tst_BottomEdgeIndicators.qml 2015-10-22 12:46:40 +0000
484@@ -15,7 +15,7 @@
485 *
486 */
487
488-import QtQuick 2.0
489+import QtQuick 2.4
490 import QtTest 1.0
491 import "../../"
492 import "../../.." //Needed for out of source build
493
494=== modified file 'tests/unittests/tst_StopWatch.qml'
495--- tests/unittests/tst_StopWatch.qml 2014-12-09 11:23:38 +0000
496+++ tests/unittests/tst_StopWatch.qml 2015-10-22 12:46:40 +0000
497@@ -15,7 +15,7 @@
498 *
499 */
500
501-import QtQuick 2.0
502+import QtQuick 2.4
503 import QtTest 1.0
504 import "../../"
505 import "../../.." //Needed for out of source build
506
507=== modified file 'tests/unittests/tst_ViewFinderGeometry.qml'
508--- tests/unittests/tst_ViewFinderGeometry.qml 2013-02-07 13:13:23 +0000
509+++ tests/unittests/tst_ViewFinderGeometry.qml 2015-10-22 12:46:40 +0000
510@@ -15,7 +15,7 @@
511 *
512 */
513
514-import QtQuick 2.0
515+import QtQuick 2.4
516 import QtTest 1.0
517 import "../../"
518 import "../../.." //Needed for out of source build

Subscribers

People subscribed via source and target branches