5 files changed, 29 insertions, 95 deletions
diff --git a/tests/manual/windowchildgeometry/CMakeLists.txt b/tests/manual/windowchildgeometry/CMakeLists.txt
new file mode 100644
index 0000000000..b3884c30cf
--- /dev/null
+++ b/tests/manual/windowchildgeometry/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## windowchildgeometry Binary:
+#####################################################################
+
+qt_internal_add_manual_test(windowchildgeometry
+    GUI
+    SOURCES
+        ../windowflags/controls.cpp ../windowflags/controls.h
+        controllerwidget.cpp controllerwidget.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../windowflags
+    LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/windowchildgeometry/controllerwidget.cpp b/tests/manual/windowchildgeometry/controllerwidget.cpp
index 396fad53dc..8478ba5411 100644
--- a/tests/manual/windowchildgeometry/controllerwidget.cpp
+++ b/tests/manual/windowchildgeometry/controllerwidget.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "controllerwidget.h"
 #include <controls.h>
@@ -267,13 +242,11 @@ void WidgetWindowControl::statesChanged()
     w->setWindowState(m_statesControl->states());
 }
 
-#if QT_VERSION >= 0x050000
-
 // Test window drawing diagonal lines
 class Window : public QWindow
 {
 public:
-    explicit Window(QWindow *parent = 0)
+    explicit Window(QWindow *parent = nullptr)
         : QWindow(parent)
         , m_backingStore(new QBackingStore(this))
         , m_color(Qt::GlobalColor(QRandomGenerator::global()->bounded(18)))
@@ -453,8 +426,6 @@ void WindowControl::addChildWindow()
     control->show();
 }
 
-#endif
-
 ControllerWidget::ControllerWidget(QWidget *parent)
     : QMainWindow(parent)
     , m_testWindow(new Window)
@@ -462,7 +433,7 @@ ControllerWidget::ControllerWidget(QWidget *parent)
     QMenu *fileMenu = menuBar()->addMenu(tr("File"));
     QAction *exitAction = fileMenu->addAction(tr("Exit"));
     exitAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Q));
-    connect(exitAction, SIGNAL(triggered()), qApp, SLOT(closeAllWindows()));
+    connect(exitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
 
     QString title = QLatin1String("Child Window Geometry test, (Qt ");
     title += QLatin1String(QT_VERSION_STR);
@@ -475,12 +446,8 @@ ControllerWidget::ControllerWidget(QWidget *parent)
     int y = 100;
     const QStringList args = QApplication::arguments();
     const int offsetArgIndex = args.indexOf(QLatin1String("-offset"));
-    if (offsetArgIndex >=0 && offsetArgIndex < args.size() - 1) {
+    if (offsetArgIndex >=0 && offsetArgIndex < args.size() - 1)
         y += args.at(offsetArgIndex + 1).toInt();
-    } else {
-        if (QT_VERSION < 0x050000)
-            y += 400;
-    }
 
     move(x, y);
 
diff --git a/tests/manual/windowchildgeometry/controllerwidget.h b/tests/manual/windowchildgeometry/controllerwidget.h
index 4744bfc905..c2ebb8c07d 100644
--- a/tests/manual/windowchildgeometry/controllerwidget.h
+++ b/tests/manual/windowchildgeometry/controllerwidget.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #ifndef CONTROLLERWIDGET_H
 #define CONTROLLERWIDGET_H
@@ -136,7 +111,7 @@ class ControllerWidget : public QMainWindow
 {
     Q_OBJECT
 public:
-    explicit ControllerWidget(QWidget *parent = 0);
+    explicit ControllerWidget(QWidget *parent = nullptr);
     ~ControllerWidget();
 private:
     QScopedPointer<QWindow> m_testWindow;
diff --git a/tests/manual/windowchildgeometry/main.cpp b/tests/manual/windowchildgeometry/main.cpp
index 7a4550bf99..8c2b6df4d3 100644
--- a/tests/manual/windowchildgeometry/main.cpp
+++ b/tests/manual/windowchildgeometry/main.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QApplication>
 #include "controllerwidget.h"
diff --git a/tests/manual/windowchildgeometry/windowchildgeometry.pro b/tests/manual/windowchildgeometry/windowchildgeometry.pro
index 7722547ce7..b9a5f37362 100644
--- a/tests/manual/windowchildgeometry/windowchildgeometry.pro
+++ b/tests/manual/windowchildgeometry/windowchildgeometry.pro
@@ -5,5 +5,3 @@ TEMPLATE = app
 INCLUDEPATH += ../windowflags
 SOURCES += $$PWD/main.cpp controllerwidget.cpp ../windowflags/controls.cpp
 HEADERS += controllerwidget.h ../windowflags/controls.h
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0