Ubuntu Notes app

Merge lp:~kill-animals/reminders-app/update-imports-to-qtquick-2.3 into lp:reminders-app

  1. update-imports-to-qtquick-2.3
  2. Merge into trunk
Proposed by Kill Animals
Status: Merged
Approved by: David Planella
Approved revision: 251
Merged at revision: 255
Proposed branch: lp:~kill-animals/reminders-app/update-imports-to-qtquick-2.3
Merge into: lp:reminders-app
Diff against target: 376 lines (+29/-29)
29 files modified
src/account-plugin/qml/evernote/Main.qml.in (+1/-1)
src/app/qml/components/NotebooksDelegate.qml (+1/-1)
src/app/qml/components/NotesDelegate.qml (+1/-1)
src/app/qml/components/PageWithBottomEdge.qml (+1/-1)
src/app/qml/components/PulldownListView.qml (+1/-1)
src/app/qml/components/RemindersDelegate.qml (+1/-1)
src/app/qml/components/ToolbarSpacer.qml (+1/-1)
src/app/qml/reminders.qml (+1/-1)
src/app/qml/ui/AccountSelectorPage.qml (+1/-1)
src/app/qml/ui/CameraComponents/CameraToolbar.qml (+1/-1)
src/app/qml/ui/CameraComponents/CameraToolbarButton.qml (+1/-1)
src/app/qml/ui/CameraComponents/CrossFadingButton.qml (+1/-1)
src/app/qml/ui/CameraComponents/FadingButton.qml (+1/-1)
src/app/qml/ui/CameraComponents/FlashButton.qml (+1/-1)
src/app/qml/ui/CameraComponents/ThinSliderStyle.qml (+1/-1)
src/app/qml/ui/CameraComponents/ViewFinderGeometry.qml (+1/-1)
src/app/qml/ui/CameraComponents/ZoomControl.qml (+1/-1)
src/app/qml/ui/CameraConfirm.qml (+1/-1)
src/app/qml/ui/CameraPage.qml (+1/-1)
src/app/qml/ui/EditNotePage.qml (+1/-1)
src/app/qml/ui/EditNoteView.qml (+1/-1)
src/app/qml/ui/NotePage.qml (+1/-1)
src/app/qml/ui/NoteView.qml (+1/-1)
src/app/qml/ui/NotebooksPage.qml (+1/-1)
src/app/qml/ui/NotesPage.qml (+1/-1)
src/app/qml/ui/RemindersPage.qml (+1/-1)
src/app/qml/ui/SearchNotesPage.qml (+1/-1)
src/app/qml/ui/SetReminderPage.qml (+1/-1)
src/app/qml/ui/SetReminderView.qml (+1/-1)
To merge this branch: bzr merge lp:~kill-animals/reminders-app/update-imports-to-qtquick-2.3
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
David Planella Approve
Review via email: mp+235368@code.launchpad.net

Commit message

Updated library imports to qtquick-2.3

Description of the change

Updated library imports to qtquick-2.3

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:251
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~akiva/reminders-app/update-imports-to-qtquick-2.3/+merge/235368/+edit-commit-message

http://91.189.93.70:8080/job/reminders-app-ci/518/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/417
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/417/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/214

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/518/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

Approving as a follow-up to the https://code.launchpad.net/~akiva/reminders-app/update-ubuntu-components-1.1/+merge/232970 MP

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/account-plugin/qml/evernote/Main.qml.in'
2--- src/account-plugin/qml/evernote/Main.qml.in 2014-07-01 13:27:32 +0000
3+++ src/account-plugin/qml/evernote/Main.qml.in 2014-09-20 10:53:05 +0000
4@@ -17,7 +17,7 @@
5 */
6
7 import Evernote 0.1
8-import QtQuick 2.0
9+import QtQuick 2.3
10 import Ubuntu.OnlineAccounts.Plugin 1.0
11
12 OAuthMain {
13
14=== modified file 'src/app/qml/components/NotebooksDelegate.qml'
15--- src/app/qml/components/NotebooksDelegate.qml 2014-09-04 15:31:12 +0000
16+++ src/app/qml/components/NotebooksDelegate.qml 2014-09-20 10:53:05 +0000
17@@ -16,7 +16,7 @@
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 */
20
21-import QtQuick 2.0
22+import QtQuick 2.3
23 import QtQuick.Layouts 1.0
24 import Ubuntu.Components 0.1
25 import Ubuntu.Components.ListItems 0.1
26
27=== modified file 'src/app/qml/components/NotesDelegate.qml'
28--- src/app/qml/components/NotesDelegate.qml 2014-05-09 15:02:17 +0000
29+++ src/app/qml/components/NotesDelegate.qml 2014-09-20 10:53:05 +0000
30@@ -16,7 +16,7 @@
31 * along with this program. If not, see <http://www.gnu.org/licenses/>.
32 */
33
34-import QtQuick 2.0
35+import QtQuick 2.3
36 import QtQuick.Layouts 1.0
37 import Ubuntu.Components 0.1
38 import Ubuntu.Components.ListItems 0.1
39
40=== modified file 'src/app/qml/components/PageWithBottomEdge.qml'
41--- src/app/qml/components/PageWithBottomEdge.qml 2014-08-17 10:25:59 +0000
42+++ src/app/qml/components/PageWithBottomEdge.qml 2014-09-20 10:53:05 +0000
43@@ -62,7 +62,7 @@
44
45 */
46
47-import QtQuick 2.0
48+import QtQuick 2.3
49 import Ubuntu.Components 0.1
50 import Evernote 0.1
51
52
53=== modified file 'src/app/qml/components/PulldownListView.qml'
54--- src/app/qml/components/PulldownListView.qml 2014-08-14 11:07:06 +0000
55+++ src/app/qml/components/PulldownListView.qml 2014-09-20 10:53:05 +0000
56@@ -16,7 +16,7 @@
57 * along with this program. If not, see <http://www.gnu.org/licenses/>.
58 */
59
60-import QtQuick 2.0
61+import QtQuick 2.3
62 import Ubuntu.Components 0.1
63
64 ListView {
65
66=== modified file 'src/app/qml/components/RemindersDelegate.qml'
67--- src/app/qml/components/RemindersDelegate.qml 2014-05-23 07:33:28 +0000
68+++ src/app/qml/components/RemindersDelegate.qml 2014-09-20 10:53:05 +0000
69@@ -16,7 +16,7 @@
70 * along with this program. If not, see <http://www.gnu.org/licenses/>.
71 */
72
73-import QtQuick 2.0
74+import QtQuick 2.3
75 import QtQuick.Layouts 1.0
76 import Ubuntu.Components 0.1
77 import Ubuntu.Components.ListItems 0.1
78
79=== modified file 'src/app/qml/components/ToolbarSpacer.qml'
80--- src/app/qml/components/ToolbarSpacer.qml 2014-01-27 13:00:41 +0000
81+++ src/app/qml/components/ToolbarSpacer.qml 2014-09-20 10:53:05 +0000
82@@ -16,7 +16,7 @@
83 * along with this program. If not, see <http://www.gnu.org/licenses/>.
84 */
85
86-import QtQuick 2.0
87+import QtQuick 2.3
88 import Ubuntu.Components 0.1
89 import Ubuntu.Components.Popups 0.1
90
91
92=== modified file 'src/app/qml/reminders.qml'
93--- src/app/qml/reminders.qml 2014-09-05 15:07:41 +0000
94+++ src/app/qml/reminders.qml 2014-09-20 10:53:05 +0000
95@@ -16,7 +16,7 @@
96 * along with this program. If not, see <http://www.gnu.org/licenses/>.
97 */
98
99-import QtQuick 2.0
100+import QtQuick 2.3
101 import Ubuntu.Components 0.1
102 import Ubuntu.Components.Popups 0.1
103 import Ubuntu.Components.ListItems 0.1
104
105=== modified file 'src/app/qml/ui/AccountSelectorPage.qml'
106--- src/app/qml/ui/AccountSelectorPage.qml 2014-08-14 17:17:05 +0000
107+++ src/app/qml/ui/AccountSelectorPage.qml 2014-09-20 10:53:05 +0000
108@@ -16,7 +16,7 @@
109 * along with this program. If not, see <http://www.gnu.org/licenses/>.
110 */
111
112-import QtQuick 2.0
113+import QtQuick 2.3
114 import Ubuntu.Components 0.1
115 import Ubuntu.Components.ListItems 0.1
116 import Ubuntu.OnlineAccounts 0.1
117
118=== modified file 'src/app/qml/ui/CameraComponents/CameraToolbar.qml'
119--- src/app/qml/ui/CameraComponents/CameraToolbar.qml 2014-02-25 15:07:24 +0000
120+++ src/app/qml/ui/CameraComponents/CameraToolbar.qml 2014-09-20 10:53:05 +0000
121@@ -14,7 +14,7 @@
122 * along with this program. If not, see <http://www.gnu.org/licenses/>.
123 */
124
125-import QtQuick 2.0
126+import QtQuick 2.3
127 import QtMultimedia 5.0
128 import Ubuntu.Components 0.1
129
130
131=== modified file 'src/app/qml/ui/CameraComponents/CameraToolbarButton.qml'
132--- src/app/qml/ui/CameraComponents/CameraToolbarButton.qml 2014-02-19 00:05:24 +0000
133+++ src/app/qml/ui/CameraComponents/CameraToolbarButton.qml 2014-09-20 10:53:05 +0000
134@@ -14,7 +14,7 @@
135 * along with this program. If not, see <http://www.gnu.org/licenses/>.
136 */
137
138-import QtQuick 2.0
139+import QtQuick 2.3
140 import Ubuntu.Components 0.1
141
142 AbstractButton {
143
144=== modified file 'src/app/qml/ui/CameraComponents/CrossFadingButton.qml'
145--- src/app/qml/ui/CameraComponents/CrossFadingButton.qml 2014-02-19 00:05:24 +0000
146+++ src/app/qml/ui/CameraComponents/CrossFadingButton.qml 2014-09-20 10:53:05 +0000
147@@ -14,7 +14,7 @@
148 * along with this program. If not, see <http://www.gnu.org/licenses/>.
149 */
150
151-import QtQuick 2.0
152+import QtQuick 2.3
153 import Ubuntu.Components 0.1
154 import "constants.js" as Const
155
156
157=== modified file 'src/app/qml/ui/CameraComponents/FadingButton.qml'
158--- src/app/qml/ui/CameraComponents/FadingButton.qml 2014-02-19 00:05:24 +0000
159+++ src/app/qml/ui/CameraComponents/FadingButton.qml 2014-09-20 10:53:05 +0000
160@@ -14,7 +14,7 @@
161 * along with this program. If not, see <http://www.gnu.org/licenses/>.
162 */
163
164-import QtQuick 2.0
165+import QtQuick 2.3
166 import Ubuntu.Components 0.1
167 import "constants.js" as Const
168
169
170=== modified file 'src/app/qml/ui/CameraComponents/FlashButton.qml'
171--- src/app/qml/ui/CameraComponents/FlashButton.qml 2014-02-25 14:48:56 +0000
172+++ src/app/qml/ui/CameraComponents/FlashButton.qml 2014-09-20 10:53:05 +0000
173@@ -14,7 +14,7 @@
174 * along with this program. If not, see <http://www.gnu.org/licenses/>.
175 */
176
177-import QtQuick 2.0
178+import QtQuick 2.3
179 import "constants.js" as Const
180
181 Item {
182
183=== modified file 'src/app/qml/ui/CameraComponents/ThinSliderStyle.qml'
184--- src/app/qml/ui/CameraComponents/ThinSliderStyle.qml 2014-02-19 00:05:24 +0000
185+++ src/app/qml/ui/CameraComponents/ThinSliderStyle.qml 2014-09-20 10:53:05 +0000
186@@ -14,7 +14,7 @@
187 * along with this program. If not, see <http://www.gnu.org/licenses/>.
188 */
189
190-import QtQuick 2.0
191+import QtQuick 2.3
192 import Ubuntu.Components 0.1
193
194 /*
195
196=== modified file 'src/app/qml/ui/CameraComponents/ViewFinderGeometry.qml'
197--- src/app/qml/ui/CameraComponents/ViewFinderGeometry.qml 2014-02-19 00:05:24 +0000
198+++ src/app/qml/ui/CameraComponents/ViewFinderGeometry.qml 2014-09-20 10:53:05 +0000
199@@ -14,7 +14,7 @@
200 * along with this program. If not, see <http://www.gnu.org/licenses/>.
201 */
202
203-import QtQuick 2.0
204+import QtQuick 2.3
205
206 Item {
207 property size cameraResolution;
208
209=== modified file 'src/app/qml/ui/CameraComponents/ZoomControl.qml'
210--- src/app/qml/ui/CameraComponents/ZoomControl.qml 2014-02-25 15:07:24 +0000
211+++ src/app/qml/ui/CameraComponents/ZoomControl.qml 2014-09-20 10:53:05 +0000
212@@ -14,7 +14,7 @@
213 * along with this program. If not, see <http://www.gnu.org/licenses/>.
214 */
215
216-import QtQuick 2.0
217+import QtQuick 2.3
218 import Ubuntu.Components 0.1
219
220 Item {
221
222=== modified file 'src/app/qml/ui/CameraConfirm.qml'
223--- src/app/qml/ui/CameraConfirm.qml 2014-07-23 21:00:14 +0000
224+++ src/app/qml/ui/CameraConfirm.qml 2014-09-20 10:53:05 +0000
225@@ -16,7 +16,7 @@
226 * along with this program. If not, see <http://www.gnu.org/licenses/>.
227 */
228
229-import QtQuick 2.0
230+import QtQuick 2.3
231 import Ubuntu.Components 0.1
232 import Evernote 0.1
233
234
235=== modified file 'src/app/qml/ui/CameraPage.qml'
236--- src/app/qml/ui/CameraPage.qml 2014-07-25 06:27:18 +0000
237+++ src/app/qml/ui/CameraPage.qml 2014-09-20 10:53:05 +0000
238@@ -16,7 +16,7 @@
239 * along with this program. If not, see <http://www.gnu.org/licenses/>.
240 */
241
242-import QtQuick 2.0
243+import QtQuick 2.3
244 import Ubuntu.Components 0.1
245 import QtMultimedia 5.0
246 import QtQuick.Window 2.0
247
248=== modified file 'src/app/qml/ui/EditNotePage.qml'
249--- src/app/qml/ui/EditNotePage.qml 2014-09-03 16:10:56 +0000
250+++ src/app/qml/ui/EditNotePage.qml 2014-09-20 10:53:05 +0000
251@@ -16,7 +16,7 @@
252 * along with this program. If not, see <http://www.gnu.org/licenses/>.
253 */
254
255-import QtQuick 2.0
256+import QtQuick 2.3
257 import Ubuntu.Components 0.1
258 import Ubuntu.Components.ListItems 0.1
259 import Evernote 0.1
260
261=== modified file 'src/app/qml/ui/EditNoteView.qml'
262--- src/app/qml/ui/EditNoteView.qml 2014-08-16 13:08:32 +0000
263+++ src/app/qml/ui/EditNoteView.qml 2014-09-20 10:53:05 +0000
264@@ -16,7 +16,7 @@
265 * along with this program. If not, see <http://www.gnu.org/licenses/>.
266 */
267
268-import QtQuick 2.0
269+import QtQuick 2.3
270 import Ubuntu.Components 0.1
271 import Ubuntu.Components.ListItems 0.1
272 import Ubuntu.Content 0.1
273
274=== modified file 'src/app/qml/ui/NotePage.qml'
275--- src/app/qml/ui/NotePage.qml 2014-06-13 10:35:47 +0000
276+++ src/app/qml/ui/NotePage.qml 2014-09-20 10:53:05 +0000
277@@ -16,7 +16,7 @@
278 * along with this program. If not, see <http://www.gnu.org/licenses/>.
279 */
280
281-import QtQuick 2.0
282+import QtQuick 2.3
283 import Ubuntu.Components 0.1
284 import Evernote 0.1
285 import "../components"
286
287=== modified file 'src/app/qml/ui/NoteView.qml'
288--- src/app/qml/ui/NoteView.qml 2014-07-14 15:44:31 +0000
289+++ src/app/qml/ui/NoteView.qml 2014-09-20 10:53:05 +0000
290@@ -16,7 +16,7 @@
291 * along with this program. If not, see <http://www.gnu.org/licenses/>.
292 */
293
294-import QtQuick 2.0
295+import QtQuick 2.3
296 import Ubuntu.Components 0.1
297 import com.canonical.Oxide 1.0
298 import Evernote 0.1
299
300=== modified file 'src/app/qml/ui/NotebooksPage.qml'
301--- src/app/qml/ui/NotebooksPage.qml 2014-08-14 10:23:35 +0000
302+++ src/app/qml/ui/NotebooksPage.qml 2014-09-20 10:53:05 +0000
303@@ -16,7 +16,7 @@
304 * along with this program. If not, see <http://www.gnu.org/licenses/>.
305 */
306
307-import QtQuick 2.0
308+import QtQuick 2.3
309 import Ubuntu.Components 0.1
310 import Ubuntu.Components.ListItems 0.1
311 import Evernote 0.1
312
313=== modified file 'src/app/qml/ui/NotesPage.qml'
314--- src/app/qml/ui/NotesPage.qml 2014-08-17 10:35:05 +0000
315+++ src/app/qml/ui/NotesPage.qml 2014-09-20 10:53:05 +0000
316@@ -16,7 +16,7 @@
317 * along with this program. If not, see <http://www.gnu.org/licenses/>.
318 */
319
320-import QtQuick 2.0
321+import QtQuick 2.3
322 import QtQuick.Layouts 1.0
323 import Ubuntu.Components 0.1
324 import Ubuntu.Components.ListItems 0.1
325
326=== modified file 'src/app/qml/ui/RemindersPage.qml'
327--- src/app/qml/ui/RemindersPage.qml 2014-08-17 16:52:47 +0000
328+++ src/app/qml/ui/RemindersPage.qml 2014-09-20 10:53:05 +0000
329@@ -16,7 +16,7 @@
330 * along with this program. If not, see <http://www.gnu.org/licenses/>.
331 */
332
333-import QtQuick 2.0
334+import QtQuick 2.3
335 import QtQuick.Layouts 1.0
336 import Ubuntu.Components 0.1
337 import Ubuntu.Components.ListItems 0.1
338
339=== modified file 'src/app/qml/ui/SearchNotesPage.qml'
340--- src/app/qml/ui/SearchNotesPage.qml 2014-08-14 15:20:04 +0000
341+++ src/app/qml/ui/SearchNotesPage.qml 2014-09-20 10:53:05 +0000
342@@ -16,7 +16,7 @@
343 * along with this program. If not, see <http://www.gnu.org/licenses/>.
344 */
345
346-import QtQuick 2.0
347+import QtQuick 2.3
348 import Ubuntu.Components 0.1
349 import Ubuntu.Components.ListItems 0.1
350 import Evernote 0.1
351
352=== modified file 'src/app/qml/ui/SetReminderPage.qml'
353--- src/app/qml/ui/SetReminderPage.qml 2014-05-08 16:33:21 +0000
354+++ src/app/qml/ui/SetReminderPage.qml 2014-09-20 10:53:05 +0000
355@@ -16,7 +16,7 @@
356 * along with this program. If not, see <http://www.gnu.org/licenses/>.
357 */
358
359-import QtQuick 2.0
360+import QtQuick 2.3
361 import Ubuntu.Components 0.1
362 import Evernote 0.1
363 import "../components"
364
365=== modified file 'src/app/qml/ui/SetReminderView.qml'
366--- src/app/qml/ui/SetReminderView.qml 2014-05-07 19:11:05 +0000
367+++ src/app/qml/ui/SetReminderView.qml 2014-09-20 10:53:05 +0000
368@@ -16,7 +16,7 @@
369 * along with this program. If not, see <http://www.gnu.org/licenses/>.
370 */
371
372-import QtQuick 2.0
373+import QtQuick 2.3
374 import QtQuick.Layouts 1.0
375 import Ubuntu.Components 0.1
376 import Ubuntu.Components.Pickers 0.1

Subscribers

People subscribed via source and target branches