Merge lp:~gerboland/unity8/set-qpa-env-for-clients into lp:unity8

[Gerry Boland]

[upstart] On unity8 start, set correct QT_QPA_PLATFORM for all its Qt clients

[upstart] On unity8 start, set correct QT_QPA_PLATFORM for all its Qt clients

On desktop, unity8-dash and maliit fail to start as the QPA plugin is incorrectly set.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N/A
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * Did you make sure that your branch does not contain spurious tags?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1832
http://jenkins.qa.ubuntu.com/job/unity8-ci/5889/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/204
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/170
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/204
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/204/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21550

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5889/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Isn't /usr/bin/lightdm-unity8-session doing this already?

review: Needs Information

[Albert Astals Cid (aacid)]

review: Disapprove

Unmerged revisions

1832. By Gerry Boland on 2015-06-29

[upstart] On unity8 start, set correct QT_QPA_PLATFORM for all its Qt clients

=== modified file 'data/unity8.conf'
--- data/unity8.conf	2015-05-01 09:57:17 +0000
+++ data/unity8.conf	2015-06-29 15:37:23 +0000
@@ -32,6 +32,9 @@
         # unity-system-compositor's socket.
         initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE
         gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
+
+        # Set correct QPA for all clients
+        initctl set-env --global QT_QPA_PLATFORM="ubuntumirclient"
     fi
 
     # Remove the normal and trusted sockets if still there
@@ -52,6 +55,7 @@
 
 post-stop script
     initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET
+    initctl unset-env --global QT_QPA_PLATFORM
     initctl unset-env --global UNITY_MIR_SOCKET
     initctl unset-env --global MIR_SERVER_PROMPT_FILE
     initctl emit application-end