Merge lp:~nik90/ubuntu-clock-app/fix-qtcreator-builability into lp:ubuntu-clock-app

Proposed by Nekhelesh Ramananthan on 2015-08-01
Status: Merged
Approved by: Nekhelesh Ramananthan on 2015-08-03
Approved revision: 316
Merged at revision: 317
Proposed branch: lp:~nik90/ubuntu-clock-app/fix-qtcreator-builability
Merge into: lp:ubuntu-clock-app
Diff against target: 12 lines (+1/-1)
1 file modified
manifest.json.in (+1/-1)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/fix-qtcreator-builability
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-08-03
Bartosz Kosiorek 2015-08-01 Approve on 2015-08-01
Review via email: mp+266647@code.launchpad.net

Commit Message

Fixes incorrect manifest file syntax causing trunk being unable to be built and run using Qtcreator.

Description of the Change

Cannot build trunk in Qtcreator due to manifest file syntax being incorrect. This MP fixes it.

13:05:23: Could not open the manifest.json file in /home/krnekhelesh/Documents/Ubuntu-Projects/Clock/builddir/build-fix-qtcreator-buildability-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/.ubuntu-sdk-deploy.
 Parsing failed, please check if the syntax is correct.

Please check if MPs run using Qtcreator on the phone before approving them to avoid issues like this in the future.

To post a comment you must log in.
Bartosz Kosiorek (gang65) wrote :

Nice catch

review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'manifest.json.in'
2--- manifest.json.in 2015-07-27 20:52:03 +0000
3+++ manifest.json.in 2015-08-01 11:10:59 +0000
4@@ -21,7 +21,7 @@
5 "python3-lxml"
6 ]
7 }
8- }
9+ },
10 "x-source": {
11 "vcs-bzr": "@BZR_SOURCE@",
12 "vcs-bzr-revno": "@BZR_REVNO@"

Subscribers

People subscribed via source and target branches