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

[Renato Araujo Oliveira Filho]

Update to ubuntu sdk 1.3 and qtquick 2.4

Update to ubuntu sdk 1.3 and qtquick 2.4

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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]

749. By Renato Araujo Oliveira Filho on 2016-01-29

Use new page header API.

750. By Renato Araujo Oliveira Filho on 2016-01-29

Put new event action back to the header.

751. By Renato Araujo Oliveira Filho on 2016-02-01

Remove extra component on MonthView header.

752. By Renato Araujo Oliveira Filho on 2016-02-01

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

753. By Renato Araujo Oliveira Filho on 2016-02-01

Update autopilot tests to work with the new header API.

754. By Renato Araujo Oliveira Filho on 2016-02-01

Trunk merged.

755. By Renato Araujo Oliveira Filho on 2016-02-02

Hardcoded tabs actions to avoid problems with the SDK header.

756. By Renato Araujo Oliveira Filho on 2016-02-02

Removed missing function call.

Unmerged revisions

=== modified file 'AgendaView.qml'
--- AgendaView.qml	2015-07-11 02:18:03 +0000
+++ AgendaView.qml	2016-01-25 17:50:53 +0000
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtOrganizer 5.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import "dateExt.js" as DateExt
 
 
=== modified file 'AllDayEventComponent.qml'
--- AllDayEventComponent.qml	2015-08-07 06:20:23 +0000
+++ AllDayEventComponent.qml	2016-01-25 17:50:53 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import QtOrganizer 5.0
 
 
=== modified file 'CalendarChoicePopup.qml'
--- CalendarChoicePopup.qml	2015-05-28 13:56:12 +0000
+++ CalendarChoicePopup.qml	2016-01-25 17:50:53 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import QtOrganizer 5.0
 
=== modified file 'CalendarListButtonDelegate.qml'
--- CalendarListButtonDelegate.qml	2015-05-28 13:58:30 +0000
+++ CalendarListButtonDelegate.qml	2016-01-25 17:50:53 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 ListItem.Standard {
 
=== modified file 'ColorPickerDialog.qml'
--- ColorPickerDialog.qml	2015-04-14 19:52:04 +0000
+++ ColorPickerDialog.qml	2016-01-25 17:50:53 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 
 Dialog {
 
=== modified file 'ContactChoicePopup.qml'
--- ContactChoicePopup.qml	2015-05-14 03:36:22 +0000
+++ ContactChoicePopup.qml	2016-01-25 17:50:53 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0
 import Ubuntu.Components.Themes.Ambiance 1.0
 
=== modified file 'DayHeaderBackground.qml'
--- DayHeaderBackground.qml	2014-09-20 10:45:35 +0000
+++ DayHeaderBackground.qml	2016-01-25 17:50:53 +0000
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
+import QtQuick 2.4
 
 Item {
     width: parent.width
 
=== modified file 'DayView.qml'
--- DayView.qml	2015-11-23 07:15:20 +0000
+++ DayView.qml	2016-01-25 17:50:53 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "ViewType.js" as ViewType
 
 
=== modified file 'Defines.js'
--- Defines.js	2014-10-22 14:03:01 +0000
+++ Defines.js	2016-01-25 17:50:53 +0000
@@ -43,8 +43,8 @@
 
 function getWeekLabels(){
     var object = Qt.createQmlObject('\
-        import QtQuick 2.3;\
-        import Ubuntu.Components 1.1;\
+        import QtQuick 2.4;\
+        import Ubuntu.Components 1.3;\
         QtObject {\
             property var weekLabel:[Qt.locale().dayName(7,Locale.NarrowFormat),\
                                     Qt.locale().dayName(1,Locale.NarrowFormat),\
 
=== modified file 'DeleteConfirmationDialog.qml'
--- DeleteConfirmationDialog.qml	2014-10-14 17:20:13 +0000
+++ DeleteConfirmationDialog.qml	2016-01-25 17:50:53 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 
 Dialog {
 
=== modified file 'EditEventConfirmationDialog.qml'
--- EditEventConfirmationDialog.qml	2014-10-14 17:20:13 +0000
+++ EditEventConfirmationDialog.qml	2016-01-25 17:50:53 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 
 Dialog {
 
=== modified file 'EventActions.qml'
--- EventActions.qml	2015-07-11 02:18:03 +0000
+++ EventActions.qml	2016-01-25 17:50:53 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.SyncMonitor 0.1
 
 Item {
 
=== modified file 'EventBubble.qml'
--- EventBubble.qml	2015-11-29 03:17:30 +0000
+++ EventBubble.qml	2016-01-25 17:50:53 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import QtOrganizer 5.0
 
 Item{
 
=== modified file 'EventDetails.qml'
--- EventDetails.qml	2015-08-03 04:47:59 +0000
+++ EventDetails.qml	2016-01-25 17:50:53 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Themes.Ambiance 1.0
 import Ubuntu.Components.Popups 1.0
@@ -209,7 +209,7 @@
                     dialog.editEvent.connect( function(eventId){
                         if( eventId === event.parentId ) {
                             showEditEventPage(internal.parentEvent, model)
-                        } else {                            
+                        } else {
                             showEditEventPage(event, model)
                         }
                     });
 
=== modified file 'EventListModel.qml'
--- EventListModel.qml	2015-08-24 05:08:46 +0000
+++ EventListModel.qml	2016-01-25 17:50:53 +0000
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
+import QtQuick 2.4
 import QtOrganizer 5.0
 
 OrganizerModel {
@@ -41,7 +41,7 @@
     }
 
     function startLoadingTimer() {
-        var newObject = Qt.createQmlObject("import QtQuick 2.3; Timer {interval: 1000; running: true; repeat: false;}",
+        var newObject = Qt.createQmlObject("import QtQuick 2.4; Timer {interval: 1000; running: true; repeat: false;}",
             eventModel, "EventListMode.qml");
         newObject.onTriggered.connect( function(){
             var items = itemsByTimePeriod(eventModel.startPeriod, eventModel.endPeriod);
@@ -73,7 +73,7 @@
             }
         }
         return cals;
-	}
+    }
 
     function getWritableCollections(){
         var cals = [];
 
=== modified file 'EventReminder.qml'
--- EventReminder.qml	2015-07-12 03:39:07 +0000
+++ EventReminder.qml	2016-01-25 17:50:53 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Page{
 
=== modified file 'EventRepetition.qml'
--- EventRepetition.qml	2015-07-11 11:33:00 +0000
+++ EventRepetition.qml	2016-01-25 17:50:53 +0000
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtOrganizer 5.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Pickers 1.0
 import QtOrganizer 5.0
 
=== modified file 'EventUtils.qml'
--- EventUtils.qml	2014-10-04 04:37:34 +0000
+++ EventUtils.qml	2016-01-25 17:50:53 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import QtOrganizer 5.0
 import "Defines.js" as Defines
 import "Recurrence.js" as Recurrence
 
=== modified file 'HeaderDateComponent.qml'
--- HeaderDateComponent.qml	2015-05-14 13:03:02 +0000
+++ HeaderDateComponent.qml	2016-01-25 17:50:53 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item {
     id: root
 
=== modified file 'KeyboardRectangle.qml'
--- KeyboardRectangle.qml	2014-09-20 10:45:35 +0000
+++ KeyboardRectangle.qml	2016-01-25 17:50:53 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 
 Item {
     id: keyboardRect
 
=== modified file 'LimitLabelModel.qml'
--- LimitLabelModel.qml	2014-10-22 17:32:15 +0000
+++ LimitLabelModel.qml	2016-01-25 17:50:53 +0000
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3;
+import QtQuick 2.4
 
 ListModel {
     id:limitLables
 
=== modified file 'MonthComponent.qml'
--- MonthComponent.qml	2015-11-23 07:15:20 +0000
+++ MonthComponent.qml	2016-01-25 17:50:53 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "colorUtils.js" as Color
 
 
=== modified file 'MonthComponentDateDelegate.qml'
--- MonthComponentDateDelegate.qml	2015-09-05 05:30:23 +0000
+++ MonthComponentDateDelegate.qml	2016-01-25 17:50:53 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item{
     id: dateRootItem
 
=== modified file 'MonthView.qml'
--- MonthView.qml	2015-11-23 07:15:20 +0000
+++ MonthView.qml	2016-01-25 17:50:53 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "colorUtils.js" as Color
 
 
=== modified file 'NewEvent.qml'
--- NewEvent.qml	2015-08-24 05:08:46 +0000
+++ NewEvent.qml	2016-01-25 17:50:53 +0000
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtOrganizer 5.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Themes.Ambiance 1.0
 
=== modified file 'NewEventEntryField.qml'
--- NewEventEntryField.qml	2015-02-17 05:53:42 +0000
+++ NewEventEntryField.qml	2016-01-25 17:50:53 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Label {
     id: root
 
=== modified file 'NewEventTimePicker.qml'
--- NewEventTimePicker.qml	2014-10-21 18:58:31 +0000
+++ NewEventTimePicker.qml	2016-01-25 17:50:53 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Themes.Ambiance 1.0
 import Ubuntu.Components.Pickers 1.0
 
=== modified file 'OnlineAccountsHelper.qml'
--- OnlineAccountsHelper.qml	2015-03-28 11:31:47 +0000
+++ OnlineAccountsHelper.qml	2016-01-25 17:50:53 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.OnlineAccounts 0.1
 import Ubuntu.OnlineAccounts.Client 0.1
 
 
=== modified file 'PathViewBase.qml'
--- PathViewBase.qml	2015-08-29 08:59:47 +0000
+++ PathViewBase.qml	2016-01-25 17:50:53 +0000
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
+import QtQuick 2.4
 
 PathView {
     id: root
 
=== modified file 'RecurrenceLabelDefines.qml'
--- RecurrenceLabelDefines.qml	2014-10-17 05:42:34 +0000
+++ RecurrenceLabelDefines.qml	2016-01-25 17:50:53 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 QtObject {
     property var recurrenceLabel:[i18n.tr("Once"),
 
=== modified file 'RemindersModel.qml'
--- RemindersModel.qml	2014-10-17 05:42:34 +0000
+++ RemindersModel.qml	2016-01-25 17:50:53 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 
 ListModel {
     id: reminderModel
 
=== modified file 'ScrollAnimation.qml'
--- ScrollAnimation.qml	2014-09-20 10:45:35 +0000
+++ ScrollAnimation.qml	2016-01-25 17:50:53 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.3
+import QtQuick 2.4
 
 PropertyAnimation {
     duration: 500
 
=== modified file 'Scroller.qml'
--- Scroller.qml	2014-09-20 10:45:35 +0000
+++ Scroller.qml	2016-01-25 17:50:53 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItems
 
 Item {
 
=== modified file 'Settings.qml'
--- Settings.qml	2015-11-23 07:15:20 +0000
+++ Settings.qml	2016-01-25 17:50:53 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 
=== modified file 'SimpleDivider.qml'
--- SimpleDivider.qml	2014-12-11 20:29:27 +0000
+++ SimpleDivider.qml	2016-01-25 17:50:53 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Rectangle{
      height: units.gu(0.1)
 
=== modified file 'TimeLineBackground.qml'
--- TimeLineBackground.qml	2014-11-29 05:15:13 +0000
+++ TimeLineBackground.qml	2016-01-25 17:50:53 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Column {
     width: parent.width
 
=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml	2015-08-20 12:27:59 +0000
+++ TimeLineBase.qml	2016-01-25 17:50:53 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import QtOrganizer 5.0
 
 import "dateExt.js" as DateExt
 
=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2015-10-31 18:47:23 +0000
+++ TimeLineBaseComponent.qml	2016-01-25 17:50:53 +0000
@@ -16,9 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import QtOrganizer 5.0
 
 
=== modified file 'TimeLineHeader.qml'
--- TimeLineHeader.qml	2015-09-05 05:30:23 +0000
+++ TimeLineHeader.qml	2016-01-25 17:50:53 +0000
@@ -16,9 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import QtQuick.Layouts 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 import "ViewType.js" as ViewType
 
@@ -50,7 +49,7 @@
                 id: weekNumLabel
                 objectName: "weeknumber"
 
-		        // TRANSLATORS: W refers to Week, followed by the actual week number (%1)
+                // TRANSLATORS: W refers to Week, followed by the actual week number (%1)
                 text: i18n.tr("W%1").arg(startDay.weekNumber(Qt.locale().firstDayOfWeek))
                 fontSize: "small"
                 height: units.gu(5)
 
=== modified file 'TimeLineHeaderComponent.qml'
--- TimeLineHeaderComponent.qml	2015-09-05 05:30:23 +0000
+++ TimeLineHeaderComponent.qml	2016-01-25 17:50:53 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "ViewType.js" as ViewType
 
 
=== modified file 'TimeLineTimeScale.qml'
--- TimeLineTimeScale.qml	2014-12-11 20:29:27 +0000
+++ TimeLineTimeScale.qml	2016-01-25 17:50:53 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Flickable{
     id: timeFlickble
 
=== modified file 'TimeSeparator.qml'
--- TimeSeparator.qml	2014-09-20 10:45:35 +0000
+++ TimeSeparator.qml	2016-01-25 17:50:53 +0000
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
+import QtQuick 2.4
 
 Rectangle {
     id: separator
 
=== modified file 'ViewHeader.qml'
--- ViewHeader.qml	2014-11-29 09:40:53 +0000
+++ ViewHeader.qml	2016-01-25 17:50:53 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item{
     id: header
 
=== modified file 'WeekView.qml'
--- WeekView.qml	2015-10-28 02:12:50 +0000
+++ WeekView.qml	2016-01-25 17:50:53 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "ViewType.js" as ViewType
 
 
=== modified file 'YearView.qml'
--- YearView.qml	2015-11-23 07:15:20 +0000
+++ YearView.qml	2016-01-25 17:50:53 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 import "dateExt.js" as DateExt
 Page {
 
=== modified file 'YearViewDelegate.qml'
--- YearViewDelegate.qml	2015-11-23 07:15:20 +0000
+++ YearViewDelegate.qml	2016-01-25 17:50:53 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 GridView{
     id: yearView
 
=== modified file 'calendar.qml'
--- calendar.qml	2015-11-23 07:15:20 +0000
+++ calendar.qml	2016-01-25 17:50:53 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import QtOrganizer 5.0
 import Qt.labs.settings 1.0
@@ -27,8 +27,6 @@
 
     property bool displayWeekNumber: false;
 
-    useDeprecatedToolbar: false
-
     // Work-around until this branch lands:
     // https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer/+merge/212496
     //property bool windowActive: typeof window != 'undefined'
 
=== modified file 'calendarTests.qml'
--- calendarTests.qml	2014-09-20 10:45:35 +0000
+++ calendarTests.qml	2016-01-25 17:50:53 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 MainView {
     width: units.gu(20)