Merge lp:~bfiller/mediaplayer-app/fix-desktop-mode-check into lp:mediaplayer-app

[Bill Filler]

change check for desktopMode to use platform name rather than env var

change check for desktopMode to use platform name rather than env var

[Bill Filler (bfiller)]

Are there any related MPs required for this MP to build/function as expected? Please list.
NO

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
YES

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
YES

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:211
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/185/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3930
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-armhf-ci/41/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-i386-ci/41
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3754
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4430
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4430/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3932
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3932/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6211
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5344

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediaplayer-app-ci/185/rebuild

review: Needs Fixing (continuous-integration)

[Arthur Mello (artmello)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
YES

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/mediaplayer-app) on device or emulator?
YES

Did CI run pass? If not, please explain why.
YES

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
YES

review: Approve

=== modified file 'po/mediaplayer-app.pot'
--- po/mediaplayer-app.pot	2014-02-13 18:26:52 +0000
+++ po/mediaplayer-app.pot	2014-03-28 02:34:16 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-13 13:21-0500\n"
+"POT-Creation-Date: 2014-03-27 18:44-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"

=== modified file 'src/mediaplayer.cpp'
--- src/mediaplayer.cpp	2014-02-13 18:26:52 +0000
+++ src/mediaplayer.cpp	2014-03-28 02:34:16 +0000
@@ -32,6 +32,7 @@
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusReply>
 #include <QtDBus/QDBusConnectionInterface>
+#include <QtGui/QGuiApplication>
 #include <QScreen>
 #include "config.h"
 
@@ -179,7 +180,11 @@
 
 bool MediaPlayer::isDesktopMode() const
 {
-    return (qEnvironmentVariableIsSet("DESKTOP_MODE") && (qgetenv("DESKTOP_MODE") == "1"));
+  // Assume that platformName (QtUbuntu) with ubuntu
+  // in name means it's running on device
+  // TODO: replace this check with SDK call for formfactor
+  QString platform = QGuiApplication::platformName();
+  return !((platform == "ubuntu") || (platform == "ubuntumirclient"));
 }
 
 QUrl MediaPlayer::chooseFile()