Ubuntu Calendar App

Merge lp:~renatofilho/ubuntu-calendar-app/sdk-1-3 into lp:ubuntu-calendar-app

  1. sdk-1-3
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Superseded
Proposed branch: lp:~renatofilho/ubuntu-calendar-app/sdk-1-3
Merge into: lp:ubuntu-calendar-app
Diff against target: 737 lines (+90/-94)
48 files modified
AgendaView.qml (+2/-2)
AllDayEventComponent.qml (+2/-2)
CalendarChoicePopup.qml (+2/-2)
CalendarListButtonDelegate.qml (+2/-2)
ColorPickerDialog.qml (+2/-2)
ContactChoicePopup.qml (+2/-2)
DayHeaderBackground.qml (+1/-1)
DayView.qml (+2/-2)
Defines.js (+2/-2)
DeleteConfirmationDialog.qml (+2/-2)
EditEventConfirmationDialog.qml (+2/-2)
EventActions.qml (+2/-2)
EventBubble.qml (+2/-2)
EventDetails.qml (+3/-3)
EventListModel.qml (+3/-3)
EventReminder.qml (+2/-2)
EventRepetition.qml (+2/-2)
EventUtils.qml (+2/-2)
HeaderDateComponent.qml (+2/-2)
KeyboardRectangle.qml (+1/-1)
LimitLabelModel.qml (+1/-1)
MonthComponent.qml (+2/-2)
MonthComponentDateDelegate.qml (+2/-2)
MonthView.qml (+2/-2)
NewEvent.qml (+2/-2)
NewEventEntryField.qml (+2/-2)
NewEventTimePicker.qml (+1/-1)
OnlineAccountsHelper.qml (+2/-2)
PathViewBase.qml (+1/-1)
RecurrenceLabelDefines.qml (+2/-2)
RemindersModel.qml (+1/-1)
ScrollAnimation.qml (+1/-1)
Scroller.qml (+2/-2)
Settings.qml (+2/-2)
SimpleDivider.qml (+1/-1)
TimeLineBackground.qml (+2/-2)
TimeLineBase.qml (+2/-2)
TimeLineBaseComponent.qml (+2/-3)
TimeLineHeader.qml (+3/-4)
TimeLineHeaderComponent.qml (+2/-2)
TimeLineTimeScale.qml (+2/-2)
TimeSeparator.qml (+1/-1)
ViewHeader.qml (+2/-2)
WeekView.qml (+2/-2)
YearView.qml (+2/-2)
YearViewDelegate.qml (+2/-2)
calendar.qml (+2/-4)
calendarTests.qml (+2/-2)
To merge this branch: bzr merge lp:~renatofilho/ubuntu-calendar-app/sdk-1-3
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Needs Fixing
Ubuntu Calendar Developers Pending
Review via email: mp+283804@code.launchpad.net

Commit message

Update to ubuntu sdk 1.3 and qtquick 2.4

Description of the change

Update to ubuntu sdk 1.3 and qtquick 2.4

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

FAILED: Continuous integration, rev:746
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/173/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/457/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/173/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:746
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/174/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/458/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/174/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:747
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/177/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/461/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/177/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:747
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/181/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/465/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/181/rebuild

review: Needs Fixing (continuous-integration)
lp:~renatofilho/ubuntu-calendar-app/sdk-1-3 updated
749. By Renato Araujo Oliveira Filho

Use new page header API.

750. By Renato Araujo Oliveira Filho

Put new event action back to the header.

751. By Renato Araujo Oliveira Filho

Remove extra component on MonthView header.

752. By Renato Araujo Oliveira Filho

Use hardcoded tab list to avoid problems when running on slow devices.

753. By Renato Araujo Oliveira Filho

Update autopilot tests to work with the new header API.

754. By Renato Araujo Oliveira Filho

Trunk merged.

755. By Renato Araujo Oliveira Filho

Hardcoded tabs actions to avoid problems with the SDK header.

756. By Renato Araujo Oliveira Filho

Removed missing function call.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AgendaView.qml'
2--- AgendaView.qml 2015-07-11 02:18:03 +0000
3+++ AgendaView.qml 2016-01-25 17:50:53 +0000
4@@ -16,9 +16,9 @@
5 * along with this program. If not, see <http://www.gnu.org/licenses/>.
6 */
7
8-import QtQuick 2.3
9+import QtQuick 2.4
10 import QtOrganizer 5.0
11-import Ubuntu.Components 1.1
12+import Ubuntu.Components 1.3
13 import Ubuntu.Components.ListItems 1.0 as ListItem
14 import "dateExt.js" as DateExt
15
16
17=== modified file 'AllDayEventComponent.qml'
18--- AllDayEventComponent.qml 2015-08-07 06:20:23 +0000
19+++ AllDayEventComponent.qml 2016-01-25 17:50:53 +0000
20@@ -15,8 +15,8 @@
21 * You should have received a copy of the GNU General Public License
22 * along with this program. If not, see <http://www.gnu.org/licenses/>.
23 */
24-import QtQuick 2.3
25-import Ubuntu.Components 1.1
26+import QtQuick 2.4
27+import Ubuntu.Components 1.3
28 import Ubuntu.Components.Popups 1.0
29 import QtOrganizer 5.0
30
31
32=== modified file 'CalendarChoicePopup.qml'
33--- CalendarChoicePopup.qml 2015-05-28 13:56:12 +0000
34+++ CalendarChoicePopup.qml 2016-01-25 17:50:53 +0000
35@@ -15,8 +15,8 @@
36 * You should have received a copy of the GNU General Public License
37 * along with this program. If not, see <http://www.gnu.org/licenses/>.
38 */
39-import QtQuick 2.3
40-import Ubuntu.Components 1.1
41+import QtQuick 2.4
42+import Ubuntu.Components 1.3
43 import Ubuntu.Components.Popups 1.0
44 import Ubuntu.Components.ListItems 1.0 as ListItem
45 import QtOrganizer 5.0
46
47=== modified file 'CalendarListButtonDelegate.qml'
48--- CalendarListButtonDelegate.qml 2015-05-28 13:58:30 +0000
49+++ CalendarListButtonDelegate.qml 2016-01-25 17:50:53 +0000
50@@ -14,8 +14,8 @@
51 * along with this program. If not, see <http://www.gnu.org/licenses/>.
52 */
53
54-import QtQuick 2.0
55-import Ubuntu.Components 1.1
56+import QtQuick 2.4
57+import Ubuntu.Components 1.3
58 import Ubuntu.Components.ListItems 1.0 as ListItem
59
60 ListItem.Standard {
61
62=== modified file 'ColorPickerDialog.qml'
63--- ColorPickerDialog.qml 2015-04-14 19:52:04 +0000
64+++ ColorPickerDialog.qml 2016-01-25 17:50:53 +0000
65@@ -15,8 +15,8 @@
66 * You should have received a copy of the GNU General Public License
67 * along with this program. If not, see <http://www.gnu.org/licenses/>.
68 */
69-import QtQuick 2.3
70-import Ubuntu.Components 1.1
71+import QtQuick 2.4
72+import Ubuntu.Components 1.3
73 import Ubuntu.Components.Popups 1.0
74
75 Dialog {
76
77=== modified file 'ContactChoicePopup.qml'
78--- ContactChoicePopup.qml 2015-05-14 03:36:22 +0000
79+++ ContactChoicePopup.qml 2016-01-25 17:50:53 +0000
80@@ -15,8 +15,8 @@
81 * You should have received a copy of the GNU General Public License
82 * along with this program. If not, see <http://www.gnu.org/licenses/>.
83 */
84-import QtQuick 2.3
85-import Ubuntu.Components 1.1
86+import QtQuick 2.4
87+import Ubuntu.Components 1.3
88 import Ubuntu.Components.Popups 1.0
89 import Ubuntu.Components.ListItems 1.0
90 import Ubuntu.Components.Themes.Ambiance 1.0
91
92=== modified file 'DayHeaderBackground.qml'
93--- DayHeaderBackground.qml 2014-09-20 10:45:35 +0000
94+++ DayHeaderBackground.qml 2016-01-25 17:50:53 +0000
95@@ -15,7 +15,7 @@
96 * You should have received a copy of the GNU General Public License
97 * along with this program. If not, see <http://www.gnu.org/licenses/>.
98 */
99-import QtQuick 2.3
100+import QtQuick 2.4
101
102 Item {
103 width: parent.width
104
105=== modified file 'DayView.qml'
106--- DayView.qml 2015-11-23 07:15:20 +0000
107+++ DayView.qml 2016-01-25 17:50:53 +0000
108@@ -16,8 +16,8 @@
109 * along with this program. If not, see <http://www.gnu.org/licenses/>.
110 */
111
112-import QtQuick 2.3
113-import Ubuntu.Components 1.1
114+import QtQuick 2.4
115+import Ubuntu.Components 1.3
116 import "dateExt.js" as DateExt
117 import "ViewType.js" as ViewType
118
119
120=== modified file 'Defines.js'
121--- Defines.js 2014-10-22 14:03:01 +0000
122+++ Defines.js 2016-01-25 17:50:53 +0000
123@@ -43,8 +43,8 @@
124
125 function getWeekLabels(){
126 var object = Qt.createQmlObject('\
127- import QtQuick 2.3;\
128- import Ubuntu.Components 1.1;\
129+ import QtQuick 2.4;\
130+ import Ubuntu.Components 1.3;\
131 QtObject {\
132 property var weekLabel:[Qt.locale().dayName(7,Locale.NarrowFormat),\
133 Qt.locale().dayName(1,Locale.NarrowFormat),\
134
135=== modified file 'DeleteConfirmationDialog.qml'
136--- DeleteConfirmationDialog.qml 2014-10-14 17:20:13 +0000
137+++ DeleteConfirmationDialog.qml 2016-01-25 17:50:53 +0000
138@@ -15,8 +15,8 @@
139 * You should have received a copy of the GNU General Public License
140 * along with this program. If not, see <http://www.gnu.org/licenses/>.
141 */
142-import QtQuick 2.3
143-import Ubuntu.Components 1.1
144+import QtQuick 2.4
145+import Ubuntu.Components 1.3
146 import Ubuntu.Components.Popups 1.0
147
148 Dialog {
149
150=== modified file 'EditEventConfirmationDialog.qml'
151--- EditEventConfirmationDialog.qml 2014-10-14 17:20:13 +0000
152+++ EditEventConfirmationDialog.qml 2016-01-25 17:50:53 +0000
153@@ -15,8 +15,8 @@
154 * You should have received a copy of the GNU General Public License
155 * along with this program. If not, see <http://www.gnu.org/licenses/>.
156 */
157-import QtQuick 2.3
158-import Ubuntu.Components 1.1
159+import QtQuick 2.4
160+import Ubuntu.Components 1.3
161 import Ubuntu.Components.Popups 1.0
162
163 Dialog {
164
165=== modified file 'EventActions.qml'
166--- EventActions.qml 2015-07-11 02:18:03 +0000
167+++ EventActions.qml 2016-01-25 17:50:53 +0000
168@@ -16,8 +16,8 @@
169 * along with this program. If not, see <http://www.gnu.org/licenses/>.
170 */
171
172-import QtQuick 2.3
173-import Ubuntu.Components 1.1
174+import QtQuick 2.4
175+import Ubuntu.Components 1.3
176 import Ubuntu.SyncMonitor 0.1
177
178 Item {
179
180=== modified file 'EventBubble.qml'
181--- EventBubble.qml 2015-11-29 03:17:30 +0000
182+++ EventBubble.qml 2016-01-25 17:50:53 +0000
183@@ -16,8 +16,8 @@
184 * along with this program. If not, see <http://www.gnu.org/licenses/>.
185 */
186
187-import QtQuick 2.3
188-import Ubuntu.Components 1.1
189+import QtQuick 2.4
190+import Ubuntu.Components 1.3
191 import QtOrganizer 5.0
192
193 Item{
194
195=== modified file 'EventDetails.qml'
196--- EventDetails.qml 2015-08-03 04:47:59 +0000
197+++ EventDetails.qml 2016-01-25 17:50:53 +0000
198@@ -15,8 +15,8 @@
199 * You should have received a copy of the GNU General Public License
200 * along with this program. If not, see <http://www.gnu.org/licenses/>.
201 */
202-import QtQuick 2.3
203-import Ubuntu.Components 1.1
204+import QtQuick 2.4
205+import Ubuntu.Components 1.3
206 import Ubuntu.Components.ListItems 1.0 as ListItem
207 import Ubuntu.Components.Themes.Ambiance 1.0
208 import Ubuntu.Components.Popups 1.0
209@@ -209,7 +209,7 @@
210 dialog.editEvent.connect( function(eventId){
211 if( eventId === event.parentId ) {
212 showEditEventPage(internal.parentEvent, model)
213- } else {
214+ } else {
215 showEditEventPage(event, model)
216 }
217 });
218
219=== modified file 'EventListModel.qml'
220--- EventListModel.qml 2015-08-24 05:08:46 +0000
221+++ EventListModel.qml 2016-01-25 17:50:53 +0000
222@@ -15,7 +15,7 @@
223 * You should have received a copy of the GNU General Public License
224 * along with this program. If not, see <http://www.gnu.org/licenses/>.
225 */
226-import QtQuick 2.3
227+import QtQuick 2.4
228 import QtOrganizer 5.0
229
230 OrganizerModel {
231@@ -41,7 +41,7 @@
232 }
233
234 function startLoadingTimer() {
235- var newObject = Qt.createQmlObject("import QtQuick 2.3; Timer {interval: 1000; running: true; repeat: false;}",
236+ var newObject = Qt.createQmlObject("import QtQuick 2.4; Timer {interval: 1000; running: true; repeat: false;}",
237 eventModel, "EventListMode.qml");
238 newObject.onTriggered.connect( function(){
239 var items = itemsByTimePeriod(eventModel.startPeriod, eventModel.endPeriod);
240@@ -73,7 +73,7 @@
241 }
242 }
243 return cals;
244- }
245+ }
246
247 function getWritableCollections(){
248 var cals = [];
249
250=== modified file 'EventReminder.qml'
251--- EventReminder.qml 2015-07-12 03:39:07 +0000
252+++ EventReminder.qml 2016-01-25 17:50:53 +0000
253@@ -16,8 +16,8 @@
254 * along with this program. If not, see <http://www.gnu.org/licenses/>.
255 */
256
257-import QtQuick 2.3
258-import Ubuntu.Components 1.1
259+import QtQuick 2.4
260+import Ubuntu.Components 1.3
261 import Ubuntu.Components.ListItems 1.0 as ListItem
262
263 Page{
264
265=== modified file 'EventRepetition.qml'
266--- EventRepetition.qml 2015-07-11 11:33:00 +0000
267+++ EventRepetition.qml 2016-01-25 17:50:53 +0000
268@@ -16,9 +16,9 @@
269 * along with this program. If not, see <http://www.gnu.org/licenses/>.
270 */
271
272-import QtQuick 2.3
273+import QtQuick 2.4
274 import QtOrganizer 5.0
275-import Ubuntu.Components 1.1
276+import Ubuntu.Components 1.3
277 import Ubuntu.Components.ListItems 1.0 as ListItem
278 import Ubuntu.Components.Pickers 1.0
279 import QtOrganizer 5.0
280
281=== modified file 'EventUtils.qml'
282--- EventUtils.qml 2014-10-04 04:37:34 +0000
283+++ EventUtils.qml 2016-01-25 17:50:53 +0000
284@@ -16,8 +16,8 @@
285 * along with this program. If not, see <http://www.gnu.org/licenses/>.
286 */
287
288-import QtQuick 2.3
289-import Ubuntu.Components 1.1
290+import QtQuick 2.4
291+import Ubuntu.Components 1.3
292 import QtOrganizer 5.0
293 import "Defines.js" as Defines
294 import "Recurrence.js" as Recurrence
295
296=== modified file 'HeaderDateComponent.qml'
297--- HeaderDateComponent.qml 2015-05-14 13:03:02 +0000
298+++ HeaderDateComponent.qml 2016-01-25 17:50:53 +0000
299@@ -16,8 +16,8 @@
300 * along with this program. If not, see <http://www.gnu.org/licenses/>.
301 */
302
303-import QtQuick 2.3
304-import Ubuntu.Components 1.1
305+import QtQuick 2.4
306+import Ubuntu.Components 1.3
307
308 Item {
309 id: root
310
311=== modified file 'KeyboardRectangle.qml'
312--- KeyboardRectangle.qml 2014-09-20 10:45:35 +0000
313+++ KeyboardRectangle.qml 2016-01-25 17:50:53 +0000
314@@ -16,7 +16,7 @@
315 * along with this program. If not, see <http://www.gnu.org/licenses/>.
316 */
317
318-import QtQuick 2.3
319+import QtQuick 2.4
320
321 Item {
322 id: keyboardRect
323
324=== modified file 'LimitLabelModel.qml'
325--- LimitLabelModel.qml 2014-10-22 17:32:15 +0000
326+++ LimitLabelModel.qml 2016-01-25 17:50:53 +0000
327@@ -15,7 +15,7 @@
328 * You should have received a copy of the GNU General Public License
329 * along with this program. If not, see <http://www.gnu.org/licenses/>.
330 */
331-import QtQuick 2.3;
332+import QtQuick 2.4
333
334 ListModel {
335 id:limitLables
336
337=== modified file 'MonthComponent.qml'
338--- MonthComponent.qml 2015-11-23 07:15:20 +0000
339+++ MonthComponent.qml 2016-01-25 17:50:53 +0000
340@@ -15,8 +15,8 @@
341 * You should have received a copy of the GNU General Public License
342 * along with this program. If not, see <http://www.gnu.org/licenses/>.
343 */
344-import QtQuick 2.3
345-import Ubuntu.Components 1.1
346+import QtQuick 2.4
347+import Ubuntu.Components 1.3
348 import "dateExt.js" as DateExt
349 import "colorUtils.js" as Color
350
351
352=== modified file 'MonthComponentDateDelegate.qml'
353--- MonthComponentDateDelegate.qml 2015-09-05 05:30:23 +0000
354+++ MonthComponentDateDelegate.qml 2016-01-25 17:50:53 +0000
355@@ -1,5 +1,5 @@
356-import QtQuick 2.0
357-import Ubuntu.Components 1.1
358+import QtQuick 2.4
359+import Ubuntu.Components 1.3
360
361 Item{
362 id: dateRootItem
363
364=== modified file 'MonthView.qml'
365--- MonthView.qml 2015-11-23 07:15:20 +0000
366+++ MonthView.qml 2016-01-25 17:50:53 +0000
367@@ -15,8 +15,8 @@
368 * You should have received a copy of the GNU General Public License
369 * along with this program. If not, see <http://www.gnu.org/licenses/>.
370 */
371-import QtQuick 2.3
372-import Ubuntu.Components 1.1
373+import QtQuick 2.4
374+import Ubuntu.Components 1.3
375 import "dateExt.js" as DateExt
376 import "colorUtils.js" as Color
377
378
379=== modified file 'NewEvent.qml'
380--- NewEvent.qml 2015-08-24 05:08:46 +0000
381+++ NewEvent.qml 2016-01-25 17:50:53 +0000
382@@ -16,9 +16,9 @@
383 * along with this program. If not, see <http://www.gnu.org/licenses/>.
384 */
385
386-import QtQuick 2.3
387+import QtQuick 2.4
388 import QtOrganizer 5.0
389-import Ubuntu.Components 1.1
390+import Ubuntu.Components 1.3
391 import Ubuntu.Components.Popups 1.0
392 import Ubuntu.Components.ListItems 1.0 as ListItem
393 import Ubuntu.Components.Themes.Ambiance 1.0
394
395=== modified file 'NewEventEntryField.qml'
396--- NewEventEntryField.qml 2015-02-17 05:53:42 +0000
397+++ NewEventEntryField.qml 2016-01-25 17:50:53 +0000
398@@ -16,8 +16,8 @@
399 * along with this program. If not, see <http://www.gnu.org/licenses/>.
400 */
401
402-import QtQuick 2.3
403-import Ubuntu.Components 1.1
404+import QtQuick 2.4
405+import Ubuntu.Components 1.3
406
407 Label {
408 id: root
409
410=== modified file 'NewEventTimePicker.qml'
411--- NewEventTimePicker.qml 2014-10-21 18:58:31 +0000
412+++ NewEventTimePicker.qml 2016-01-25 17:50:53 +0000
413@@ -1,4 +1,4 @@
414-import QtQuick 2.3
415+import QtQuick 2.4
416 import Ubuntu.Components.ListItems 1.0 as ListItem
417 import Ubuntu.Components.Themes.Ambiance 1.0
418 import Ubuntu.Components.Pickers 1.0
419
420=== modified file 'OnlineAccountsHelper.qml'
421--- OnlineAccountsHelper.qml 2015-03-28 11:31:47 +0000
422+++ OnlineAccountsHelper.qml 2016-01-25 17:50:53 +0000
423@@ -14,8 +14,8 @@
424 * along with this program. If not, see <http://www.gnu.org/licenses/>.
425 */
426
427-import QtQuick 2.2
428-import Ubuntu.Components 1.1
429+import QtQuick 2.4
430+import Ubuntu.Components 1.3
431 import Ubuntu.OnlineAccounts 0.1
432 import Ubuntu.OnlineAccounts.Client 0.1
433
434
435=== modified file 'PathViewBase.qml'
436--- PathViewBase.qml 2015-08-29 08:59:47 +0000
437+++ PathViewBase.qml 2016-01-25 17:50:53 +0000
438@@ -15,7 +15,7 @@
439 * You should have received a copy of the GNU General Public License
440 * along with this program. If not, see <http://www.gnu.org/licenses/>.
441 */
442-import QtQuick 2.3
443+import QtQuick 2.4
444
445 PathView {
446 id: root
447
448=== modified file 'RecurrenceLabelDefines.qml'
449--- RecurrenceLabelDefines.qml 2014-10-17 05:42:34 +0000
450+++ RecurrenceLabelDefines.qml 2016-01-25 17:50:53 +0000
451@@ -16,8 +16,8 @@
452 * along with this program. If not, see <http://www.gnu.org/licenses/>.
453 */
454
455-import QtQuick 2.3
456-import Ubuntu.Components 1.1
457+import QtQuick 2.4
458+import Ubuntu.Components 1.3
459
460 QtObject {
461 property var recurrenceLabel:[i18n.tr("Once"),
462
463=== modified file 'RemindersModel.qml'
464--- RemindersModel.qml 2014-10-17 05:42:34 +0000
465+++ RemindersModel.qml 2016-01-25 17:50:53 +0000
466@@ -16,7 +16,7 @@
467 * along with this program. If not, see <http://www.gnu.org/licenses/>.
468 */
469
470-import QtQuick 2.3
471+import QtQuick 2.4
472
473 ListModel {
474 id: reminderModel
475
476=== modified file 'ScrollAnimation.qml'
477--- ScrollAnimation.qml 2014-09-20 10:45:35 +0000
478+++ ScrollAnimation.qml 2016-01-25 17:50:53 +0000
479@@ -1,4 +1,4 @@
480-import QtQuick 2.3
481+import QtQuick 2.4
482
483 PropertyAnimation {
484 duration: 500
485
486=== modified file 'Scroller.qml'
487--- Scroller.qml 2014-09-20 10:45:35 +0000
488+++ Scroller.qml 2016-01-25 17:50:53 +0000
489@@ -16,8 +16,8 @@
490 * along with this program. If not, see <http://www.gnu.org/licenses/>.
491 */
492
493-import QtQuick 2.3
494-import Ubuntu.Components 1.1
495+import QtQuick 2.4
496+import Ubuntu.Components 1.3
497 import Ubuntu.Components.ListItems 1.0 as ListItems
498
499 Item {
500
501=== modified file 'Settings.qml'
502--- Settings.qml 2015-11-23 07:15:20 +0000
503+++ Settings.qml 2016-01-25 17:50:53 +0000
504@@ -15,8 +15,8 @@
505 * You should have received a copy of the GNU General Public License
506 * along with this program. If not, see <http://www.gnu.org/licenses/>.
507 */
508-import QtQuick 2.3
509-import Ubuntu.Components 1.1
510+import QtQuick 2.4
511+import Ubuntu.Components 1.3
512 import Ubuntu.Components.Popups 1.0
513 import Ubuntu.Components.ListItems 1.0 as ListItem
514
515
516=== modified file 'SimpleDivider.qml'
517--- SimpleDivider.qml 2014-12-11 20:29:27 +0000
518+++ SimpleDivider.qml 2016-01-25 17:50:53 +0000
519@@ -16,7 +16,7 @@
520 * along with this program. If not, see <http://www.gnu.org/licenses/>.
521 */
522
523-import QtQuick 2.0
524+import QtQuick 2.4
525
526 Rectangle{
527 height: units.gu(0.1)
528
529=== modified file 'TimeLineBackground.qml'
530--- TimeLineBackground.qml 2014-11-29 05:15:13 +0000
531+++ TimeLineBackground.qml 2016-01-25 17:50:53 +0000
532@@ -16,8 +16,8 @@
533 * along with this program. If not, see <http://www.gnu.org/licenses/>.
534 */
535
536-import QtQuick 2.3
537-import Ubuntu.Components 1.1
538+import QtQuick 2.4
539+import Ubuntu.Components 1.3
540
541 Column {
542 width: parent.width
543
544=== modified file 'TimeLineBase.qml'
545--- TimeLineBase.qml 2015-08-20 12:27:59 +0000
546+++ TimeLineBase.qml 2016-01-25 17:50:53 +0000
547@@ -15,8 +15,8 @@
548 * You should have received a copy of the GNU General Public License
549 * along with this program. If not, see <http://www.gnu.org/licenses/>.
550 */
551-import QtQuick 2.3
552-import Ubuntu.Components 1.1
553+import QtQuick 2.4
554+import Ubuntu.Components 1.3
555 import QtOrganizer 5.0
556
557 import "dateExt.js" as DateExt
558
559=== modified file 'TimeLineBaseComponent.qml'
560--- TimeLineBaseComponent.qml 2015-10-31 18:47:23 +0000
561+++ TimeLineBaseComponent.qml 2016-01-25 17:50:53 +0000
562@@ -16,9 +16,8 @@
563 * along with this program. If not, see <http://www.gnu.org/licenses/>.
564 */
565
566-import QtQuick 2.3
567-import QtQuick.Layouts 1.1
568-import Ubuntu.Components 1.1
569+import QtQuick 2.4
570+import Ubuntu.Components 1.3
571 import Ubuntu.Components.Popups 1.0
572 import QtOrganizer 5.0
573
574
575=== modified file 'TimeLineHeader.qml'
576--- TimeLineHeader.qml 2015-09-05 05:30:23 +0000
577+++ TimeLineHeader.qml 2016-01-25 17:50:53 +0000
578@@ -16,9 +16,8 @@
579 * along with this program. If not, see <http://www.gnu.org/licenses/>.
580 */
581
582-import QtQuick 2.0
583-import Ubuntu.Components 1.1
584-import QtQuick.Layouts 1.1
585+import QtQuick 2.4
586+import Ubuntu.Components 1.3
587
588 import "ViewType.js" as ViewType
589
590@@ -50,7 +49,7 @@
591 id: weekNumLabel
592 objectName: "weeknumber"
593
594- // TRANSLATORS: W refers to Week, followed by the actual week number (%1)
595+ // TRANSLATORS: W refers to Week, followed by the actual week number (%1)
596 text: i18n.tr("W%1").arg(startDay.weekNumber(Qt.locale().firstDayOfWeek))
597 fontSize: "small"
598 height: units.gu(5)
599
600=== modified file 'TimeLineHeaderComponent.qml'
601--- TimeLineHeaderComponent.qml 2015-09-05 05:30:23 +0000
602+++ TimeLineHeaderComponent.qml 2016-01-25 17:50:53 +0000
603@@ -16,8 +16,8 @@
604 * along with this program. If not, see <http://www.gnu.org/licenses/>.
605 */
606
607-import QtQuick 2.3
608-import Ubuntu.Components 1.1
609+import QtQuick 2.4
610+import Ubuntu.Components 1.3
611 import "dateExt.js" as DateExt
612 import "ViewType.js" as ViewType
613
614
615=== modified file 'TimeLineTimeScale.qml'
616--- TimeLineTimeScale.qml 2014-12-11 20:29:27 +0000
617+++ TimeLineTimeScale.qml 2016-01-25 17:50:53 +0000
618@@ -16,8 +16,8 @@
619 * along with this program. If not, see <http://www.gnu.org/licenses/>.
620 */
621
622-import QtQuick 2.0
623-import Ubuntu.Components 1.1
624+import QtQuick 2.4
625+import Ubuntu.Components 1.3
626
627 Flickable{
628 id: timeFlickble
629
630=== modified file 'TimeSeparator.qml'
631--- TimeSeparator.qml 2014-09-20 10:45:35 +0000
632+++ TimeSeparator.qml 2016-01-25 17:50:53 +0000
633@@ -15,7 +15,7 @@
634 * You should have received a copy of the GNU General Public License
635 * along with this program. If not, see <http://www.gnu.org/licenses/>.
636 */
637-import QtQuick 2.3
638+import QtQuick 2.4
639
640 Rectangle {
641 id: separator
642
643=== modified file 'ViewHeader.qml'
644--- ViewHeader.qml 2014-11-29 09:40:53 +0000
645+++ ViewHeader.qml 2016-01-25 17:50:53 +0000
646@@ -15,8 +15,8 @@
647 * You should have received a copy of the GNU General Public License
648 * along with this program. If not, see <http://www.gnu.org/licenses/>.
649 */
650-import QtQuick 2.3
651-import Ubuntu.Components 1.1
652+import QtQuick 2.4
653+import Ubuntu.Components 1.3
654
655 Item{
656 id: header
657
658=== modified file 'WeekView.qml'
659--- WeekView.qml 2015-10-28 02:12:50 +0000
660+++ WeekView.qml 2016-01-25 17:50:53 +0000
661@@ -16,8 +16,8 @@
662 * along with this program. If not, see <http://www.gnu.org/licenses/>.
663 */
664
665-import QtQuick 2.3
666-import Ubuntu.Components 1.1
667+import QtQuick 2.4
668+import Ubuntu.Components 1.3
669 import "dateExt.js" as DateExt
670 import "ViewType.js" as ViewType
671
672
673=== modified file 'YearView.qml'
674--- YearView.qml 2015-11-23 07:15:20 +0000
675+++ YearView.qml 2016-01-25 17:50:53 +0000
676@@ -16,8 +16,8 @@
677 * along with this program. If not, see <http://www.gnu.org/licenses/>.
678 */
679
680-import QtQuick 2.3
681-import Ubuntu.Components 1.1
682+import QtQuick 2.4
683+import Ubuntu.Components 1.3
684
685 import "dateExt.js" as DateExt
686 Page {
687
688=== modified file 'YearViewDelegate.qml'
689--- YearViewDelegate.qml 2015-11-23 07:15:20 +0000
690+++ YearViewDelegate.qml 2016-01-25 17:50:53 +0000
691@@ -1,5 +1,5 @@
692-import QtQuick 2.0
693-import Ubuntu.Components 1.1
694+import QtQuick 2.4
695+import Ubuntu.Components 1.3
696
697 GridView{
698 id: yearView
699
700=== modified file 'calendar.qml'
701--- calendar.qml 2015-11-23 07:15:20 +0000
702+++ calendar.qml 2016-01-25 17:50:53 +0000
703@@ -15,8 +15,8 @@
704 * You should have received a copy of the GNU General Public License
705 * along with this program. If not, see <http://www.gnu.org/licenses/>.
706 */
707-import QtQuick 2.3
708-import Ubuntu.Components 1.1
709+import QtQuick 2.4
710+import Ubuntu.Components 1.3
711 import Ubuntu.Components.Popups 1.0
712 import QtOrganizer 5.0
713 import Qt.labs.settings 1.0
714@@ -27,8 +27,6 @@
715
716 property bool displayWeekNumber: false;
717
718- useDeprecatedToolbar: false
719-
720 // Work-around until this branch lands:
721 // https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer/+merge/212496
722 //property bool windowActive: typeof window != 'undefined'
723
724=== modified file 'calendarTests.qml'
725--- calendarTests.qml 2014-09-20 10:45:35 +0000
726+++ calendarTests.qml 2016-01-25 17:50:53 +0000
727@@ -15,8 +15,8 @@
728 * You should have received a copy of the GNU General Public License
729 * along with this program. If not, see <http://www.gnu.org/licenses/>.
730 */
731-import QtQuick 2.3
732-import Ubuntu.Components 1.1
733+import QtQuick 2.4
734+import Ubuntu.Components 1.3
735
736 MainView {
737 width: units.gu(20)

Subscribers

People subscribed via source and target branches

to status/vote changes: