diff options
Diffstat (limited to 'tests/manual/qscreen/main.cpp')
| -rw-r--r-- | tests/manual/qscreen/main.cpp | 44 |
1 files changed, 8 insertions, 36 deletions
diff --git a/tests/manual/qscreen/main.cpp b/tests/manual/qscreen/main.cpp index e6f0dc9fd7..f85271923c 100644 --- a/tests/manual/qscreen/main.cpp +++ b/tests/manual/qscreen/main.cpp @@ -1,30 +1,7 @@ -/**************************************************************************** -** -** 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 + +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses #include "propertywatcher.h" #include <QApplication> @@ -171,15 +148,15 @@ ScreenWatcherMainWindow::ScreenWatcherMainWindow(QScreen *screen) QMenu *fileMenu = menuBar()->addMenu(QLatin1String("&File")); QAction *a = fileMenu->addAction(QLatin1String("Close")); - a->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_W)); + a->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_W)); connect(a, SIGNAL(triggered()), this, SLOT(close())); a = fileMenu->addAction(QLatin1String("Quit")); - a->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q)); + a->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Q)); connect(a, SIGNAL(triggered()), qApp, SLOT(quit())); QMenu *toolsMenu = menuBar()->addMenu(QLatin1String("&Tools")); a = toolsMenu->addAction(QLatin1String("Mouse Monitor")); - a->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_M)); + a->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_M)); connect(a, &QAction::triggered, this, &ScreenWatcherMainWindow::startMouseMonitor); } @@ -228,12 +205,7 @@ void screenAdded(QScreen* screen) (screen->virtualSiblings().isEmpty() ? "none" : qPrintable(screen->virtualSiblings().first()->name()))); ScreenWatcherMainWindow *w = new ScreenWatcherMainWindow(screen); - // Set the screen; this corresponds to setScreen() for the underlying - // QWindow. This is essential when having separate X screens since the - // positioning below is not sufficient to get the windows show up on the - // desired screen. - w->setParent(qApp->desktop(screen)); - + w->setScreen(screen); w->show(); // Position the windows so that they end up at the center of the corresponding screen. |