Ubuntu Shorts App

Merge lp:~kill-animals/ubuntu-rssreader-app/update-imports-to-qtquick-2.3 into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

  1. update-imports-to-qtquick-2.3
  2. Merge into trunk
Proposed by Kill Animals
Status: Merged
Approved by: Joey Chan
Approved revision: 316
Merged at revision: 317
Proposed branch: lp:~kill-animals/ubuntu-rssreader-app/update-imports-to-qtquick-2.3
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 277 lines (+26/-26)
26 files modified
ArticleViewItem.qml (+1/-1)
GoogleFeedApi.qml (+1/-1)
GridModePage.qml (+1/-1)
ListModePage.qml (+1/-1)
OptionsKeeper.qml (+1/-1)
OrganicGrid.qml (+1/-1)
ReadingOptions.qml (+1/-1)
RssFeedPage.qml (+1/-1)
SavedTab.qml (+1/-1)
ShortsTab.qml (+1/-1)
TopicTab.qml (+1/-1)
XmlNetwork.qml (+1/-1)
article_items/ArticleFullImg.qml (+1/-1)
article_items/ArticleOneImgA.qml (+1/-1)
article_items/ArticleTextA.qml (+1/-1)
article_items/ArticleTextB.qml (+1/-1)
feeds/AppendFeedPage.qml (+1/-1)
feeds/ChooseTopicPage.qml (+1/-1)
feeds/CreateTopicPage.qml (+1/-1)
feeds/EditFeed.qml (+1/-1)
feeds/FeedComponent.qml (+1/-1)
feeds/SwipeDelete.qml (+1/-1)
feeds/TopicComponent.qml (+1/-1)
feeds/TopicManagement.qml (+1/-1)
po/com.ubuntu.shorts.pot (+1/-1)
shorts-app.qml (+1/-1)
To merge this branch: bzr merge lp:~kill-animals/ubuntu-rssreader-app/update-imports-to-qtquick-2.3
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Shorts Developers Pending
Review via email: mp+235367@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:316
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-rssreader-app/update-imports-to-qtquick-2.3/+merge/235367/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/267/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/412
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/412/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/46

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

review: Needs Fixing (continuous-integration)
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
=== modified file 'ArticleViewItem.qml'
--- ArticleViewItem.qml 2014-09-18 02:28:48 +0000
+++ ArticleViewItem.qml 2014-09-20 10:52:20 +0000
@@ -6,7 +6,7 @@
66
7*/7*/
88
9import QtQuick 2.09import QtQuick 2.3
10import QtQuick.XmlListModel 2.010import QtQuick.XmlListModel 2.0
11import Ubuntu.Components 1.111import Ubuntu.Components 1.1
12import Ubuntu.Components.ListItems 1.0 as ListItem12import Ubuntu.Components.ListItems 1.0 as ListItem
1313
=== modified file 'GoogleFeedApi.qml'
--- GoogleFeedApi.qml 2013-11-05 19:29:36 +0000
+++ GoogleFeedApi.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
22
3QtObject {3QtObject {
4 id: rootObject4 id: rootObject
55
=== modified file 'GridModePage.qml'
--- GridModePage.qml 2014-09-02 06:34:00 +0000
+++ GridModePage.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import Ubuntu.Components 1.12import Ubuntu.Components 1.1
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.0 as ListItem
4import Ubuntu.Components.Popups 1.04import Ubuntu.Components.Popups 1.0
55
=== modified file 'ListModePage.qml'
--- ListModePage.qml 2014-09-18 02:28:48 +0000
+++ ListModePage.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import QtQuick.XmlListModel 2.02import QtQuick.XmlListModel 2.0
33
4import Ubuntu.Components 1.14import Ubuntu.Components 1.1
55
=== modified file 'OptionsKeeper.qml'
--- OptionsKeeper.qml 2014-04-30 04:26:13 +0000
+++ OptionsKeeper.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import U1db 1.0 as U1db2import U1db 1.0 as U1db
3// import "databasemodule_v2.js" as DB3// import "databasemodule_v2.js" as DB
44
55
=== modified file 'OrganicGrid.qml'
--- OrganicGrid.qml 2014-09-02 06:34:00 +0000
+++ OrganicGrid.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import QtGraphicalEffects 1.02import QtGraphicalEffects 1.0
3import Ubuntu.Components 1.13import Ubuntu.Components 1.1
4import "databasemodule_v2.js" as DB4import "databasemodule_v2.js" as DB
55
=== modified file 'ReadingOptions.qml'
--- ReadingOptions.qml 2014-09-02 06:34:00 +0000
+++ ReadingOptions.qml 2014-09-20 10:52:20 +0000
@@ -6,7 +6,7 @@
66
7*/7*/
88
9import QtQuick 2.09import QtQuick 2.3
10import QtQuick.XmlListModel 2.010import QtQuick.XmlListModel 2.0
11import Ubuntu.Components 1.111import Ubuntu.Components 1.1
12import Ubuntu.Components.ListItems 1.0 as ListItem12import Ubuntu.Components.ListItems 1.0 as ListItem
1313
=== modified file 'RssFeedPage.qml'
--- RssFeedPage.qml 2014-09-18 02:28:48 +0000
+++ RssFeedPage.qml 2014-09-20 10:52:20 +0000
@@ -6,7 +6,7 @@
66
7*/7*/
88
9import QtQuick 2.09import QtQuick 2.3
10import QtQuick.XmlListModel 2.010import QtQuick.XmlListModel 2.0
11import Ubuntu.Components 1.111import Ubuntu.Components 1.1
12import Ubuntu.Components.ListItems 1.0 as ListItem12import Ubuntu.Components.ListItems 1.0 as ListItem
1313
=== modified file 'SavedTab.qml'
--- SavedTab.qml 2014-09-18 02:28:48 +0000
+++ SavedTab.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import Ubuntu.Components 1.12import Ubuntu.Components 1.1
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.0 as ListItem
4import Ubuntu.Components.Popups 1.04import Ubuntu.Components.Popups 1.0
55
=== modified file 'ShortsTab.qml'
--- ShortsTab.qml 2014-09-18 02:28:48 +0000
+++ ShortsTab.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import Ubuntu.Components 1.12import Ubuntu.Components 1.1
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.0 as ListItem
4import Ubuntu.Components.Popups 1.04import Ubuntu.Components.Popups 1.0
55
=== modified file 'TopicTab.qml'
--- TopicTab.qml 2014-09-18 02:28:48 +0000
+++ TopicTab.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import Ubuntu.Components 1.12import Ubuntu.Components 1.1
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.0 as ListItem
4import Ubuntu.Components.Popups 1.04import Ubuntu.Components.Popups 1.0
55
=== modified file 'XmlNetwork.qml'
--- XmlNetwork.qml 2014-09-02 06:34:00 +0000
+++ XmlNetwork.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import QtQuick.XmlListModel 2.02import QtQuick.XmlListModel 2.0
33
4import Ubuntu.Components 1.14import Ubuntu.Components 1.1
55
=== modified file 'article_items/ArticleFullImg.qml'
--- article_items/ArticleFullImg.qml 2014-09-02 06:34:00 +0000
+++ article_items/ArticleFullImg.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import Ubuntu.Components 1.12import Ubuntu.Components 1.1
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.0 as ListItem
4import "../dateutils.js" as DateUtils4import "../dateutils.js" as DateUtils
55
=== modified file 'article_items/ArticleOneImgA.qml'
--- article_items/ArticleOneImgA.qml 2014-09-02 06:34:00 +0000
+++ article_items/ArticleOneImgA.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import Ubuntu.Components 1.12import Ubuntu.Components 1.1
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.0 as ListItem
4import "../dateutils.js" as DateUtils4import "../dateutils.js" as DateUtils
55
=== modified file 'article_items/ArticleTextA.qml'
--- article_items/ArticleTextA.qml 2014-09-02 06:34:00 +0000
+++ article_items/ArticleTextA.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import Ubuntu.Components 1.12import Ubuntu.Components 1.1
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.0 as ListItem
4import "../dateutils.js" as DateUtils4import "../dateutils.js" as DateUtils
55
=== modified file 'article_items/ArticleTextB.qml'
--- article_items/ArticleTextB.qml 2014-09-02 06:34:00 +0000
+++ article_items/ArticleTextB.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import Ubuntu.Components 1.12import Ubuntu.Components 1.1
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.0 as ListItem
4import "../dateutils.js" as DateUtils4import "../dateutils.js" as DateUtils
55
=== modified file 'feeds/AppendFeedPage.qml'
--- feeds/AppendFeedPage.qml 2014-09-18 02:28:48 +0000
+++ feeds/AppendFeedPage.qml 2014-09-20 10:52:20 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.3
18import QtQuick.XmlListModel 2.018import QtQuick.XmlListModel 2.0
19import Ubuntu.Components 1.119import Ubuntu.Components 1.1
20import Ubuntu.Components.ListItems 1.0 as ListItem20import Ubuntu.Components.ListItems 1.0 as ListItem
2121
=== modified file 'feeds/ChooseTopicPage.qml'
--- feeds/ChooseTopicPage.qml 2014-09-18 02:28:48 +0000
+++ feeds/ChooseTopicPage.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import QtQuick.XmlListModel 2.02import QtQuick.XmlListModel 2.0
3import Ubuntu.Components 1.13import Ubuntu.Components 1.1
4import Ubuntu.Components.ListItems 1.0 as ListItem4import Ubuntu.Components.ListItems 1.0 as ListItem
55
=== modified file 'feeds/CreateTopicPage.qml'
--- feeds/CreateTopicPage.qml 2014-09-18 02:28:48 +0000
+++ feeds/CreateTopicPage.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import QtQuick.XmlListModel 2.02import QtQuick.XmlListModel 2.0
3import Ubuntu.Components 1.13import Ubuntu.Components 1.1
4import Ubuntu.Components.ListItems 1.0 as ListItem4import Ubuntu.Components.ListItems 1.0 as ListItem
55
=== modified file 'feeds/EditFeed.qml'
--- feeds/EditFeed.qml 2014-09-02 06:34:00 +0000
+++ feeds/EditFeed.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import Ubuntu.Components 1.12import Ubuntu.Components 1.1
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.0 as ListItem
4import Ubuntu.Components.Popups 1.04import Ubuntu.Components.Popups 1.0
55
=== modified file 'feeds/FeedComponent.qml'
--- feeds/FeedComponent.qml 2014-09-02 06:34:00 +0000
+++ feeds/FeedComponent.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import Ubuntu.Components 1.12import Ubuntu.Components 1.1
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.0 as ListItem
44
55
=== modified file 'feeds/SwipeDelete.qml'
--- feeds/SwipeDelete.qml 2014-09-02 06:34:00 +0000
+++ feeds/SwipeDelete.qml 2014-09-20 10:52:20 +0000
@@ -16,7 +16,7 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.1
2121
22/* SwipeDelete object */22/* SwipeDelete object */
2323
=== modified file 'feeds/TopicComponent.qml'
--- feeds/TopicComponent.qml 2014-09-18 02:28:48 +0000
+++ feeds/TopicComponent.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import Ubuntu.Components 1.12import Ubuntu.Components 1.1
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.0 as ListItem
44
55
=== modified file 'feeds/TopicManagement.qml'
--- feeds/TopicManagement.qml 2014-09-18 02:28:48 +0000
+++ feeds/TopicManagement.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import Ubuntu.Components 1.12import Ubuntu.Components 1.1
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.0 as ListItem
4import Ubuntu.Components.Popups 1.04import Ubuntu.Components.Popups 1.0
55
=== modified file 'po/com.ubuntu.shorts.pot'
--- po/com.ubuntu.shorts.pot 2014-09-18 21:04:34 +0000
+++ po/com.ubuntu.shorts.pot 2014-09-20 10:52:20 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-09-18 23:03+0200\n"11"POT-Creation-Date: 2014-09-20 02:37-0700\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
1515
=== modified file 'shorts-app.qml'
--- shorts-app.qml 2014-09-18 02:28:48 +0000
+++ shorts-app.qml 2014-09-20 10:52:20 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.3
2import QtQuick.XmlListModel 2.02import QtQuick.XmlListModel 2.0
3import Ubuntu.Components 1.13import Ubuntu.Components 1.1
4import Ubuntu.Components.ListItems 1.0 as ListItem4import Ubuntu.Components.ListItems 1.0 as ListItem

Subscribers

People subscribed via source and target branches