whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <andy.nichols@qt.io>
bb10
Laszlo Agocs 2016-11-16 13:33:20 +01:00
parent c3bf358f69
commit 5c38bd1d84
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/platformsupport/kmsconvenience/qkmsdevice.cpp
View File

@ -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;