ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #02406
[Merge] lp:~nik90/ubuntu-clock-app/migrate-to-15.04-framework into lp:ubuntu-clock-app
Nekhelesh Ramananthan has proposed merging lp:~nik90/ubuntu-clock-app/migrate-to-15.04-framework into lp:ubuntu-clock-app.
Commit message:
Migrate to ubuntu-sdk-15.04 framework and QtQuick 2.4
Requested reviews:
Ubuntu Clock Developers (ubuntu-clock-dev)
For more details, see:
https://code.launchpad.net/~nik90/ubuntu-clock-app/migrate-to-15.04-framework/+merge/260336
This MP implements the following,
- Migrate to the ubuntu-sdk-15.04 framework
- Migrate to QtQuick 2.4
This restricts clock app updates to the store until OTA-4 is shipped.
--
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~nik90/ubuntu-clock-app/migrate-to-15.04-framework into lp:ubuntu-clock-app.
=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml 2015-01-22 00:11:57 +0000
+++ app/alarm/AlarmDelegate.qml 2015-05-27 16:09:52 +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.2
import "../upstreamcomponents"
ListItemWithActions {
=== modified file 'app/alarm/AlarmLabel.qml'
--- app/alarm/AlarmLabel.qml 2014-09-21 13:20:37 +0000
+++ app/alarm/AlarmLabel.qml 2015-05-27 16:09:52 +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.2
Page {
id: _alarmLabelPage
=== modified file 'app/alarm/AlarmList.qml'
--- app/alarm/AlarmList.qml 2015-03-06 17:11:42 +0000
+++ app/alarm/AlarmList.qml 2015-05-27 16:09:52 +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.2
import Ubuntu.Components.ListItems 1.0 as ListItem
import "../components"
import "../upstreamcomponents"
=== modified file 'app/alarm/AlarmModelComponent.qml'
--- app/alarm/AlarmModelComponent.qml 2014-10-10 19:58:31 +0000
+++ app/alarm/AlarmModelComponent.qml 2015-05-27 16:09:52 +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.2
AlarmModel {
id: alarmModel
=== modified file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml 2015-04-14 11:57:10 +0000
+++ app/alarm/AlarmPage.qml 2015-05-27 16:09:52 +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.2
import "../components"
Page {
=== modified file 'app/alarm/AlarmRepeat.qml'
--- app/alarm/AlarmRepeat.qml 2015-02-22 04:33:04 +0000
+++ app/alarm/AlarmRepeat.qml 2015-05-27 16:09:52 +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.2
import Ubuntu.Components.ListItems 1.0 as ListItem
Page {
=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml 2015-03-13 16:55:52 +0000
+++ app/alarm/AlarmSettingsPage.qml 2015-05-27 16:09:52 +0000
@@ -16,10 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-import QtQuick 2.3
+import QtQuick 2.4
import DateTime 1.0
import Alarm.Settings 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
import Ubuntu.Components.ListItems 1.0 as ListItem
import "../components"
=== modified file 'app/alarm/AlarmSound.qml'
--- app/alarm/AlarmSound.qml 2015-03-06 01:09:21 +0000
+++ app/alarm/AlarmSound.qml 2015-05-27 16:09:52 +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 QtMultimedia 5.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
import Ubuntu.Components.ListItems 1.0 as ListItem
Page {
=== modified file 'app/alarm/AlarmUtils.qml'
--- app/alarm/AlarmUtils.qml 2014-11-17 16:11:18 +0000
+++ app/alarm/AlarmUtils.qml 2015-05-27 16:09:52 +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.2
/*
Qt Object containing a collection of useful alarm functions
=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml 2015-03-06 17:11:42 +0000
+++ app/alarm/EditAlarmPage.qml 2015-05-27 16:09:52 +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 DateTime 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
import Qt.labs.folderlistmodel 2.1
import Ubuntu.Components.Pickers 1.0
import Ubuntu.Components.ListItems 1.0 as ListItem
=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml 2015-05-15 16:38:24 +0000
+++ app/clock/ClockPage.qml 2015-05-27 16:09:52 +0000
@@ -16,10 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-import QtQuick 2.3
+import QtQuick 2.4
import U1db 1.0 as U1db
import QtPositioning 5.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
import GeoLocation 1.0
import "../alarm"
import "../components"
=== modified file 'app/clock/MainClock.qml'
--- app/clock/MainClock.qml 2015-01-22 00:11:57 +0000
+++ app/clock/MainClock.qml 2015-05-27 16:09:52 +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.2
import "../components"
Clock {
=== modified file 'app/components/AnalogMode.qml'
--- app/components/AnalogMode.qml 2014-10-10 19:58:49 +0000
+++ app/components/AnalogMode.qml 2015-05-27 16:09:52 +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.2
ClockCircle {
id: _innerCircleAnalog
=== modified file 'app/components/AnalogShadow.qml'
--- app/components/AnalogShadow.qml 2014-09-06 15:16:43 +0000
+++ app/components/AnalogShadow.qml 2015-05-27 16:09:52 +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.2
Flipable {
id: analogShadow
=== modified file 'app/components/Background.qml'
--- app/components/Background.qml 2014-10-10 23:00:40 +0000
+++ app/components/Background.qml 2015-05-27 16:09:52 +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.2
/*
Component to set the background of the app
=== modified file 'app/components/Clock.qml'
--- app/components/Clock.qml 2014-10-03 11:40:54 +0000
+++ app/components/Clock.qml 2015-05-27 16:09:52 +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.2
/*
Generic clock component which has a digital and analog mode. A flip animation
=== modified file 'app/components/ClockCircle.qml'
--- app/components/ClockCircle.qml 2014-10-16 21:31:16 +0000
+++ app/components/ClockCircle.qml 2015-05-27 16:09:52 +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.2
import QtGraphicalEffects 1.0
/*
=== modified file 'app/components/DigitalMode.qml'
--- app/components/DigitalMode.qml 2015-05-26 10:09:24 +0000
+++ app/components/DigitalMode.qml 2015-05-27 16:09:52 +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.2
ClockCircle {
id: _innerCircle
=== modified file 'app/components/DigitalShadow.qml'
--- app/components/DigitalShadow.qml 2014-09-06 15:16:43 +0000
+++ app/components/DigitalShadow.qml 2015-05-27 16:09:52 +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.2
Flipable {
id: digitalShadow
=== modified file 'app/components/EmptyState.qml'
--- app/components/EmptyState.qml 2015-05-26 14:38:54 +0000
+++ app/components/EmptyState.qml 2015-05-27 16:09:52 +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.2
/*
Component which displays an empty state (approved by design). It offers an
=== modified file 'app/components/ExpandableListItem.qml'
--- app/components/ExpandableListItem.qml 2015-03-13 18:56:45 +0000
+++ app/components/ExpandableListItem.qml 2015-05-27 16:09:52 +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.2
import Ubuntu.Components.ListItems 1.0 as ListItem
/*
=== modified file 'app/components/HeaderButton.qml'
--- app/components/HeaderButton.qml 2014-09-17 14:35:13 +0000
+++ app/components/HeaderButton.qml 2015-05-27 16:09:52 +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.2
AbstractButton {
id: headerButton
=== modified file 'app/components/Shadow.qml'
--- app/components/Shadow.qml 2014-08-24 12:47:50 +0000
+++ app/components/Shadow.qml 2015-05-27 16:09:52 +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.2
Item {
id: _shadowContainer
=== modified file 'app/components/SubtitledListItem.qml'
--- app/components/SubtitledListItem.qml 2014-10-15 20:43:45 +0000
+++ app/components/SubtitledListItem.qml 2015-05-27 16:09:52 +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.2
import Ubuntu.Components.ListItems 1.0 as ListItem
/*
=== modified file 'app/ubuntu-clock-app.qml'
--- app/ubuntu-clock-app.qml 2015-01-22 00:11:57 +0000
+++ app/ubuntu-clock-app.qml 2015-05-27 16:09:52 +0000
@@ -16,10 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-import QtQuick 2.3
+import QtQuick 2.4
import DateTime 1.0
import U1db 1.0 as U1db
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
import "clock"
import "components"
@@ -51,7 +51,6 @@
backgroundColor: "#F5F5F5"
- useDeprecatedToolbar: false
anchorToKeyboard: true
Background {}
=== modified file 'app/upstreamcomponents/FakeHeader.qml'
--- app/upstreamcomponents/FakeHeader.qml 2014-09-01 19:33:42 +0000
+++ app/upstreamcomponents/FakeHeader.qml 2015-05-27 16:09:52 +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.2
Column {
id: fakeHeader
=== modified file 'app/upstreamcomponents/FastScroll.qml'
--- app/upstreamcomponents/FastScroll.qml 2014-09-20 10:47:21 +0000
+++ app/upstreamcomponents/FastScroll.qml 2015-05-27 16:09:52 +0000
@@ -40,8 +40,8 @@
****************************************************************************/
// FastScroll.qml
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
import "FastScroll.js" as Sections
Item {
=== modified file 'app/upstreamcomponents/ListItemWithActions.qml'
--- app/upstreamcomponents/ListItemWithActions.qml 2014-10-05 15:53:58 +0000
+++ app/upstreamcomponents/ListItemWithActions.qml 2015-05-27 16:09:52 +0000
@@ -14,8 +14,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.2
Item {
id: root
=== modified file 'app/upstreamcomponents/ListItemWithActionsCheckBox.qml'
--- app/upstreamcomponents/ListItemWithActionsCheckBox.qml 2014-09-20 10:47:21 +0000
+++ app/upstreamcomponents/ListItemWithActionsCheckBox.qml 2015-05-27 16:09:52 +0000
@@ -14,8 +14,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.2
CheckBox {
checked: root.selected
=== modified file 'app/upstreamcomponents/MultipleSelectionListView.qml'
--- app/upstreamcomponents/MultipleSelectionListView.qml 2014-09-20 10:47:21 +0000
+++ app/upstreamcomponents/MultipleSelectionListView.qml 2015-05-27 16:09:52 +0000
@@ -14,8 +14,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.2
import Ubuntu.Components.Popups 1.0 as Popups
/*!
=== modified file 'app/upstreamcomponents/MultipleSelectionVisualModel.qml'
--- app/upstreamcomponents/MultipleSelectionVisualModel.qml 2014-09-20 10:47:21 +0000
+++ app/upstreamcomponents/MultipleSelectionVisualModel.qml 2015-05-27 16:09:52 +0000
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-import QtQuick 2.3
+import QtQuick 2.4
VisualDataModel {
id: contactVisualModel
=== modified file 'app/upstreamcomponents/PageWithBottomEdge.qml'
--- app/upstreamcomponents/PageWithBottomEdge.qml 2014-10-10 21:03:22 +0000
+++ app/upstreamcomponents/PageWithBottomEdge.qml 2015-05-27 16:09:52 +0000
@@ -63,7 +63,7 @@
*/
import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
Page {
id: page
=== modified file 'app/worldclock/AddWorldCityButton.qml'
--- app/worldclock/AddWorldCityButton.qml 2014-09-19 11:30:40 +0000
+++ app/worldclock/AddWorldCityButton.qml 2015-05-27 16:09:52 +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.2
import "../components"
AbstractButton {
=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
--- app/worldclock/UserWorldCityDelegate.qml 2015-04-06 13:33:55 +0000
+++ app/worldclock/UserWorldCityDelegate.qml 2015-05-27 16:09:52 +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.2
import "../components"
import "../upstreamcomponents"
=== modified file 'app/worldclock/UserWorldCityList.qml'
--- app/worldclock/UserWorldCityList.qml 2014-10-03 11:40:54 +0000
+++ app/worldclock/UserWorldCityList.qml 2015-05-27 16:09:52 +0000
@@ -16,10 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-import QtQuick 2.3
+import QtQuick 2.4
import Timezone 1.0
import U1db 1.0 as U1db
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
Column {
id: worldCityColumn
=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml 2015-02-26 21:19:34 +0000
+++ app/worldclock/WorldCityList.qml 2015-05-27 16:09:52 +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 Timezone 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
import Ubuntu.Components.ListItems 1.0 as ListItem
import "../components"
import "../upstreamcomponents"
=== modified file 'debian/changelog'
--- debian/changelog 2015-05-26 14:40:39 +0000
+++ debian/changelog 2015-05-27 16:09:52 +0000
@@ -22,6 +22,7 @@
location access (LP: #1393827)
* Increased date font size (LP: #1432736)
* Fixed empty state component width warnings
+ * Migrated to the 15.04 framework and also QtQuick 2.4
[Penk Chen]
* Fixed DigitalMode time being empty in chineese locale (LP: #1458808)
=== modified file 'manifest.json.in'
--- manifest.json.in 2015-01-21 20:14:52 +0000
+++ manifest.json.in 2015-05-27 16:09:52 +0000
@@ -1,7 +1,7 @@
{
"name": "com.ubuntu.clock",
"description": "A sophisticated clock app for Ubuntu Touch",
- "framework": "ubuntu-sdk-14.10",
+ "framework": "ubuntu-sdk-15.04",
"architecture": "@CLICK_ARCH@",
"title": "Clock",
"icon": "clock@xxxxxx",
=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot 2015-05-26 14:38:54 +0000
+++ po/com.ubuntu.clock.pot 2015-05-27 16:09:52 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-26 14:38+0000\n"
+"POT-Creation-Date: 2015-05-27 16:05+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
=== modified file 'tests/unit/ClockTestCase.qml'
--- tests/unit/ClockTestCase.qml 2014-10-14 16:01:30 +0000
+++ tests/unit/ClockTestCase.qml 2015-05-27 16:09:52 +0000
@@ -17,7 +17,7 @@
*/
import QtTest 1.0
-import QtQuick 2.3
+import QtQuick 2.4
import Ubuntu.Test 1.0
/*
=== modified file 'tests/unit/MockClockApp.qml'
--- tests/unit/MockClockApp.qml 2014-10-28 13:19:46 +0000
+++ tests/unit/MockClockApp.qml 2015-05-27 16:09:52 +0000
@@ -16,10 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-import QtQuick 2.3
+import QtQuick 2.4
import DateTime 1.0
import U1db 1.0 as U1db
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
import "../../app/clock"
import "../../app/components"
=== modified file 'tests/unit/tst_alarm.qml'
--- tests/unit/tst_alarm.qml 2014-10-14 09:45:06 +0000
+++ tests/unit/tst_alarm.qml 2015-05-27 16:09:52 +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 DateTime 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
import "../../app/alarm"
MainView {
=== modified file 'tests/unit/tst_alarmLabel.qml'
--- tests/unit/tst_alarmLabel.qml 2014-10-14 09:23:37 +0000
+++ tests/unit/tst_alarmLabel.qml 2015-05-27 16:09:52 +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.2
import "../../app/alarm"
MainView {
=== modified file 'tests/unit/tst_alarmRepeat.qml'
--- tests/unit/tst_alarmRepeat.qml 2015-01-22 00:11:57 +0000
+++ tests/unit/tst_alarmRepeat.qml 2015-05-27 16:09:52 +0000
@@ -19,7 +19,7 @@
import QtQuick 2.0
import QtTest 1.0
import Ubuntu.Test 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
import "../../app/alarm"
MainView {
=== modified file 'tests/unit/tst_alarmSound.qml'
--- tests/unit/tst_alarmSound.qml 2014-09-25 20:16:40 +0000
+++ tests/unit/tst_alarmSound.qml 2015-05-27 16:09:52 +0000
@@ -16,10 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-import QtQuick 2.3
+import QtQuick 2.4
import QtTest 1.0
import Ubuntu.Test 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
import Qt.labs.folderlistmodel 2.1
import "../../app/alarm"
=== modified file 'tests/unit/tst_alarmUtils.qml'
--- tests/unit/tst_alarmUtils.qml 2014-10-06 21:21:58 +0000
+++ tests/unit/tst_alarmUtils.qml 2015-05-27 16:09:52 +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 QtTest 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
import "../../app/alarm"
TestCase {
=== modified file 'tests/unit/tst_worldClock.qml'
--- tests/unit/tst_worldClock.qml 2014-10-14 11:33:23 +0000
+++ tests/unit/tst_worldClock.qml 2015-05-27 16:09:52 +0000
@@ -19,7 +19,7 @@
import QtQuick 2.0
import QtTest 1.0
import Ubuntu.Test 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
MockClockApp {
id: clockApp
=== modified file 'ubuntu-clock-app.json'
--- ubuntu-clock-app.json 2014-08-21 19:19:36 +0000
+++ ubuntu-clock-app.json 2015-05-27 16:09:52 +0000
@@ -5,5 +5,5 @@
"networking",
"location"
],
- "policy_version": 1.2
+ "policy_version": 1.3
}
\ No newline at end of file
Follow ups
-
[Merge] lp:~nik90/ubuntu-clock-app/migrate-to-15.04-framework into lp:ubuntu-clock-app
From: Nekhelesh Ramananthan, 2015-07-06
-
Re: [Merge] lp:~nik90/ubuntu-clock-app/migrate-to-15.04-framework into lp:ubuntu-clock-app
From: Nekhelesh Ramananthan, 2015-07-06
-
Re: [Merge] lp:~nik90/ubuntu-clock-app/migrate-to-15.04-framework into lp:ubuntu-clock-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-07-05
-
[Merge] lp:~nik90/ubuntu-clock-app/migrate-to-15.04-framework into lp:ubuntu-clock-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-07-05
-
[Merge] lp:~nik90/ubuntu-clock-app/migrate-to-15.04-framework into lp:ubuntu-clock-app
From: Bartosz Kosiorek, 2015-07-04
-
Re: [Merge] lp:~nik90/ubuntu-clock-app/migrate-to-15.04-framework into lp:ubuntu-clock-app
From: Bartosz Kosiorek, 2015-07-04
-
Re: [Merge] lp:~nik90/ubuntu-clock-app/migrate-to-15.04-framework into lp:ubuntu-clock-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-06-18
-
Re: [Merge] lp:~nik90/ubuntu-clock-app/migrate-to-15.04-framework into lp:ubuntu-clock-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-06-18
-
Re: [Merge] lp:~nik90/ubuntu-clock-app/migrate-to-15.04-framework into lp:ubuntu-clock-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-06-18
-
Re: [Merge] lp:~nik90/ubuntu-clock-app/migrate-to-15.04-framework into lp:ubuntu-clock-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-06-04
-
Re: [Merge] lp:~nik90/ubuntu-clock-app/migrate-to-15.04-framework into lp:ubuntu-clock-app
From: Nekhelesh Ramananthan, 2015-06-03
-
Re: [Merge] lp:~nik90/ubuntu-clock-app/migrate-to-15.04-framework into lp:ubuntu-clock-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-05-27