Merge 5.6 into 5.6.0

Change-Id: I2e48d2627ada8184716916070c2d3cec200e2cb2

1 files changed, 4 insertions, 0 deletions

diff --git a/src/qtdiag/main.cpp b/src/qtdiag/main.cpp
index 6bc42bc2c..7e304d401 100644
--- a/src/qtdiag/main.cpp
+++ b/src/qtdiag/main.cpp
@@ -53,14 +53,18 @@ int main(int argc, char **argv)
     QCommandLineParser commandLineParser;
     const QCommandLineOption noGlOption(QStringLiteral("no-gl"), QStringLiteral("Do not output GL information"));
     const QCommandLineOption glExtensionOption(QStringLiteral("gl-extensions"), QStringLiteral("List GL extensions"));
+    const QCommandLineOption fontOption(QStringLiteral("fonts"), QStringLiteral("Output list of fonts"));
     commandLineParser.setApplicationDescription(QStringLiteral("Prints diagnostic output about the Qt library."));
     commandLineParser.addOption(noGlOption);
     commandLineParser.addOption(glExtensionOption);
+    commandLineParser.addOption(fontOption);
     commandLineParser.addHelpOption();
     commandLineParser.process(app);
     unsigned flags = commandLineParser.isSet(noGlOption) ? 0u : unsigned(QtDiagGl);
     if (commandLineParser.isSet(glExtensionOption))
         flags |= QtDiagGlExtensions;
+    if (commandLineParser.isSet(fontOption))
+        flags |= QtDiagFonts;
 
     std::wcout << qtDiag(flags).toStdWString();
     return 0;