Unity 8

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

  1. set-qpa-env-for-clients
  2. Merge into trunk
Proposed by Gerry Boland on 2015-06-29
Status: Rejected
Rejected by: Albert Astals Cid on 2015-07-02
Proposed branch: lp:~gerboland/unity8/set-qpa-env-for-clients
Merge into: lp:unity8
Diff against target: 21 lines (+4/-0)
1 file modified
data/unity8.conf (+4/-0)
To merge this branch: bzr merge lp:~gerboland/unity8/set-qpa-env-for-clients
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) 2015-06-29 Disapprove on 2015-07-02
PS Jenkins bot continuous-integration Needs Fixing on 2015-06-29
Review via email: mp+263253@code.launchpad.net

Commit Message

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

Description of the Change

[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

To post a comment you must log in.

Unmerged revisions

1832. By Gerry Boland on 2015-06-29

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/unity8.conf'
2--- data/unity8.conf 2015-05-01 09:57:17 +0000
3+++ data/unity8.conf 2015-06-29 15:37:23 +0000
4@@ -32,6 +32,9 @@
5 # unity-system-compositor's socket.
6 initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE
7 gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
8+
9+ # Set correct QPA for all clients
10+ initctl set-env --global QT_QPA_PLATFORM="ubuntumirclient"
11 fi
12
13 # Remove the normal and trusted sockets if still there
14@@ -52,6 +55,7 @@
15
16 post-stop script
17 initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET
18+ initctl unset-env --global QT_QPA_PLATFORM
19 initctl unset-env --global UNITY_MIR_SOCKET
20 initctl unset-env --global MIR_SERVER_PROMPT_FILE
21 initctl emit application-end

Subscribers

People subscribed via source and target branches