From 5c38bd1d84c73f9d032529f933242be8e795caba Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 16 Nov 2016 13:33:20 +0100 Subject: Add aliases for env vars common to eglfs and linuxfb Now that the generic DRM code is shared between multiple platform plugins, the QT_QPA_EGLFS prefix is not that ideal anymore. Introduce aliases without EGLFS. Task-number: QTBUG-56306 Change-Id: I0cf374f8c8d12aa0eab2f026ffa9201b3af35ce2 Reviewed-by: Andy Nichols --- src/platformsupport/kmsconvenience/qkmsdevice.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/platformsupport/kmsconvenience/qkmsdevice.cpp b/src/platformsupport/kmsconvenience/qkmsdevice.cpp index c265073214..541fcd155d 100644 --- a/src/platformsupport/kmsconvenience/qkmsdevice.cpp +++ b/src/platformsupport/kmsconvenience/qkmsdevice.cpp @@ -305,9 +305,13 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources, } // physical size from connector < config values < env vars - static const int width = qEnvironmentVariableIntValue("QT_QPA_EGLFS_PHYSICAL_WIDTH"); - static const int height = qEnvironmentVariableIntValue("QT_QPA_EGLFS_PHYSICAL_HEIGHT"); - QSizeF physSize(width, height); + int pwidth = qEnvironmentVariableIntValue("QT_QPA_EGLFS_PHYSICAL_WIDTH"); + if (!pwidth) + pwidth = qEnvironmentVariableIntValue("QT_QPA_PHYSICAL_WIDTH"); + int pheight = qEnvironmentVariableIntValue("QT_QPA_EGLFS_PHYSICAL_HEIGHT"); + if (!pheight) + pheight = qEnvironmentVariableIntValue("QT_QPA_PHYSICAL_HEIGHT"); + QSizeF physSize(pwidth, pheight); if (physSize.isEmpty()) { physSize = QSize(userConnectorConfig.value(QStringLiteral("physicalWidth")).toInt(), userConnectorConfig.value(QStringLiteral("physicalHeight")).toInt()); @@ -492,9 +496,12 @@ QKmsScreenConfig::QKmsScreenConfig() void QKmsScreenConfig::loadConfig() { - static QByteArray json = qgetenv("QT_QPA_EGLFS_KMS_CONFIG"); - if (json.isEmpty()) - return; + QByteArray json = qgetenv("QT_QPA_EGLFS_KMS_CONFIG"); + if (json.isEmpty()) { + json = qgetenv("QT_QPA_KMS_CONFIG"); + if (json.isEmpty()) + return; + } qCDebug(qLcKmsDebug) << "Loading KMS setup from" << json; -- cgit v1.2.3