Merge lp:~abreu-alexandre/ubuntu-html5-theme/fix-applicationname into lp:ubuntu-html5-theme

[Alexandre Abreu]

Set the applicationName according to the potential APP_ID to ensure a smooth confinment of application assets.

Set the applicationName according to the potential APP_ID to ensure a smooth confinment of application assets.

[lp:~abreu-alexandre/ubuntu-html5-theme/fix-applicationname]

115. By Alexandre Abreu on 2014-01-31

Add APP_ID & set application name accordingly

[David Barth (dbarth)]

Works well, approved

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/71/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2810
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-armhf-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2460
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2812
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2812/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-html5-theme-ci/71/rebuild

review: Approve (continuous-integration)

=== modified file 'src/ubuntu-html5-app-launcher/main.cpp'
--- src/ubuntu-html5-app-launcher/main.cpp	2014-01-28 01:20:38 +0000
+++ src/ubuntu-html5-app-launcher/main.cpp	2014-01-31 15:29:12 +0000
@@ -142,6 +142,13 @@
         return EXIT_FAILURE;
     }
 
+    // Ensure that application-specific data is written where it ought to.
+    if (qgetenv("APP_ID").data() != NULL)
+    {
+        QString appPkgName = qgetenv("APP_ID").split('_').first();
+        QCoreApplication::setApplicationName(appPkgName);
+    }
+
     setUpQmlImportPathIfNecessary();
 
     QQuickView view;