Merge lp:~marcustomlinson/unity-js-scopes/support-new-sdk into lp:unity-js-scopes

Proposed by Marcus Tomlinson on 2015-10-25
Status: Merged
Merged at revision: 97
Proposed branch: lp:~marcustomlinson/unity-js-scopes/support-new-sdk
Merge into: lp:unity-js-scopes
Diff against target: 17 lines (+3/-0)
2 files modified
CMakeLists.txt (+2/-0)
debian/unity-js-scopes-dev.install (+1/-0)
To merge this branch: bzr merge lp:~marcustomlinson/unity-js-scopes/support-new-sdk
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) 2015-10-25 Approve on 2015-10-25
PS Jenkins bot (community) continuous-integration Approve on 2015-10-25
Review via email: mp+275645@code.launchpad.net

Commit message

Install qtc templates to old and new sdk folders so both are supported

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-10-23 16:59:37 +0000
3+++ CMakeLists.txt 2015-10-25 19:05:23 +0000
4@@ -67,3 +67,5 @@
5
6 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/qtc-templates/scope-js
7 DESTINATION /usr/share/qtcreator/templates/wizards/ubuntu)
8+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/qtc-templates/scope-js
9+ DESTINATION /usr/ubuntu-sdk-ide/share/qtcreator/templates/wizards/ubuntu)
10
11=== modified file 'debian/unity-js-scopes-dev.install'
12--- debian/unity-js-scopes-dev.install 2015-10-22 05:41:05 +0000
13+++ debian/unity-js-scopes-dev.install 2015-10-25 19:05:23 +0000
14@@ -1,2 +1,3 @@
15 usr/share/unity-js-scopes/examples/
16 usr/share/qtcreator/templates/wizards/ubuntu/
17+usr/ubuntu-sdk-ide/share/qtcreator/templates/wizards/ubuntu/

Subscribers

People subscribed via source and target branches

to all changes: