diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-06 12:38:51 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-02-10 15:55:52 +0100 |
| commit | 32b506d1db1f8cee748a27b548ba8208f2928058 (patch) | |
| tree | 2d5b23baafe22ccc3518719f8f5d19bb846b2b61 /tests/manual/diaglib | |
| parent | 2cb1db64370989fffeec313c196fe573c479e6aa (diff) | |
| parent | c0948d508e7179e2e23c893ba6152c40400de060 (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.11
Conflicts:
src/corelib/tools/qvarlengtharray.qdoc
src/corelib/tools/qvector.qdoc
Resolved documentation changes in favor of 017569f702b6dd0,
which keeps the move overloads along with its const-ref sibling.
Change-Id: I0835b0b3211a418e5e50defc4cf315f0964fab79
Diffstat (limited to 'tests/manual/diaglib')
| -rw-r--r-- | tests/manual/diaglib/nativewindowdump.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/tests/manual/diaglib/nativewindowdump.cpp b/tests/manual/diaglib/nativewindowdump.cpp index 83edf878b3..a854e8a790 100644 --- a/tests/manual/diaglib/nativewindowdump.cpp +++ b/tests/manual/diaglib/nativewindowdump.cpp @@ -28,10 +28,25 @@ #include "nativewindowdump.h" +#if QT_VERSION >= 0x050000 +# include <QtGui/QGuiApplication> +# include <qpa/qplatformnativeinterface.h> +#endif + +#include <QtCore/QDebug> + namespace QtDiag { -void dumpNativeWindows(WId) +void dumpNativeWindows(WId wid) { +#if QT_VERSION >= 0x050000 + QPlatformNativeInterface *ni = QGuiApplication::platformNativeInterface(); + QString result; + QMetaObject::invokeMethod(ni, "dumpNativeWindows", Qt::DirectConnection, + Q_RETURN_ARG(QString, result), + Q_ARG(WId, wid)); + qDebug().noquote() << result; +#endif // Qt 5 } void dumpNativeQtTopLevels() |