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

Fix crash in dumpConfiguration

Browse Source 
Some qpa backends do not provide a QPlatformNativeInterface. Hence,
check whether return value is valid.

Change-Id: Iab46bc59a151aa244fcfebf58edb37496369db89
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Maurice Kalinowski 2016-08-23 10:46:09 +02:00
parent 4d07042c70
commit 1e1eddb2de
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp
View File

@ -157,11 +157,13 @@ static void dumpConfiguration(QTextStream &str)
} }
// On Windows, this will provide addition GPU info similar to the output of dxdiag. // On Windows, this will provide addition GPU info similar to the output of dxdiag.
const QVariant gpuInfoV = QGuiApplication::platformNativeInterface()->property("gpu"); if (QGuiApplication::platformNativeInterface()) {
if (gpuInfoV.type() == QVariant::Map) { const QVariant gpuInfoV = QGuiApplication::platformNativeInterface()->property("gpu");
const QString description = gpuInfoV.toMap().value(QStringLiteral("printable")).toString(); if (gpuInfoV.type() == QVariant::Map) {
if (!description.isEmpty()) const QString description = gpuInfoV.toMap().value(QStringLiteral("printable")).toString();
str << "\nGPU:\n" << description << "\n\n"; if (!description.isEmpty())
str << "\nGPU:\n" << description << "\n\n";
}
} }
} }