diff options
Diffstat (limited to 'tests/manual/foreignwindows/main.cpp')
-rw-r--r-- | tests/manual/foreignwindows/main.cpp | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/tests/manual/foreignwindows/main.cpp b/tests/manual/foreignwindows/main.cpp index cc5b16391c..1fb4b0c167 100644 --- a/tests/manual/foreignwindows/main.cpp +++ b/tests/manual/foreignwindows/main.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtGui/QAction> #include <QtWidgets/QApplication> @@ -142,7 +117,7 @@ EmbeddingWindow::EmbeddingWindow(QWindow *window) : m_window(window) fileMenu->addSeparator(); action = fileMenu->addAction("Quit", qApp, &QCoreApplication::quit); toolbar->addAction(action); - action->setShortcut(Qt::CTRL + Qt::Key_Q); + action->setShortcut(Qt::CTRL | Qt::Key_Q); } void EmbeddingWindow::releaseForeignWindow() @@ -226,9 +201,6 @@ static inline bool isOptionSet(int argc, char *argv[], const char *option) int main(int argc, char *argv[]) { - // Check for no scaling before QApplication is instantiated. - if (isOptionSet(argc, argv, "-s")) - QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); QCoreApplication::setApplicationVersion(QLatin1String(QT_VERSION_STR)); QGuiApplication::setApplicationDisplayName("Foreign window tester"); @@ -305,7 +277,7 @@ int main(int argc, char *argv[]) QPoint pos = availableGeometry.topLeft() + QPoint(availableGeometry.width(), availableGeometry.height()) / 3; WidgetPtrList mainWindows; - for (QWindow *window : qAsConst(windows)) { + for (QWindow *window : std::as_const(windows)) { WidgetPtr mainWindow(new EmbeddingWindow(window)); mainWindow->move(pos); mainWindow->resize(availableGeometry.size() / 4); |