Merge lp:~dandrader/unity/phablet_iconThemeEnvVar into lp:unity/phablet

[Daniel d'Andrada]

Correctly load icons when running on the desktop

Less warnings and more eye-candy.

Correctly load icons when running on the desktop

Less warnings and more eye-candy.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:644
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/814/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/710
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/690
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/690/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/694
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1371

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/814/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Looks good

review: Approve

=== modified file 'build'
--- build	2013-04-15 16:07:58 +0000
+++ build	2013-05-01 00:00:41 +0000
@@ -50,9 +50,9 @@
     sudo apt-get update || exit 4
     echo "Installing dependencies.."
     if ! $RARING; then
-        sudo apt-get install -y qt-components-ubuntu qtdeclarative5-dee-plugin indicators-client indicators-client-plugin-* qtbase5-dev qtdeclarative5-dev qtdeclarative5-dev-tools qtdeclarative5-test-plugin libdee-qt5-dev libpulse-dev qtdeclarative5-xmllistmodel-plugin unity-lens-mock demo-assets libboost-regex1.49-dev || exit 5
+        sudo apt-get install -y qt-components-ubuntu qtdeclarative5-dee-plugin indicators-client indicators-client-plugin-* qtbase5-dev qtdeclarative5-dev qtdeclarative5-dev-tools qtdeclarative5-test-plugin libdee-qt5-dev libpulse-dev qtdeclarative5-xmllistmodel-plugin unity-lens-mock demo-assets libboost-regex1.49-dev ubuntu-mobile || exit 5
     else
-        sudo apt-get install -y qtdeclarative5-ubuntu-ui-toolkit-plugin qtdeclarative5-dee-plugin indicators-client indicators-client-plugin-* qtbase5-dev qtdeclarative5-dev qtdeclarative5-dev-tools qtdeclarative5-test-plugin libdee-qt5-dev libpulse-dev qtdeclarative5-xmllistmodel-plugin unity-lens-mock demo-assets libboost-regex1.49-dev || exit 6
+        sudo apt-get install -y qtdeclarative5-ubuntu-ui-toolkit-plugin qtdeclarative5-dee-plugin indicators-client indicators-client-plugin-* qtbase5-dev qtdeclarative5-dev qtdeclarative5-dev-tools qtdeclarative5-test-plugin libdee-qt5-dev libpulse-dev qtdeclarative5-xmllistmodel-plugin unity-lens-mock demo-assets libboost-regex1.49-dev ubuntu-mobile || exit 6
     fi
 }
 
 
=== modified file 'main.cpp'
--- main.cpp	2013-04-18 15:31:33 +0000
+++ main.cpp	2013-05-01 00:00:41 +0000
@@ -19,6 +19,7 @@
 
 // Qt
 #include <QtQuick/QQuickView>
+#include <QtGui/QIcon>
 #include <QtGui/QGuiApplication>
 #include <QtQml/QQmlEngine>
 #include <qpa/qplatformnativeinterface.h>
@@ -37,6 +38,13 @@
     importPathList.append(path);
     engine->setImportPathList(importPathList);
 }
+
+void resolveIconTheme() {
+    const char *ubuntuIconTheme = getenv("UBUNTU_ICON_THEME");
+    if (ubuntuIconTheme != NULL) {
+        QIcon::setThemeName(ubuntuIconTheme);
+    }
+}
 } // namespace {
 
 int main(int argc, char** argv)
@@ -52,6 +60,8 @@
     QGuiApplication::setApplicationName("Qml Phone Shell");
     QGuiApplication application(argc, argv);
 
+    resolveIconTheme();
+
     QStringList args = application.arguments();
 
     // The testability driver is only loaded by QApplication but not by QGuiApplication.
 
=== modified file 'run'
--- run	2013-04-26 08:33:41 +0000
+++ run	2013-05-01 00:00:41 +0000
@@ -35,6 +35,12 @@
   export QML2_IMPORT_PATH=$PWD/builddir/plugins:$PWD/builddir/tests/mocks
 fi
 
+# Force icon theme if running on the desktop, otherwise gnome theme (if running
+# on Ubuntu Desktop) will be used and icons won't be found
+if [ -n "$DESKTOP_SESSION" ]; then
+  export UBUNTU_ICON_THEME=ubuntu-mobile
+fi
+
 if $GDB; then
   gdb -ex run --args $QML_PHONE_SHELL_PATH $@
 else