diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:07:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-08 10:50:04 +0200 |
| commit | 01e4919d2a89a61a588c9dc05f30acb26701207d (patch) | |
| tree | 6a318ca543de2923a8264f305c81bd725c94a3eb /src/qtdiag | |
| parent | 36defe5725bbed8e03d4f0ef676bc6afa99e6b04 (diff) | |
| parent | 80c135154c1e78c7af7d6d54129e009bc6015c33 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/windeployqt/main.cpp
Change-Id: I2256565a75b8e1c63ef5aeb34fecb6929f94a1f1
Diffstat (limited to 'src/qtdiag')
| -rw-r--r-- | src/qtdiag/qtdiag.cpp | 20 | ||||
| -rw-r--r-- | src/qtdiag/qtdiag.pro | 2 |
2 files changed, 17 insertions, 5 deletions
diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp index 219bb71e5..27db9de03 100644 --- a/src/qtdiag/qtdiag.cpp +++ b/src/qtdiag/qtdiag.cpp @@ -65,9 +65,14 @@ #include <qpa/qplatformintegration.h> #include <qpa/qplatformscreen.h> #include <qpa/qplatformtheme.h> +#include <qpa/qplatformthemefactory_p.h> #include <qpa/qplatformnativeinterface.h> #include <private/qhighdpiscaling_p.h> +#ifdef QT_WIDGETS_LIB +# include <QtWidgets/QStyleFactory> +#endif + #include <algorithm> QT_BEGIN_NAMESPACE @@ -493,16 +498,21 @@ QString qtDiag(unsigned flags) const QPlatformTheme *platformTheme = QGuiApplicationPrivate::platformTheme(); str << "\nTheme:" - "\n Available : " << platformIntegration->themeNames() - << "\n Styles : " << platformTheme->themeHint(QPlatformTheme::StyleNames).toStringList(); + "\n Platforms requested : " << platformIntegration->themeNames() + << "\n available : " << QPlatformThemeFactory::keys() +#ifdef QT_WIDGETS_LIB + << "\n Styles requested : " << platformTheme->themeHint(QPlatformTheme::StyleNames).toStringList() + << "\n available : " << QStyleFactory::keys() +#endif + ; const QString iconTheme = platformTheme->themeHint(QPlatformTheme::SystemIconThemeName).toString(); if (!iconTheme.isEmpty()) { - str << "\n Icon theme : " << iconTheme + str << "\n Icon theme : " << iconTheme << ", " << platformTheme->themeHint(QPlatformTheme::SystemIconFallbackThemeName).toString() - << " from " << platformTheme->themeHint(QPlatformTheme::IconThemeSearchPaths).toStringList() << '\n'; + << " from " << platformTheme->themeHint(QPlatformTheme::IconThemeSearchPaths).toStringList(); } if (const QFont *systemFont = platformTheme->font()) - str << "\n System font : " << *systemFont<< '\n'; + str << "\n System font : " << *systemFont<< '\n'; if (platformTheme->usePlatformNativeDialog(QPlatformTheme::FileDialog)) str << " Native file dialog\n"; diff --git a/src/qtdiag/qtdiag.pro b/src/qtdiag/qtdiag.pro index 1dacd9c0b..b9b3c6e56 100644 --- a/src/qtdiag/qtdiag.pro +++ b/src/qtdiag/qtdiag.pro @@ -1,6 +1,8 @@ CONFIG += console QT += core-private gui-private +qtHaveModule(widgets): QT += widgets + qtHaveModule(network) { QT += network DEFINES += NETWORK_DIAG |