qtcreator-plugin-ubuntu

Merge lp:~abreu-alexandre/qtcreator-plugin-ubuntu/fix-1198097 into lp:qtcreator-plugin-ubuntu

  1. fix-1198097
  2. Merge into trunk
Proposed by Alexandre Abreu
Status: Merged
Approved by: Alexandre Abreu
Approved revision: 50
Merged at revision: 51
Proposed branch: lp:~abreu-alexandre/qtcreator-plugin-ubuntu/fix-1198097
Merge into: lp:qtcreator-plugin-ubuntu
Diff against target: 12 lines (+1/-1)
1 file modified
src/cordovaubuntuprojectmanager/plugin.cpp (+1/-1)
To merge this branch: bzr merge lp:~abreu-alexandre/qtcreator-plugin-ubuntu/fix-1198097
Reviewer Review Type Date Requested Status
Zoltan Balogh Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+188870@code.launchpad.net

Commit message

Fix ubuntu platform default on cordova; Fix running cordova apps on touch

Description of the change

Fix ubuntu platform default on cordova; Fix running cordova apps on touch

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

PASSED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-amd64-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-armhf-ci/63

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtcreator-plugin-ubuntu-ci/63/rebuild

review: Approve (continuous-integration)
lp:~abreu-alexandre/qtcreator-plugin-ubuntu/fix-1198097 updated
50. By Alexandre Abreu

remove reference to ubuntu qpa

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:50
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/69/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-amd64-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-armhf-ci/69

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/qtcreator-plugin-ubuntu-ci/69/rebuild

review: Approve (continuous-integration)
Revision history for this message
Zoltan Balogh (bzoltan) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/cordovaubuntuprojectmanager/plugin.cpp'
--- src/cordovaubuntuprojectmanager/plugin.cpp 2013-09-10 20:56:30 +0000
+++ src/cordovaubuntuprojectmanager/plugin.cpp 2013-10-11 17:19:22 +0000
@@ -31,7 +31,7 @@
31 "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p2222 phablet@127.0.0.1 tar -xvf %FOLDERNAME%.tar.bz2",31 "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p2222 phablet@127.0.0.1 tar -xvf %FOLDERNAME%.tar.bz2",
32 "bash -ic \"echo '[Desktop Entry]\nName=PhoneGap Demo\nType=Application\nExec=cordova-ubuntu-2.8\nIcon=\n' > /tmp/%FOLDERNAME%.desktop\"",32 "bash -ic \"echo '[Desktop Entry]\nName=PhoneGap Demo\nType=Application\nExec=cordova-ubuntu-2.8\nIcon=\n' > /tmp/%FOLDERNAME%.desktop\"",
33 "scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P2222 /tmp/%FOLDERNAME%.desktop phablet@127.0.0.1:~/%FOLDERNAME%",33 "scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P2222 /tmp/%FOLDERNAME%.desktop phablet@127.0.0.1:~/%FOLDERNAME%",
34 "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p2222 phablet@127.0.0.1 \"bash -ic \'cordova-ubuntu-2.8 --desktop_file_hint=/home/phablet/%FOLDERNAME%/%FOLDERNAME%.desktop /home/phablet/%FOLDERNAME%\'\"",34 "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p2222 phablet@127.0.0.1 \"bash -ic \'source /etc/profile; cordova-ubuntu-2.8 --desktop_file_hint=/home/phablet/%FOLDERNAME%/%FOLDERNAME%.desktop /home/phablet/%FOLDERNAME%\'\"",
35 NULL };35 NULL };
3636
37static void printToOutputPane(QString msg) {37static void printToOutputPane(QString msg) {

Subscribers

People subscribed via source and target branches