summaryrefslogtreecommitdiffstats
path: root/tests/manual/widgets/kernel/setscreen/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/manual/widgets/kernel/setscreen/main.cpp')
-rw-r--r--tests/manual/widgets/kernel/setscreen/main.cpp52
1 files changed, 2 insertions, 50 deletions
diff --git a/tests/manual/widgets/kernel/setscreen/main.cpp b/tests/manual/widgets/kernel/setscreen/main.cpp
index 70ec067d3d..3610c9ff35 100644
--- a/tests/manual/widgets/kernel/setscreen/main.cpp
+++ b/tests/manual/widgets/kernel/setscreen/main.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 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) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtWidgets>
@@ -68,18 +43,12 @@ public:
screenButton->setEnabled(false);
connect(screenButton, &QAbstractButton::clicked, this, &Controller::setScreen);
- QPushButton *desktopButton = new QPushButton;
- desktopButton->setText("Show on Desktop");
- desktopButton->setEnabled(false);
- connect(desktopButton, &QAbstractButton::clicked, this, &Controller::setDesktop);
-
QPushButton *exitButton = new QPushButton;
exitButton->setText("E&xit");
connect(exitButton, &QAbstractButton::clicked, QApplication::instance(), &QCoreApplication::quit);
QHBoxLayout *actionLayout = new QHBoxLayout;
actionLayout->addWidget(screenButton);
- actionLayout->addWidget(desktopButton);
actionLayout->addWidget(exitButton);
QGroupBox *radioGroup = new QGroupBox;
@@ -95,7 +64,6 @@ public:
if (on)
targetScreen = count;
screenButton->setEnabled(targetScreen != -1);
- desktopButton->setEnabled(targetScreen != -1);
});
groupLayout->addWidget(choice);
++count;
@@ -122,24 +90,8 @@ private slots:
widget->updateText();
}
- void setDesktop()
- {
- QScreen *screen = QGuiApplication::screens().at(targetScreen);
- QWidget *desktop = QApplication::desktop(screen);
- if (!desktopChild) {
- desktopChild = new ScreenWidget(desktop);
- desktopChild->setAttribute(Qt::WA_DeleteOnClose);
- desktopChild->setWindowTitle("Child of a Desktop");
- } else {
- desktopChild->setParent(desktop);
- }
- desktopChild->show();
- desktopChild->updateText();
- }
-
private:
QPointer<ScreenWidget> widget = nullptr;
- QPointer<ScreenWidget> desktopChild = nullptr;
int targetScreen = -1;
};