diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-01-08 12:30:57 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-01-08 12:35:24 +0100 |
commit | ad16478a76815f8f61d454bf7760aaf9ffbb4b51 (patch) | |
tree | eefdd9219cc9d59b62e042f49fc7555b980cb7a4 /tests/manual/diaglib | |
parent | 80a741f3616290897ba0d9f1cbd3c9c5ee62da37 (diff) | |
parent | 09c92863001790a0304a5ef389901ee2b5b6cdc2 (diff) | |
download | qtbase-ad16478a76815f8f61d454bf7760aaf9ffbb4b51.tar.gz |
Merge remote-tracking branch 'origin/5.6' into dev
Based on merge done by Liang Qi
Change-Id: Id566e5b9f284d29bff2199f13f9417c660f5b26f
Diffstat (limited to 'tests/manual/diaglib')
-rw-r--r-- | tests/manual/diaglib/qwindowdump.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/manual/diaglib/qwindowdump.cpp b/tests/manual/diaglib/qwindowdump.cpp index a77bae22e9..c0faefb918 100644 --- a/tests/manual/diaglib/qwindowdump.cpp +++ b/tests/manual/diaglib/qwindowdump.cpp @@ -38,6 +38,9 @@ # include <QtGui/QScreen> # include <QtGui/QWindow> # include <qpa/qplatformwindow.h> +# if QT_VERSION >= 0x050600 +# include <private/qhighdpiscaling_p.h> +# endif #endif #include <QtCore/QMetaObject> #include <QtCore/QRect> @@ -131,9 +134,19 @@ void formatWindow(QTextStream &str, const QWindow *w, FormatWindowOptions option str << "[top] "; if (w->isExposed()) str << "[exposed] "; + if (w->surfaceClass() == QWindow::Offscreen) + str << "[offscreen] "; + str << "surface=" << w->surfaceType() << ' '; if (const Qt::WindowState state = w->windowState()) str << "windowState=" << state << ' '; formatRect(str, w->geometry()); + if (w->isTopLevel()) { + str << " \"" << w->screen()->name() << "\" "; +#if QT_VERSION >= 0x050600 + if (QHighDpiScaling::isActive()) + str << "factor=" << QHighDpiScaling::factor(w) << ' '; +#endif + } if (!(options & DontPrintWindowFlags)) { str << ' '; formatWindowFlags(str, w->flags()); |