diff options
Diffstat (limited to 'tests/manual/widgets/styles/main.cpp')
| -rw-r--r-- | tests/manual/widgets/styles/main.cpp | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/tests/manual/widgets/styles/main.cpp b/tests/manual/widgets/styles/main.cpp index 3a20c3228c..89050b90e1 100644 --- a/tests/manual/widgets/styles/main.cpp +++ b/tests/manual/widgets/styles/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 <QAction> #include <QApplication> @@ -264,7 +239,7 @@ MainWindow::MainWindow() { QMenu *fileMenu = menuBar()->addMenu("&File"); QAction *a = fileMenu->addAction("Quit", this, &QWidget::close); - a->setShortcut(Qt::CTRL + Qt::Key_Q); + a->setShortcut(Qt::CTRL | Qt::Key_Q); QWidget *central = new QWidget; QVBoxLayout *mainLayout = new QVBoxLayout(central); @@ -286,7 +261,7 @@ void MainWindow::updateDescription() QString text; QTextStream str(&text); str << "Qt " << QT_VERSION_STR << ", platform: " << QGuiApplication::platformName() - << ", Style: \"" << style()->objectName() << "\", DPR=" << devicePixelRatioF() + << ", Style: \"" << style()->objectName() << "\", DPR=" << devicePixelRatio() << ' ' << logicalDpiX() << ',' << logicalDpiY() << "DPI"; if (const QWindow *w = windowHandle()) str << ", Screen: \"" << w->screen()->name() << '"'; @@ -295,7 +270,6 @@ void MainWindow::updateDescription() int main(int argc, char *argv[]) { - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QApplication app(argc, argv); MainWindow mw; mw.show(); |