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

[Kill Animals]

Updated library imports to qtquick-2.3

Updated library imports to qtquick-2.3

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:110
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/ubuntu-clock-app/update-imports-to-qtquick-2.3/+merge/235362/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-clock-app-ci/481/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/410
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/410/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/128

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/481/rebuild

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

lgtm! Nice work Akiva!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'app/components/Background.qml'
--- app/components/Background.qml	2014-07-17 12:21:45 +0000
+++ app/components/Background.qml	2014-09-20 10:48:09 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.3
 import Ubuntu.Components 1.1
 
 /*

=== modified file 'app/components/ClockCircle.qml'
--- app/components/ClockCircle.qml	2014-07-17 12:21:45 +0000
+++ app/components/ClockCircle.qml	2014-09-20 10:48:09 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.3
 import Ubuntu.Components 1.1
 import QtGraphicalEffects 1.0
 

=== modified file 'app/upstreamcomponents/FastScroll.qml'
--- app/upstreamcomponents/FastScroll.qml	2014-08-13 15:56:06 +0000
+++ app/upstreamcomponents/FastScroll.qml	2014-09-20 10:48:09 +0000
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 // FastScroll.qml
-import QtQuick 2.2
+import QtQuick 2.3
 import Ubuntu.Components 1.1
 import "FastScroll.js" as Sections
 

=== modified file 'app/upstreamcomponents/ListItemWithActions.qml'
--- app/upstreamcomponents/ListItemWithActions.qml	2014-08-10 17:11:14 +0000
+++ app/upstreamcomponents/ListItemWithActions.qml	2014-09-20 10:48:09 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.3
 import Ubuntu.Components 1.1
 
 Item {

=== modified file 'app/upstreamcomponents/ListItemWithActionsCheckBox.qml'
--- app/upstreamcomponents/ListItemWithActionsCheckBox.qml	2014-08-06 21:07:37 +0000
+++ app/upstreamcomponents/ListItemWithActionsCheckBox.qml	2014-09-20 10:48:09 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.3
 import Ubuntu.Components 1.1
 
 CheckBox {

=== modified file 'app/upstreamcomponents/MultipleSelectionListView.qml'
--- app/upstreamcomponents/MultipleSelectionListView.qml	2014-08-08 14:19:45 +0000
+++ app/upstreamcomponents/MultipleSelectionListView.qml	2014-09-20 10:48:09 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.3
 import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0 as Popups
 

=== modified file 'app/upstreamcomponents/MultipleSelectionVisualModel.qml'
--- app/upstreamcomponents/MultipleSelectionVisualModel.qml	2014-08-08 14:19:45 +0000
+++ app/upstreamcomponents/MultipleSelectionVisualModel.qml	2014-09-20 10:48:09 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.3
 
 VisualDataModel {
     id: contactVisualModel

=== modified file 'app/upstreamcomponents/PageWithBottomEdge.qml'
--- app/upstreamcomponents/PageWithBottomEdge.qml	2014-09-02 16:54:10 +0000
+++ app/upstreamcomponents/PageWithBottomEdge.qml	2014-09-20 10:48:09 +0000
@@ -62,7 +62,7 @@
 
 */
 
-import QtQuick 2.2
+import QtQuick 2.3
 import Ubuntu.Components 1.1
 
 Page {

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2014-09-18 06:16:08 +0000
+++ po/com.ubuntu.clock.pot	2014-09-20 10:48:09 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-18 08:09+0200\n"
+"POT-Creation-Date: 2014-09-20 02:34-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -37,7 +37,7 @@
 msgid "Label"
 msgstr ""
 
-#: ../app/alarm/AlarmList.qml:81 ../app/alarm/AlarmPage.qml:80
+#: ../app/alarm/AlarmList.qml:81 ../app/alarm/AlarmPage.qml:125
 #: ../app/worldclock/UserWorldCityList.qml:103
 msgid "Delete"
 msgstr ""
@@ -46,24 +46,28 @@
 msgid "Alarms"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:44 ../app/alarm/EditAlarmPage.qml:47
+#: ../app/alarm/AlarmPage.qml:45 ../app/alarm/EditAlarmPage.qml:47
 #: ../app/alarm/EditAlarmPage.qml:174
 msgid "Alarm"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:57
-msgid "Cancel selection"
-msgstr ""
-
-#: ../app/alarm/AlarmPage.qml:66 ../app/alarm/AlarmRepeat.qml:35
+#: ../app/alarm/AlarmPage.qml:75 ../app/worldclock/WorldCityList.qml:66
+msgid "Back"
+msgstr ""
+
+#: ../app/alarm/AlarmPage.qml:93
+msgid "Select None"
+msgstr ""
+
+#: ../app/alarm/AlarmPage.qml:95 ../app/alarm/AlarmRepeat.qml:35
 msgid "Select All"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:112
+#: ../app/alarm/AlarmPage.qml:154
 msgid "No saved alarms"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:113
+#: ../app/alarm/AlarmPage.qml:155
 msgid "Tap the + icon to add an alarm"
 msgstr ""
 
@@ -137,11 +141,11 @@
 msgid "Delete alarm"
 msgstr ""
 
-#: ../app/worldclock/AddWorldCityButton.qml:36
+#: ../app/worldclock/AddWorldCityButton.qml:30
 msgid "Add"
 msgstr ""
 
-#: ../app/worldclock/AddWorldCityButton.qml:62
+#: ../app/worldclock/AddWorldCityButton.qml:61
 #: ../app/worldclock/WorldCityList.qml:52
 msgid "City"
 msgstr ""
@@ -186,10 +190,6 @@
 msgid "Select a city"
 msgstr ""
 
-#: ../app/worldclock/WorldCityList.qml:66
-msgid "Back"
-msgstr ""
-
 #: ../app/worldclock/WorldCityList.qml:78
 msgid "Search..."
 msgstr ""