From 59806415ea691e43ef6e3be541f94cf6238d44a5 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Mon, 7 Jul 2014 19:19:09 -0700
Subject: [PATCH] Display the selectors from QFileSelectors in qtdiag too
Change-Id: I708140d95e04d37d8593c1ff2f16ffa2b759abe0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
src/qtdiag/qtdiag.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp
index f72b1847c..e41793bc2 100644
--- a/src/qtdiag/qtdiag.cpp
+++ b/src/qtdiag/qtdiag.cpp
@@ -64,6 +64,7 @@
#include <QtCore/QTextStream>
#include <QtCore/QStandardPaths>
#include <QtCore/QDir>
+#include <QtCore/QFileSelector>
#include <private/qsimd_p.h>
#include <private/qguiapplication_p.h>
@@ -268,7 +269,11 @@ QString qtDiag(unsigned flags)
DUMP_STANDARDPATH(str, GenericCacheLocation)
DUMP_STANDARDPATH(str, GenericConfigLocation)
- str << "\nNetwork:\n ";
+ str << "\nFile selectors (increasing order of precedence):\n ";
+ foreach (const QString &s, QFileSelector().allSelectors())
+ str << ' ' << s;
+
+ str << "\n\nNetwork:\n ";
#ifdef NETWORK_DIAG
# ifndef QT_NO_SSL
if (QSslSocket::supportsSsl()) {
--
GitLab