diff options
| -rw-r--r-- | src/macdeployqt/shared/shared.cpp | 10 | ||||
| -rw-r--r-- | src/qtdiag/qtdiag.cpp | 14 |
2 files changed, 19 insertions, 5 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index 66b4c588f..25577b255 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -1096,6 +1096,16 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl addPlugins(QStringLiteral("iconengines")); + // Platforminputcontext plugins if QtGui is in use + if (deploymentInfo.containsModule("Gui", libInfix)) { + addPlugins(QStringLiteral("platforminputcontexts"), [&addPlugins](const QString &lib) { + // Deploy the virtual keyboard plugins if we have deployed virtualkeyboard + if (lib.startsWith(QStringLiteral("libqtvirtualkeyboard"))) + addPlugins(QStringLiteral("virtualkeyboard")); + return true; + }); + } + // Sql plugins if QtSql is in use if (deploymentInfo.containsModule("Sql", libInfix)) { addPlugins(QStringLiteral("sqldrivers"), [](const QString &lib) { diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp index d07921d07..c7de04de9 100644 --- a/src/qtdiag/qtdiag.cpp +++ b/src/qtdiag/qtdiag.cpp @@ -679,11 +679,15 @@ QString qtDiag(unsigned flags) // On Windows, this will provide addition GPU info similar to the output of dxdiag. if (const QPlatformNativeInterface *ni = QGuiApplication::platformNativeInterface()) { - const QVariant gpuInfoV = ni->property("gpu"); - if (gpuInfoV.type() == QVariant::Map) { - const QString description = gpuInfoV.toMap().value(QStringLiteral("printable")).toString(); - if (!description.isEmpty()) - str << "\nGPU:\n" << description; + const QVariant gpuInfoV = ni->property("gpuList"); + if (gpuInfoV.type() == QVariant::List) { + const auto gpuList = gpuInfoV.toList(); + for (int i = 0; i < gpuList.size(); ++i) { + const QString description = + gpuList.at(i).toMap().value(QStringLiteral("printable")).toString(); + if (!description.isEmpty()) + str << "\nGPU #" << (i + 1) << ":\n" << description << '\n'; + } } } return result; |