camera-app

Merge lp:~ken-vandine/camera-app/lp1554621 into lp:camera-app

  1. lp1554621
  2. Merge into trunk
Proposed by Ken VanDine
Status: Superseded
Proposed branch: lp:~ken-vandine/camera-app/lp1554621
Merge into: lp:camera-app
Diff against target: 77 lines (+6/-6)
6 files modified
GalleryView.qml (+1/-1)
MimeTypeMapper.js (+1/-1)
PhotogridView.qml (+1/-1)
SlideshowView.qml (+1/-1)
ViewFinderView.qml (+1/-1)
camera-app.qml (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/camera-app/lp1554621
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+289244@code.launchpad.net

This proposal has been superseded by a proposal from 2016-03-17.

Commit message

Bump Ubuntu.Content import to 1.3 to fix theme issue

Description of the change

Bump Ubuntu.Content import to 1.3 to fix theme issue

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:643
http://jenkins.qa.ubuntu.com/job/camera-app-ci/489/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/184
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/185
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/185/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/184
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/437/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1107/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1041
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28043

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/489/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'GalleryView.qml'
2--- GalleryView.qml 2016-02-23 11:46:52 +0000
3+++ GalleryView.qml 2016-03-16 16:17:16 +0000
4@@ -16,7 +16,7 @@
5
6 import QtQuick 2.4
7 import Ubuntu.Components 1.3
8-import Ubuntu.Content 0.1
9+import Ubuntu.Content 1.3
10 import Ubuntu.Thumbnailer 0.1
11 import CameraApp 0.1
12 import "MimeTypeMapper.js" as MimeTypeMapper
13
14=== modified file 'MimeTypeMapper.js'
15--- MimeTypeMapper.js 2014-07-31 18:41:17 +0000
16+++ MimeTypeMapper.js 2016-03-16 16:17:16 +0000
17@@ -17,7 +17,7 @@
18 */
19
20 .pragma library
21-.import Ubuntu.Content 0.1 as UbuntuContent
22+.import Ubuntu.Content 1.3 as UbuntuContent
23
24 function startsWith(string, prefix) {
25 return string.indexOf(prefix) === 0;
26
27=== modified file 'PhotogridView.qml'
28--- PhotogridView.qml 2016-02-23 11:46:52 +0000
29+++ PhotogridView.qml 2016-03-16 16:17:16 +0000
30@@ -18,7 +18,7 @@
31 import Ubuntu.Components 1.3
32 import Ubuntu.Components.Popups 1.3
33 import Ubuntu.Thumbnailer 0.1
34-import Ubuntu.Content 0.1
35+import Ubuntu.Content 1.3
36 import CameraApp 0.1
37 import "MimeTypeMapper.js" as MimeTypeMapper
38
39
40=== modified file 'SlideshowView.qml'
41--- SlideshowView.qml 2016-02-23 11:46:52 +0000
42+++ SlideshowView.qml 2016-03-16 16:17:16 +0000
43@@ -18,7 +18,7 @@
44 import Ubuntu.Components 1.3
45 import Ubuntu.Components.ListItems 1.3 as ListItems
46 import Ubuntu.Components.Popups 1.3
47-import Ubuntu.Content 0.1
48+import Ubuntu.Content 1.3
49 import Ubuntu.Thumbnailer 0.1
50 import CameraApp 0.1
51 import "MimeTypeMapper.js" as MimeTypeMapper
52
53=== modified file 'ViewFinderView.qml'
54--- ViewFinderView.qml 2016-02-23 11:46:52 +0000
55+++ ViewFinderView.qml 2016-03-16 16:17:16 +0000
56@@ -21,7 +21,7 @@
57 import QtMultimedia 5.0
58 import CameraApp 0.1
59 import QtGraphicalEffects 1.0
60-import Ubuntu.Content 0.1
61+import Ubuntu.Content 1.3
62
63 Item {
64 id: viewFinderView
65
66=== modified file 'camera-app.qml'
67--- camera-app.qml 2016-02-23 11:46:52 +0000
68+++ camera-app.qml 2016-03-16 16:17:16 +0000
69@@ -20,7 +20,7 @@
70 import Ubuntu.Components 1.3
71 import Ubuntu.Unity.Action 1.1 as UnityActions
72 import UserMetrics 0.1
73-import Ubuntu.Content 0.1
74+import Ubuntu.Content 1.3
75 import CameraApp 0.1
76
77 Window {

Subscribers

People subscribed via source and target branches