Merge lp:~gerboland/unity8-desktop-session/qtcomp into lp:unity8-desktop-session

[Gerry Boland]

debian: add qtmir-desktop as a dependency for unity8-desktop-session-mir

[Robert Carr (robertcarr)]

Looks ok!

review: Approve

[Stephen M. Webb (bregma)]

Just a note: the start-unity8-mir script is not actually executed by anything in the normal startup sequence. You should make sure your changes get into the Upstart config file data/unity8-mir.conf too.

[lp:~gerboland/unity8-desktop-session/qtcomp]

59. By Gerry Boland on 2014-07-15

Update unity8-mir.conf to use mirserver QPA plugin

[Christopher Townsend (townsend)]

Ok, looks good.

review: Approve

=== modified file 'data/start-unity8-mir'
--- data/start-unity8-mir	2013-12-05 15:51:51 +0000
+++ data/start-unity8-mir	2014-07-15 14:33:58 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-export QT_QPA_PLATFORM=ubuntumirserver
+export QT_QPA_PLATFORM=mirserver
 export EGL_PLATFORM=mir
 export EGL_LOG_LEVEL=debug
 exec /usr/bin/unity8

=== modified file 'data/unity8-mir.conf'
--- data/unity8-mir.conf	2014-07-08 13:15:46 +0000
+++ data/unity8-mir.conf	2014-07-15 14:33:58 +0000
@@ -8,7 +8,7 @@
 respawn
 expect stop
 
-env QT_QPA_PLATFORM=ubuntumirserver
+env QT_QPA_PLATFORM=mirserver
 env UPSTART_JOB=unity8
 
 pre-start script

=== modified file 'debian/control'
--- debian/control	2014-07-09 02:44:36 +0000
+++ debian/control	2014-07-15 14:33:58 +0000
@@ -10,6 +10,7 @@
 Architecture: all
 Conflicts: ubuntu-desktop-mir
 Depends: qtubuntu-desktop,
+         qtmir-desktop,
          unity-system-compositor,
          unity8,
          ubuntu-app-launch,