1 files changed, 3 insertions, 36 deletions
diff --git a/tests/manual/windowchildgeometry/controllerwidget.cpp b/tests/manual/windowchildgeometry/controllerwidget.cpp
index 1ceb785e9e..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,8 +242,6 @@ void WidgetWindowControl::statesChanged()
     w->setWindowState(m_statesControl->states());
 }
 
-#if QT_VERSION >= 0x050000
-
 // Test window drawing diagonal lines
 class Window : public QWindow
 {
@@ -453,8 +426,6 @@ void WindowControl::addChildWindow()
     control->show();
 }
 
-#endif
-
 ControllerWidget::ControllerWidget(QWidget *parent)
     : QMainWindow(parent)
     , m_testWindow(new Window)
@@ -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);