Merge lp:~elopio/ubuntu-ui-toolkit/fix1244615-autopilot_qtc into lp:ubuntu-ui-toolkit

Proposed by Leo Arias
Status: Merged
Approved by: Florian Boucault
Approved revision: 809
Merged at revision: 855
Proposed branch: lp:~elopio/ubuntu-ui-toolkit/fix1244615-autopilot_qtc
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 15 lines (+5/-0)
1 file modified
ubuntu-sdk.qmlproject (+5/-0)
To merge this branch: bzr merge lp:~elopio/ubuntu-ui-toolkit/fix1244615-autopilot_qtc
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu SDK team Pending
Review via email: mp+192713@code.launchpad.net

Commit message

Add the .py files to the qtcreator project.

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

PASSED: Continuous integration, rev:808
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1099/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/110
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/104
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/104/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2730
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2781
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/503
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/489

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-ui-toolkit-ci/1099/rebuild

review: Approve (continuous-integration)
809. By Leo Arias

Merged with trunk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-sdk.qmlproject'
2--- ubuntu-sdk.qmlproject 2013-05-06 13:11:21 +0000
3+++ ubuntu-sdk.qmlproject 2013-11-22 15:53:46 +0000
4@@ -15,6 +15,11 @@
5 ImageFiles {
6 directory: "."
7 }
8+ Files {
9+ directory: "."
10+ filter: "*.py"
11+ }
12+
13 /* List of plugin directories passed to QML runtime */
14 importPaths: [ "modules" ]
15 }

Subscribers

People subscribed via source and target branches

to status/vote changes: