1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNX: Add screen-context-capabilities platform parameter

Browse Source 
Specifies the flags value for the screen_context_create call allowing
the Qt application to take on additional screen capabilities via the
Qt screen context.

Change-Id: Ic7aa478227e64afe2d1d7d04ec58c11ad68b9f22
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
This commit is contained in:
James McDonnell 2018-04-26 15:56:37 -04:00
parent fc356a1992
commit aadc294f2d
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/platforms/qnx/qqnxintegration.cpp
View File

@ -120,6 +120,22 @@ static inline QQnxIntegration::Options parseOptions(const QStringList &paramList
return options; return options;
} }
static inline int getContextCapabilities(const QStringList &paramList)
{
QString contextCapabilitiesPrefix = QStringLiteral("screen-context-capabilities=");
int contextCapabilities = SCREEN_APPLICATION_CONTEXT;
for (const QString &param : paramList) {
if (param.startsWith(contextCapabilitiesPrefix)) {
QStringRef value = param.midRef(contextCapabilitiesPrefix.length());
bool ok = false;
contextCapabilities = value.toInt(&ok, 0);
if (!ok)
contextCapabilities = SCREEN_APPLICATION_CONTEXT;
}
}
return contextCapabilities;
}
QQnxIntegration::QQnxIntegration(const QStringList &paramList) QQnxIntegration::QQnxIntegration(const QStringList &paramList)
: QPlatformIntegration() : QPlatformIntegration()
, m_screenEventThread(0) , m_screenEventThread(0)
@ -145,9 +161,12 @@ QQnxIntegration::QQnxIntegration(const QStringList &paramList)
{ {
ms_options = parseOptions(paramList); ms_options = parseOptions(paramList);
qIntegrationDebug(); qIntegrationDebug();
// Open connection to QNX composition manager // Open connection to QNX composition manager
Q_SCREEN_CRITICALERROR(screen_create_context(&ms_screenContext, SCREEN_APPLICATION_CONTEXT), if (screen_create_context(&ms_screenContext, getContextCapabilities(paramList))) {
"Failed to create screen context"); qFatal("%s - Screen: Failed to create screen context - Error: %s (%i)",
Q_FUNC_INFO, strerror(errno), errno);
}
#if QT_CONFIG(qqnx_pps) #if QT_CONFIG(qqnx_pps)
// Create/start navigator event notifier // Create/start navigator event notifier