summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
authorEirik Aavitsland <eirik.aavitsland@theqtcompany.com>2015-10-29 11:55:16 +0100
committeraavit <eirik.aavitsland@theqtcompany.com>2015-11-23 08:41:16 +0000
commit86b061b234b2dbe0225c602a36ba1595e2a6388c (patch)
tree5b95a0e2dbbf6ce6f6b10457a5b6249d5ebe5655 /src/plugins/platforms
parent6a2b17eeec2d171d2afa17bdbc36456346bfd13b (diff)
Mirclient: Avoid hardcoding the platform api choice
When built in by the debian scripts, a symbol PLATFORM_API_TOUCH would be defined for relevant target platforms. Here in Qt, this does not apply. On a correctly installed system, the UBUNTU_PLATFORM_API_BACKEND variable is not required at runtime, since the system's value will be read from a settings file under /etc. Also, the previous hardcoding would mean that it could not be overridden at runtime. Change-Id: I24ddfaa254005b4113f3328b66edb1c6bbc509e2 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r--src/plugins/platforms/mirclient/qmirclientplugin.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/plugins/platforms/mirclient/qmirclientplugin.cpp b/src/plugins/platforms/mirclient/qmirclientplugin.cpp
index 43d913f8d2..203a1cbfd8 100644
--- a/src/plugins/platforms/mirclient/qmirclientplugin.cpp
+++ b/src/plugins/platforms/mirclient/qmirclientplugin.cpp
@@ -49,11 +49,6 @@ QPlatformIntegration* QMirClientIntegrationPlugin::create(const QString &system,
const QStringList &)
{
if (system.toLower() == "mirclient") {
-#ifdef PLATFORM_API_TOUCH
- setenv("UBUNTU_PLATFORM_API_BACKEND", "touch_mirclient", 1);
-#else
- setenv("UBUNTU_PLATFORM_API_BACKEND", "desktop_mirclient", 1);
-#endif
return new QMirClientClientIntegration;
} else {
return 0;