Merge lp:~alan-griffiths/miral/fix-running-Qt-apps into lp:miral

[Alan Griffiths]

Address more barriers to running Qt applications under MirAL

[lp:~alan-griffiths/miral/fix-running-Qt-apps]

207. By Alan Griffiths on 2016-06-08

Add some documentation of stuff that didn't "just work"

[Gerry Boland (gerboland)]

review: Approve

=== modified file 'building_and_using_miral.md'
--- building_and_using_miral.md	2016-05-20 10:39:14 +0000
+++ building_and_using_miral.md	2016-06-08 18:42:51 +0000
@@ -86,3 +86,11 @@
     $ echo startup-apps=gnome-terminal > ~/.config/miral-shell.config
     ...
     $ bin/miral-shell
+
+
+Running Qt applications
+-----------------------
+
+To run Qt applications under Mir you may need to install qtubuntu-desktop:
+
+    $ sudo apt-get install qtubuntu-desktop

=== modified file 'miral-shell/miral-run.sh'
--- miral-shell/miral-run.sh	2016-06-08 13:54:25 +0000
+++ miral-shell/miral-run.sh	2016-06-08 18:42:51 +0000
@@ -2,4 +2,6 @@
 if [ "$1" = "gnome-terminal" ]
 then extras='--app-id com.canonical.miral.Terminal'
 fi
+unset DISPLAY
+unset QT_QPA_PLATFORMTHEME
 GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir $* ${extras}&

=== modified file 'miral/runner.cpp'
--- miral/runner.cpp	2016-04-28 10:03:40 +0000
+++ miral/runner.cpp	2016-06-08 18:42:51 +0000
@@ -77,6 +77,7 @@
         unsetenv("DISPLAY");                                // Discourage toolkits from using X11
         setenv("GDK_BACKEND", "mir", true);                 // configure GTK to use Mir
         setenv("QT_QPA_PLATFORM", "ubuntumirclient", true); // configure Qt to use Mir
+        unsetenv("QT_QPA_PLATFORMTHEME");                   // Discourage Qt from unsupported theme
         setenv("SDL_VIDEODRIVER", "mir", true);             // configure SDL to use Mir
 
         // gnome-terminal is the (only known) special case