Merge lp:~cwayne/ubuntu-touch-customization-hooks/system-settings-import into lp:ubuntu-touch-customization-hooks

[Chris Wayne]

Set QML2_IMPORT_PATH so that MMI plugins can work

Set QML2_IMPORT_PATH so that MMI plugins can work

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:32
http://jenkins.qa.ubuntu.com/job/ubuntu-touch-customization-hooks-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-touch-customization-hooks-utopic-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-touch-customization-hooks-utopic-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-touch-customization-hooks-utopic-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-touch-customization-hooks-ci/17/rebuild

review: Approve (continuous-integration)

[Scott Sweeny (ssweeny)]

Why do we only want to do this if MMI plugins are present in /custom?

[Chris Wayne (cwayne)]

Because those are private API's that are only used within system-settings and the MMI plugins, so it shouldn't be set system-wide unless something outside of system-settings (MMI plugins in this case) needs them

[Scott Sweeny (ssweeny)]

Is there a way we can just set the import path for those plugins without doing it globally in this case?

[Chris Wayne (cwayne)]

None that I know of

[Scott Sweeny (ssweeny)]

How is it done in a non-custom image?

[Chris Wayne (cwayne)]

It's all set globally, looks like in /etc/environment, and it's always only set to 1 path

[Scott Sweeny (ssweeny)]

Alright then.

review: Approve

[lp:~cwayne/ubuntu-touch-customization-hooks/system-settings-import]

33. By Chris Wayne on 2014-09-18

Set import path within /custom instead of using prviate system-settings APIs

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:33
http://jenkins.qa.ubuntu.com/job/ubuntu-touch-customization-hooks-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-touch-customization-hooks-utopic-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-touch-customization-hooks-utopic-armhf-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-touch-customization-hooks-utopic-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-touch-customization-hooks-ci/19/rebuild

review: Approve (continuous-integration)

=== modified file 'usr/share/upstart/sessions/custom-env.conf'
--- usr/share/upstart/sessions/custom-env.conf	2013-09-23 16:49:35 +0000
+++ usr/share/upstart/sessions/custom-env.conf	2014-09-18 21:42:23 +0000
@@ -17,6 +17,9 @@
     if [ -d /custom/usr/share/themes ]; then
         initctl set-env --global UBUNTU_UI_TOOLKIT_THEMES_PATH=/custom/usr/share/themes
     fi
+    if [ -d /custom/usr/share/dialer-app/MMI ]; then
+        initctl set-env --global QML2_IMPORT_PATH=/usr/lib/arm-linux-gnueabihf/qt5/imports:/custom/usr/lib/arm-linux-gnueabihf/qt5/imports/
+    fi 
 end script
 
 # vim:syntax=upstart