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

[Marcus Tomlinson]

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:97
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/41

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-js-scopes-ci/41/rebuild

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-10-23 16:59:37 +0000
+++ CMakeLists.txt	2015-10-25 19:05:23 +0000
@@ -67,3 +67,5 @@
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/qtc-templates/scope-js
         DESTINATION /usr/share/qtcreator/templates/wizards/ubuntu)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/qtc-templates/scope-js
+        DESTINATION /usr/ubuntu-sdk-ide/share/qtcreator/templates/wizards/ubuntu)

=== modified file 'debian/unity-js-scopes-dev.install'
--- debian/unity-js-scopes-dev.install	2015-10-22 05:41:05 +0000
+++ debian/unity-js-scopes-dev.install	2015-10-25 19:05:23 +0000
@@ -1,2 +1,3 @@
 usr/share/unity-js-scopes/examples/
 usr/share/qtcreator/templates/wizards/ubuntu/
+usr/ubuntu-sdk-ide/share/qtcreator/templates/wizards/ubuntu/