diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-17 16:07:10 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-23 16:57:03 +0200 |
| commit | 298e41b830f60c0f2f078996ace77a4254a9f335 (patch) | |
| tree | 4bf6029da36fb143aeeb11c04a2bdf442ef56b42 /tests/manual/diaglib/nativewindowdump.cpp | |
| parent | e5d65996a93bbf4cbc8a155887def6efa3ad73de (diff) | |
Remove fatuously true or false QT_VERSION checks
QT_VERSION is now at least QT_VERSION_CHECK(6, 3, 0), so remove all
checks against Qt 6.0.0 or earlier. They are superfluous. Tidied up in
some places in the process, particularly #include order.
Change-Id: I2636b2fd13be5b976f5b043ef2f8cddc038a72a4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/manual/diaglib/nativewindowdump.cpp')
| -rw-r--r-- | tests/manual/diaglib/nativewindowdump.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/manual/diaglib/nativewindowdump.cpp b/tests/manual/diaglib/nativewindowdump.cpp index a854e8a790e..2937665bad4 100644 --- a/tests/manual/diaglib/nativewindowdump.cpp +++ b/tests/manual/diaglib/nativewindowdump.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -28,25 +28,20 @@ #include "nativewindowdump.h" -#if QT_VERSION >= 0x050000 -# include <QtGui/QGuiApplication> -# include <qpa/qplatformnativeinterface.h> -#endif - +#include <QtGui/QGuiApplication> +#include <qpa/qplatformnativeinterface.h> #include <QtCore/QDebug> namespace QtDiag { 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() |