Ubuntu Music App

Merge lp:~ahayzen/music-app/bump-ubuntu-comp-11-qtquick-22 into lp:music-app/trusty

  1. bump-ubuntu-comp-11-qtquick-22
  2. Merge into trusty
Proposed by Andrew Hayzen
Status: Merged
Approved by: Victor Thompson
Approved revision: 592
Merged at revision: 593
Proposed branch: lp:~ahayzen/music-app/bump-ubuntu-comp-11-qtquick-22
Merge into: lp:music-app/trusty
Diff against target: 538 lines (+80/-89)
30 files modified
LibraryListModel.qml (+1/-1)
LoginLastFM.qml (+4/-5)
MusicAlbums.qml (+4/-7)
MusicArtists.qml (+4/-5)
MusicNowPlaying.qml (+2/-2)
MusicPlaylists.qml (+3/-3)
MusicSearch.qml (+4/-4)
MusicSettings.qml (+4/-4)
MusicStart.qml (+6/-8)
MusicToolbar.qml (+3/-3)
MusicTracks.qml (+3/-4)
MusicaddtoPlaylist.qml (+4/-4)
Player.qml (+1/-1)
Style.qml (+2/-2)
common/AlbumsPage.qml (+4/-4)
common/BlurredBackground.qml (+2/-2)
common/CoverRow.qml (+2/-2)
common/ListItemActions/AddToPlaylist.qml (+2/-2)
common/ListItemActions/AddToQueue.qml (+1/-1)
common/ListItemActions/DeletePlaylist.qml (+3/-3)
common/ListItemActions/EditPlaylist.qml (+2/-2)
common/ListItemActions/Remove.qml (+3/-3)
common/ListItemWithActions.qml (+1/-1)
common/LoadingSpinnerComponent.qml (+2/-2)
common/MusicPage.qml (+1/-1)
common/MusicRow.qml (+2/-2)
common/SongsPage.qml (+3/-3)
common/SwipeDelete.qml (+2/-2)
music-app.qml (+3/-4)
tests/autopilot/music_app/__init__.py (+2/-2)
To merge this branch: bzr merge lp:~ahayzen/music-app/bump-ubuntu-comp-11-qtquick-22
Reviewer Review Type Date Requested Status
Victor Thompson Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+231597@code.launchpad.net

Commit message

* Bump Ubuntu.Components to 1.1
* Bump QtQuick to 2.2

Description of the change

* Bump Ubuntu.Components to 1.1
* Bump QtQuick to 2.2

As we have inconsistent versions at the moment so bumping to latest.

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

PASSED: Continuous integration, rev:587
http://91.189.93.70:8080/job/music-app-ci/1048/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1631
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1631/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/272

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1048/rebuild

review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

Things to look into:

1. It looks like the Popups [1] and Listitems [2] can be updated as well.
2. It'd be nice to also resolve many of the duplicate imports of ListItems in certain cases. (see MusicAlbums.qml as the first example in the diff)
3. A further audit might be nice, but I think we are probably OK with regard to the other imports.

[1] http://developer.ubuntu.com/api/qml/sdk-14.10/Ubuntu.Components.Popups.DefaultSheet/
[2] http://developer.ubuntu.com/api/qml/sdk-14.10/Ubuntu.Components.ListItems.Base/

review: Needs Fixing
lp:~ahayzen/music-app/bump-ubuntu-comp-11-qtquick-22 updated
588. By Andrew Hayzen

* Remove useDeprecatedToolbar: false as it is false in ubuntu components 1.1

589. By Andrew Hayzen

* Bump Ubuntu.Components.Popups and Ubuntu.Components.ListItems to 1.0
* Remove duplicate entries of Ubuntu.Components.ListItems

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:589
http://91.189.93.70:8080/job/music-app-ci/1058/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1650
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1650/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/282

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1058/rebuild

review: Needs Fixing (continuous-integration)
lp:~ahayzen/music-app/bump-ubuntu-comp-11-qtquick-22 updated
590. By Andrew Hayzen

* Merge of trunk

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:590
http://91.189.93.70:8080/job/music-app-ci/1059/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1651
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1651/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/283

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1059/rebuild

review: Needs Fixing (continuous-integration)
lp:~ahayzen/music-app/bump-ubuntu-comp-11-qtquick-22 updated
591. By Andrew Hayzen

* Reverse cherry pick 587-588

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:591
http://91.189.93.70:8080/job/music-app-ci/1060/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1652
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1652/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/284

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1060/rebuild

review: Needs Fixing (continuous-integration)
lp:~ahayzen/music-app/bump-ubuntu-comp-11-qtquick-22 updated
592. By Andrew Hayzen

* Bump Page10 to Page11 as Ubuntu.Components has been bumped to 1.1

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:592
http://91.189.93.70:8080/job/music-app-ci/1062/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1654
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1654/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/286

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1062/rebuild

review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'LibraryListModel.qml'
2--- LibraryListModel.qml 2014-07-28 17:13:00 +0000
3+++ LibraryListModel.qml 2014-08-21 20:59:37 +0000
4@@ -17,7 +17,7 @@
5 * along with this program. If not, see <http://www.gnu.org/licenses/>.
6 */
7
8-import QtQuick 2.0
9+import QtQuick 2.2
10 import QtQuick.LocalStorage 2.0
11 import "meta-database.js" as Library
12 import "playlists.js" as Playlists
13
14=== modified file 'LoginLastFM.qml'
15--- LoginLastFM.qml 2014-05-04 16:34:49 +0000
16+++ LoginLastFM.qml 2014-08-21 20:59:37 +0000
17@@ -15,11 +15,10 @@
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 */
20
21-import QtQuick 2.0
22-import Ubuntu.Components 0.1
23-import Ubuntu.Components.ListItems 0.1
24-import Ubuntu.Components.Popups 0.1
25-import Ubuntu.Components.ListItems 0.1 as ListItem
26+import QtQuick 2.2
27+import Ubuntu.Components 1.1
28+import Ubuntu.Components.Popups 1.0
29+import Ubuntu.Components.ListItems 1.0 as ListItem
30 import QtMultimedia 5.0
31 import QtQuick.LocalStorage 2.0
32 import QtQuick.XmlListModel 2.0
33
34=== modified file 'MusicAlbums.qml'
35--- MusicAlbums.qml 2014-08-15 01:49:49 +0000
36+++ MusicAlbums.qml 2014-08-21 20:59:37 +0000
37@@ -17,12 +17,9 @@
38 * along with this program. If not, see <http://www.gnu.org/licenses/>.
39 */
40
41-import QtQuick 2.0
42-import Ubuntu.Components 0.1
43-import Ubuntu.Components 1.1 as Toolkit
44-import Ubuntu.Components.ListItems 0.1
45-import Ubuntu.Components.Popups 0.1
46-import Ubuntu.Components.ListItems 0.1 as ListItem
47+import QtQuick 2.2
48+import Ubuntu.Components 1.1
49+import Ubuntu.Components.Popups 1.0
50 import Ubuntu.MediaScanner 0.1
51 import Ubuntu.Thumbnailer 0.1
52 import QtMultimedia 5.0
53@@ -52,7 +49,7 @@
54 anchors.bottomMargin: units.gu(1)
55 cellHeight: height/3
56 cellWidth: height/3
57- model: Toolkit.SortFilterModel {
58+ model: SortFilterModel {
59 id: albumsModelFilter
60 property alias rowCount: albumsModel.rowCount
61 model: AlbumsModel {
62
63=== modified file 'MusicArtists.qml'
64--- MusicArtists.qml 2014-08-09 22:52:40 +0000
65+++ MusicArtists.qml 2014-08-21 20:59:37 +0000
66@@ -17,11 +17,10 @@
67 * along with this program. If not, see <http://www.gnu.org/licenses/>.
68 */
69
70-import QtQuick 2.0
71-import Ubuntu.Components 0.1
72-import Ubuntu.Components.ListItems 0.1
73-import Ubuntu.Components.Popups 0.1
74-import Ubuntu.Components.ListItems 0.1 as ListItem
75+import QtQuick 2.2
76+import Ubuntu.Components 1.1
77+import Ubuntu.Components.Popups 1.0
78+import Ubuntu.Components.ListItems 1.0 as ListItem
79 import Ubuntu.MediaScanner 0.1
80 import Ubuntu.Thumbnailer 0.1
81 import QtMultimedia 5.0
82
83=== modified file 'MusicNowPlaying.qml'
84--- MusicNowPlaying.qml 2014-08-17 23:58:29 +0000
85+++ MusicNowPlaying.qml 2014-08-21 20:59:37 +0000
86@@ -19,9 +19,9 @@
87
88
89 import QtMultimedia 5.0
90-import QtQuick 2.0
91+import QtQuick 2.2
92 import QtQuick.LocalStorage 2.0
93-import Ubuntu.Components 0.1
94+import Ubuntu.Components 1.1
95 import Ubuntu.Thumbnailer 0.1
96 import "common"
97 import "common/ListItemActions"
98
99=== modified file 'MusicPlaylists.qml'
100--- MusicPlaylists.qml 2014-08-21 00:05:35 +0000
101+++ MusicPlaylists.qml 2014-08-21 20:59:37 +0000
102@@ -18,9 +18,9 @@
103 * along with this program. If not, see <http://www.gnu.org/licenses/>.
104 */
105
106-import QtQuick 2.0
107-import Ubuntu.Components 0.1
108-import Ubuntu.Components.Popups 0.1
109+import QtQuick 2.2
110+import Ubuntu.Components 1.1
111+import Ubuntu.Components.Popups 1.0
112 import QtMultimedia 5.0
113 import QtQuick.LocalStorage 2.0
114 import "settings.js" as Settings
115
116=== modified file 'MusicSearch.qml'
117--- MusicSearch.qml 2014-08-12 16:14:16 +0000
118+++ MusicSearch.qml 2014-08-21 20:59:37 +0000
119@@ -18,10 +18,10 @@
120 */
121
122 import QtMultimedia 5.0
123-import QtQuick 2.0
124-import Ubuntu.Components 0.1
125-import Ubuntu.Components.ListItems 0.1 as ListItem
126-import Ubuntu.Components.Popups 0.1
127+import QtQuick 2.2
128+import Ubuntu.Components 1.1
129+import Ubuntu.Components.ListItems 1.0 as ListItem
130+import Ubuntu.Components.Popups 1.0
131 import Ubuntu.MediaScanner 0.1
132 import Ubuntu.Thumbnailer 0.1
133 import QtQuick.LocalStorage 2.0
134
135=== modified file 'MusicSettings.qml'
136--- MusicSettings.qml 2014-05-28 15:07:35 +0000
137+++ MusicSettings.qml 2014-08-21 20:59:37 +0000
138@@ -16,10 +16,10 @@
139 * along with this program. If not, see <http://www.gnu.org/licenses/>.
140 */
141
142-import QtQuick 2.0
143-import Ubuntu.Components 0.1
144-import Ubuntu.Components.ListItems 0.1 as ListItem
145-import Ubuntu.Components.Popups 0.1
146+import QtQuick 2.2
147+import Ubuntu.Components 1.1
148+import Ubuntu.Components.ListItems 1.0 as ListItem
149+import Ubuntu.Components.Popups 1.0
150 import QtQuick.LocalStorage 2.0
151 import "settings.js" as Settings
152 import "scrobble.js" as Scrobble
153
154=== modified file 'MusicStart.qml'
155--- MusicStart.qml 2014-08-20 04:56:37 +0000
156+++ MusicStart.qml 2014-08-21 20:59:37 +0000
157@@ -17,12 +17,10 @@
158 * along with this program. If not, see <http://www.gnu.org/licenses/>.
159 */
160
161-import QtQuick 2.0
162-import Ubuntu.Components 0.1
163-import Ubuntu.Components 1.1 as Toolkit
164-import Ubuntu.Components.ListItems 0.1
165-import Ubuntu.Components.Popups 0.1
166-import Ubuntu.Components.ListItems 0.1 as ListItem
167+import QtQuick 2.2
168+import Ubuntu.Components 1.1
169+import Ubuntu.Components.Popups 1.0
170+import Ubuntu.Components.ListItems 1.0 as ListItem
171 import Ubuntu.MediaScanner 0.1
172 import Ubuntu.Thumbnailer 0.1
173 import QtMultimedia 5.0
174@@ -236,7 +234,7 @@
175 anchors.topMargin: units.gu(1)
176 spacing: units.gu(1)
177 height: units.gu(18)
178- model: Toolkit.SortFilterModel {
179+ model: SortFilterModel {
180 id: genresModelFilter
181 model: GenresModel {
182 id: genresModel
183@@ -400,7 +398,7 @@
184 anchors.topMargin: units.gu(1)
185 spacing: units.gu(1)
186 height: units.gu(18)
187- model: Toolkit.SortFilterModel {
188+ model: SortFilterModel {
189 id: albumsModelFilter
190 property alias rowCount: albumsModel.rowCount
191 model: AlbumsModel {
192
193=== modified file 'MusicToolbar.qml'
194--- MusicToolbar.qml 2014-08-18 00:02:37 +0000
195+++ MusicToolbar.qml 2014-08-21 20:59:37 +0000
196@@ -17,11 +17,11 @@
197 * along with this program. If not, see <http://www.gnu.org/licenses/>.
198 */
199
200-import QtQuick 2.0
201+import QtQuick 2.2
202 import QtQuick.LocalStorage 2.0
203 import QtMultimedia 5.0
204-import Ubuntu.Components 0.1
205-import Ubuntu.Components.Popups 0.1
206+import Ubuntu.Components 1.1
207+import Ubuntu.Components.Popups 1.0
208 import "settings.js" as Settings
209
210 Item {
211
212=== modified file 'MusicTracks.qml'
213--- MusicTracks.qml 2014-08-19 22:10:45 +0000
214+++ MusicTracks.qml 2014-08-21 20:59:37 +0000
215@@ -17,9 +17,8 @@
216 * along with this program. If not, see <http://www.gnu.org/licenses/>.
217 */
218
219-import QtQuick 2.0
220-import Ubuntu.Components 0.1
221-import Ubuntu.Components 1.1 as Toolkit
222+import QtQuick 2.2
223+import Ubuntu.Components 1.1
224 import Ubuntu.MediaScanner 0.1
225 import Ubuntu.Thumbnailer 0.1
226 import QtMultimedia 5.0
227@@ -41,7 +40,7 @@
228 anchors.bottomMargin: musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
229 highlightFollowsCurrentItem: false
230 objectName: "trackstab-listview"
231- model: Toolkit.SortFilterModel {
232+ model: SortFilterModel {
233 id: songsModelFilter
234 property alias rowCount: songsModel.rowCount
235 model: SongsModel {
236
237=== modified file 'MusicaddtoPlaylist.qml'
238--- MusicaddtoPlaylist.qml 2014-08-11 13:29:08 +0000
239+++ MusicaddtoPlaylist.qml 2014-08-21 20:59:37 +0000
240@@ -18,10 +18,10 @@
241 */
242
243 import QtMultimedia 5.0
244-import QtQuick 2.0
245-import Ubuntu.Components 0.1
246-import Ubuntu.Components.ListItems 0.1 as ListItem
247-import Ubuntu.Components.Popups 0.1
248+import QtQuick 2.2
249+import Ubuntu.Components 1.1
250+import Ubuntu.Components.ListItems 1.0 as ListItem
251+import Ubuntu.Components.Popups 1.0
252 import QtQuick.LocalStorage 2.0
253 import "playlists.js" as Playlists
254 import "common"
255
256=== modified file 'Player.qml'
257--- Player.qml 2014-08-13 23:57:39 +0000
258+++ Player.qml 2014-08-21 20:59:37 +0000
259@@ -17,7 +17,7 @@
260 * along with this program. If not, see <http://www.gnu.org/licenses/>.
261 */
262
263-import QtQuick 2.0
264+import QtQuick 2.2
265 import QtMultimedia 5.0
266 import QtQuick.LocalStorage 2.0
267 import "settings.js" as Settings
268
269=== modified file 'Style.qml'
270--- Style.qml 2014-08-06 02:26:18 +0000
271+++ Style.qml 2014-08-21 20:59:37 +0000
272@@ -17,8 +17,8 @@
273 * along with this program. If not, see <http://www.gnu.org/licenses/>.
274 */
275
276-import QtQuick 2.0
277-import Ubuntu.Components 0.1
278+import QtQuick 2.2
279+import Ubuntu.Components 1.1
280
281
282 QtObject {
283
284=== modified file 'common/AlbumsPage.qml'
285--- common/AlbumsPage.qml 2014-08-21 17:28:54 +0000
286+++ common/AlbumsPage.qml 2014-08-21 20:59:37 +0000
287@@ -17,10 +17,10 @@
288 * along with this program. If not, see <http://www.gnu.org/licenses/>.
289 */
290
291-import QtQuick 2.0
292-import Ubuntu.Components 0.1
293-import Ubuntu.Components.Popups 0.1
294-import Ubuntu.Components.ListItems 0.1 as ListItem
295+import QtQuick 2.2
296+import Ubuntu.Components 1.1
297+import Ubuntu.Components.Popups 1.0
298+import Ubuntu.Components.ListItems 1.0 as ListItem
299 import Ubuntu.MediaScanner 0.1
300 import Ubuntu.Thumbnailer 0.1
301 import QtQuick.LocalStorage 2.0
302
303=== modified file 'common/BlurredBackground.qml'
304--- common/BlurredBackground.qml 2014-05-23 15:00:21 +0000
305+++ common/BlurredBackground.qml 2014-08-21 20:59:37 +0000
306@@ -17,8 +17,8 @@
307 * along with this program. If not, see <http://www.gnu.org/licenses/>.
308 */
309
310-import QtQuick 2.0
311-import Ubuntu.Components 0.1
312+import QtQuick 2.2
313+import Ubuntu.Components 1.1
314 import QtGraphicalEffects 1.0
315
316 // Blurred background
317
318=== modified file 'common/CoverRow.qml'
319--- common/CoverRow.qml 2014-08-09 22:52:40 +0000
320+++ common/CoverRow.qml 2014-08-21 20:59:37 +0000
321@@ -17,8 +17,8 @@
322 * along with this program. If not, see <http://www.gnu.org/licenses/>.
323 */
324
325-import QtQuick 2.0
326-import Ubuntu.Components 0.1
327+import QtQuick 2.2
328+import Ubuntu.Components 1.1
329
330 UbuntuShape {
331 id: coverRow
332
333=== modified file 'common/ListItemActions/AddToPlaylist.qml'
334--- common/ListItemActions/AddToPlaylist.qml 2014-08-06 17:10:36 +0000
335+++ common/ListItemActions/AddToPlaylist.qml 2014-08-21 20:59:37 +0000
336@@ -16,8 +16,8 @@
337 * along with this program. If not, see <http://www.gnu.org/licenses/>.
338 */
339
340-import QtQuick 2.0
341-import Ubuntu.Components 0.1
342+import QtQuick 2.2
343+import Ubuntu.Components 1.1
344
345 Action {
346 iconName: "add-to-playlist"
347
348=== modified file 'common/ListItemActions/AddToQueue.qml'
349--- common/ListItemActions/AddToQueue.qml 2014-08-06 20:58:56 +0000
350+++ common/ListItemActions/AddToQueue.qml 2014-08-21 20:59:37 +0000
351@@ -16,7 +16,7 @@
352 * along with this program. If not, see <http://www.gnu.org/licenses/>.
353 */
354
355-import QtQuick 2.0
356+import QtQuick 2.2
357 import Ubuntu.Components 1.1
358
359 Action {
360
361=== modified file 'common/ListItemActions/DeletePlaylist.qml'
362--- common/ListItemActions/DeletePlaylist.qml 2014-08-08 17:09:57 +0000
363+++ common/ListItemActions/DeletePlaylist.qml 2014-08-21 20:59:37 +0000
364@@ -16,9 +16,9 @@
365 * along with this program. If not, see <http://www.gnu.org/licenses/>.
366 */
367
368-import QtQuick 2.0
369-import Ubuntu.Components 0.1
370-import Ubuntu.Components.Popups 0.1
371+import QtQuick 2.2
372+import Ubuntu.Components 1.1
373+import Ubuntu.Components.Popups 1.0
374
375 Action {
376 iconName: "delete"
377
378=== modified file 'common/ListItemActions/EditPlaylist.qml'
379--- common/ListItemActions/EditPlaylist.qml 2014-08-06 17:10:36 +0000
380+++ common/ListItemActions/EditPlaylist.qml 2014-08-21 20:59:37 +0000
381@@ -16,9 +16,9 @@
382 * along with this program. If not, see <http://www.gnu.org/licenses/>.
383 */
384
385-import QtQuick 2.0
386+import QtQuick 2.2
387 import Ubuntu.Components 1.1
388-import Ubuntu.Components.Popups 0.1
389+import Ubuntu.Components.Popups 1.0
390
391 Action {
392 iconName: "edit"
393
394=== modified file 'common/ListItemActions/Remove.qml'
395--- common/ListItemActions/Remove.qml 2014-08-07 19:14:02 +0000
396+++ common/ListItemActions/Remove.qml 2014-08-21 20:59:37 +0000
397@@ -16,9 +16,9 @@
398 * along with this program. If not, see <http://www.gnu.org/licenses/>.
399 */
400
401-import QtQuick 2.0
402-import Ubuntu.Components 0.1
403-import Ubuntu.Components.Popups 0.1
404+import QtQuick 2.2
405+import Ubuntu.Components 1.1
406+import Ubuntu.Components.Popups 1.0
407
408 Action {
409 id: removeAction
410
411=== modified file 'common/ListItemWithActions.qml'
412--- common/ListItemWithActions.qml 2014-08-11 13:29:08 +0000
413+++ common/ListItemWithActions.qml 2014-08-21 20:59:37 +0000
414@@ -16,7 +16,7 @@
415
416 import QtQuick 2.2
417 import Ubuntu.Components 1.1
418-import Ubuntu.Components.ListItems 0.1 as ListItem
419+import Ubuntu.Components.ListItems 1.0 as ListItem
420
421
422 ListItem.Standard { // CUSTOM
423
424=== modified file 'common/LoadingSpinnerComponent.qml'
425--- common/LoadingSpinnerComponent.qml 2014-07-30 22:36:33 +0000
426+++ common/LoadingSpinnerComponent.qml 2014-08-21 20:59:37 +0000
427@@ -17,8 +17,8 @@
428 * Martin Borho <martin@borho.net>
429 * Andrew Starr-Bochicchio <a.starr.b@gmail.com>
430 */
431-import QtQuick 2.0
432-import Ubuntu.Components 0.1
433+import QtQuick 2.2
434+import Ubuntu.Components 1.1
435
436 Item {
437 id: refresh
438
439=== modified file 'common/MusicPage.qml'
440--- common/MusicPage.qml 2014-07-02 12:27:30 +0000
441+++ common/MusicPage.qml 2014-08-21 20:59:37 +0000
442@@ -17,7 +17,7 @@
443 * along with this program. If not, see <http://www.gnu.org/licenses/>.
444 */
445
446-import Ubuntu.Components 0.1
447+import Ubuntu.Components 1.1
448
449
450 // generic page for music, could be useful for bottomedge implementation
451
452=== modified file 'common/MusicRow.qml'
453--- common/MusicRow.qml 2014-08-11 13:29:08 +0000
454+++ common/MusicRow.qml 2014-08-21 20:59:37 +0000
455@@ -17,8 +17,8 @@
456 * along with this program. If not, see <http://www.gnu.org/licenses/>.
457 */
458
459-import QtQuick 2.0
460-import Ubuntu.Components 0.1
461+import QtQuick 2.2
462+import Ubuntu.Components 1.1
463
464
465 Row {
466
467=== modified file 'common/SongsPage.qml'
468--- common/SongsPage.qml 2014-08-16 13:38:36 +0000
469+++ common/SongsPage.qml 2014-08-21 20:59:37 +0000
470@@ -17,9 +17,9 @@
471 * along with this program. If not, see <http://www.gnu.org/licenses/>.
472 */
473
474-import QtQuick 2.0
475-import Ubuntu.Components 0.1
476-import Ubuntu.Components.ListItems 0.1 as ListItem
477+import QtQuick 2.2
478+import Ubuntu.Components 1.1
479+import Ubuntu.Components.ListItems 1.0 as ListItem
480 import Ubuntu.MediaScanner 0.1
481 import Ubuntu.Thumbnailer 0.1
482 import QtQuick.LocalStorage 2.0
483
484=== modified file 'common/SwipeDelete.qml'
485--- common/SwipeDelete.qml 2014-08-06 00:51:56 +0000
486+++ common/SwipeDelete.qml 2014-08-21 20:59:37 +0000
487@@ -16,8 +16,8 @@
488 * along with this program. If not, see <http://www.gnu.org/licenses/>.
489 */
490
491-import QtQuick 2.0
492-import Ubuntu.Components 0.1
493+import QtQuick 2.2
494+import Ubuntu.Components 1.1
495
496 /* SwipeDelete object */
497 Rectangle {
498
499=== modified file 'music-app.qml'
500--- music-app.qml 2014-08-21 18:54:06 +0000
501+++ music-app.qml 2014-08-21 20:59:37 +0000
502@@ -17,11 +17,10 @@
503 * along with this program. If not, see <http://www.gnu.org/licenses/>.
504 */
505
506-import QtQuick 2.0
507+import QtQuick 2.2
508 import Ubuntu.Components 1.1
509-import Ubuntu.Components.ListItems 0.1
510-import Ubuntu.Components.Popups 0.1
511-import Ubuntu.Components.ListItems 0.1 as ListItem
512+import Ubuntu.Components.Popups 1.0
513+import Ubuntu.Components.ListItems 1.0 as ListItem
514 import Ubuntu.Content 0.1
515 import Ubuntu.MediaScanner 0.1
516 import Ubuntu.Unity.Action 1.0 as UnityActions
517
518=== modified file 'tests/autopilot/music_app/__init__.py'
519--- tests/autopilot/music_app/__init__.py 2014-08-21 17:59:15 +0000
520+++ tests/autopilot/music_app/__init__.py 2014-08-21 20:59:37 +0000
521@@ -40,7 +40,7 @@
522 self.main_view.switch_to_tab('tracksTab')
523
524 return self.main_view.select_single(
525- Page10, objectName='tracksPage')
526+ Page11, objectName='tracksPage')
527
528 @property
529 def loaded(self):
530@@ -64,7 +64,7 @@
531
532
533 # FIXME: Represents MusicTracks related to bug 1341671 and bug 1337004
534-class Page10(MusicPage):
535+class Page11(MusicPage):
536 """ Autopilot helper for the tracks page """
537 def __init__(self, *args):
538 super(MusicPage, self).__init__(*args)

Subscribers

People subscribed via source and target branches

to status/vote changes: