diff options
Diffstat (limited to 'tests/manual/widgets/widgets/qtoolbutton')
-rw-r--r-- | tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt | 10 | ||||
-rw-r--r-- | tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/main.cpp | 31 |
2 files changed, 7 insertions, 34 deletions
diff --git a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt index 4be0bcf05e..8f9e46d098 100644 --- a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt +++ b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt @@ -1,17 +1,15 @@ -# Generated from menuOnMultiScreens.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## menuOnMultiScreens Binary: ##################################################################### -qt_add_manual_test(menuOnMultiScreens +qt_internal_add_manual_test(menuOnMultiScreens GUI SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Widgets ) - -#### Keys ignored in scope 1:.:.:menuOnMultiScreens.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/main.cpp b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/main.cpp index d55f507717..3a575d8fe6 100644 --- a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/main.cpp +++ b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/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 // This tests that when in a multiple screen setup, that screens that have a top-left of 0x0 or // a top left of being above/below the other screen then showing the toolbutton menu will be @@ -40,7 +15,7 @@ class MyMainWindow : public QMainWindow { public: - MyMainWindow(QWidget *parent = 0) : QMainWindow(parent) + MyMainWindow(QWidget *parent = nullptr) : QMainWindow(parent) { auto *toolBar = new QToolBar; QPixmap pix(16, 16); |