Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
	LICENSE.LGPLv21
	LICENSE.LGPLv3
	src/assistant/assistant/mainwindow.cpp
	src/designer/src/designer/versiondialog.cpp
	src/linguist/linguist/mainwindow.cpp
	src/linguist/lrelease/lrelease.1
	src/linguist/lupdate/lupdate.1
	src/qconfig/main.cpp
	src/qdbus/qdbusviewer/mainwindow.cpp

Change-Id: I8644f68ff02f00a377f82ea0b7520aa308f0a0df

1 files changed, 9 insertions, 0 deletions

diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp
index ac4e40f0d..2e0c557ba 100644
--- a/src/qtdiag/qtdiag.cpp
+++ b/src/qtdiag/qtdiag.cpp
@@ -62,6 +62,7 @@
 #include <private/qguiapplication_p.h>
 #include <qpa/qplatformintegration.h>
 #include <qpa/qplatformtheme.h>
+#include <qpa/qplatformnativeinterface.h>
 
 #include <algorithm>
 
@@ -376,6 +377,14 @@ QString qtDiag(unsigned flags)
 #else
     Q_UNUSED(flags)
 #endif // !QT_NO_OPENGL
+
+    // On Windows, this will provide addition GPU info similar to the output of dxdiag.
+    const QVariant gpuInfoV = QGuiApplication::platformNativeInterface()->property("gpu");
+    if (gpuInfoV.type() == QVariant::Map) {
+        const QString description = gpuInfoV.toMap().value(QStringLiteral("printable")).toString();
+        if (!description.isEmpty())
+            str << "\nGPU:\n" << description;
+    }
     return result;
 }