summaryrefslogtreecommitdiffstats
path: root/tests/manual/windowchildgeometry/controllerwidget.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/manual/windowchildgeometry/controllerwidget.cpp')
-rw-r--r--tests/manual/windowchildgeometry/controllerwidget.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/tests/manual/windowchildgeometry/controllerwidget.cpp b/tests/manual/windowchildgeometry/controllerwidget.cpp
index 1ceb785e9e..4d0aac1732 100644
--- a/tests/manual/windowchildgeometry/controllerwidget.cpp
+++ b/tests/manual/windowchildgeometry/controllerwidget.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.
@@ -267,8 +267,6 @@ void WidgetWindowControl::statesChanged()
w->setWindowState(m_statesControl->states());
}
-#if QT_VERSION >= 0x050000
-
// Test window drawing diagonal lines
class Window : public QWindow
{
@@ -453,8 +451,6 @@ void WindowControl::addChildWindow()
control->show();
}
-#endif
-
ControllerWidget::ControllerWidget(QWidget *parent)
: QMainWindow(parent)
, m_testWindow(new Window)
@@ -475,12 +471,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);