Merge lp:~bzoltan/qtcreator-plugin-ubuntu/lighter_dev_mode_enabler into lp:qtcreator-plugin-ubuntu

Proposed by Zoltan Balogh
Status: Merged
Approved by: Francis Ginther
Approved revision: 10
Merged at revision: 10
Proposed branch: lp:~bzoltan/qtcreator-plugin-ubuntu/lighter_dev_mode_enabler
Merge into: lp:qtcreator-plugin-ubuntu
Diff against target: 28 lines (+9/-1)
2 files modified
share/qtcreator/ubuntu/menu.json (+8/-0)
share/qtcreator/ubuntu/scripts/openssh_install (+1/-1)
To merge this branch: bzr merge lp:~bzoltan/qtcreator-plugin-ubuntu/lighter_dev_mode_enabler
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Cris Dywan Approve
Timo Jyrinki Pending
Review via email: mp+181052@code.launchpad.net

Commit message

The "Enbable development mode" button's function was reported to be too heavy. Now it is doing nothing else but setting up the openssh and the rest of the heavy weight development enabling is moved to the menus.

Description of the change

The "Enbable development mode" button's function was reported to be too heavy. Now it is doing nothing else but setting up the openssh and the rest of the heavy weight development enabling is moved to the menus.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote :

I love to get the button light-weight and fast. Installing the whole thing takes ages.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Removed the license check so as not to fail on the templates. Re-approving.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'share/qtcreator/ubuntu/menu.json'
2--- share/qtcreator/ubuntu/menu.json 2013-08-08 07:26:20 +0000
3+++ share/qtcreator/ubuntu/menu.json 2013-08-20 14:13:24 +0000
4@@ -290,6 +290,14 @@
5 ]
6 },
7 {
8+ "name": "Enable platform development mode",
9+ "id": "Ubuntu.Menu.Device.EnablePlatformDevelopmentMode",
10+ "deviceRequired": true,
11+ "actions": [
12+ "%SCRIPTDIRECTORY%/qtc_device_developertools %SERIALNUMBER%"
13+ ]
14+ },
15+ {
16 "name": "Close All Applications on Device",
17 "id": "Ubuntu.Menu.Device.CloseAllApps",
18 "deviceRequired": true,
19
20=== modified file 'share/qtcreator/ubuntu/scripts/openssh_install'
21--- share/qtcreator/ubuntu/scripts/openssh_install 2013-08-08 07:26:20 +0000
22+++ share/qtcreator/ubuntu/scripts/openssh_install 2013-08-20 14:13:24 +0000
23@@ -17,4 +17,4 @@
24
25 . `dirname $0`/functions.inc
26
27-${SCRIPTPATH}/qtc_device_developertools ${SERIALNUMBER}
28+adb_shell apt-get install openssh-server -y

Subscribers

People subscribed via source and target branches

to all changes: