AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mirclient: Avoid hardcoding the platform api choice

Browse Source 
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>
This commit is contained in:
Eirik Aavitsland 2015-10-29 11:55:16 +01:00 committed by aavit
parent 6a2b17eeec
commit 86b061b234
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/mirclient/qmirclientplugin.cpp
View File

@ -49,11 +49,6 @@ QPlatformIntegration* QMirClientIntegrationPlugin::create(const QString &system,
const QStringList &) const QStringList &)
{ {
if (system.toLower() == "mirclient") { 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; return new QMirClientClientIntegration;
} else { } else {
return 0; return 0;