diff options
Diffstat (limited to 'tests/manual/widgets/widgets')
18 files changed, 29 insertions, 52 deletions
diff --git a/tests/manual/widgets/widgets/CMakeLists.txt b/tests/manual/widgets/widgets/CMakeLists.txt index e523f58b8c..b4477ce00a 100644 --- a/tests/manual/widgets/widgets/CMakeLists.txt +++ b/tests/manual/widgets/widgets/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from widgets.pro. - add_subdirectory(bigmenucreator) add_subdirectory(defaultUpMenuBar) add_subdirectory(multiscreen-menus) diff --git a/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt b/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt index a7914590ff..92557ec622 100644 --- a/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt +++ b/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from bigmenucreator.pro. - ##################################################################### ## BigMenuCreator Binary: ##################################################################### @@ -20,6 +18,3 @@ qt_internal_add_manual_test(BigMenuCreator ENABLE_AUTOGEN_TOOLS uic ) - -#### Keys ignored in scope 1:.:.:bigmenucreator.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/widgets/widgets/bigmenucreator/main.cpp b/tests/manual/widgets/widgets/bigmenucreator/main.cpp index 26c823c16e..4afe0e018b 100644 --- a/tests/manual/widgets/widgets/bigmenucreator/main.cpp +++ b/tests/manual/widgets/widgets/bigmenucreator/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "mainwindow.h" #include <QApplication> diff --git a/tests/manual/widgets/widgets/bigmenucreator/mainwindow.cpp b/tests/manual/widgets/widgets/bigmenucreator/mainwindow.cpp index 116983aa90..a2d6c79311 100644 --- a/tests/manual/widgets/widgets/bigmenucreator/mainwindow.cpp +++ b/tests/manual/widgets/widgets/bigmenucreator/mainwindow.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "mainwindow.h" #include "ui_mainwindow.h" diff --git a/tests/manual/widgets/widgets/bigmenucreator/mainwindow.h b/tests/manual/widgets/widgets/bigmenucreator/mainwindow.h index fff499c1bb..008820275d 100644 --- a/tests/manual/widgets/widgets/bigmenucreator/mainwindow.h +++ b/tests/manual/widgets/widgets/bigmenucreator/mainwindow.h @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef MAINWINDOW_H #define MAINWINDOW_H diff --git a/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt index 3a3ea04a73..8c40824284 100644 --- a/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt +++ b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from defaultUpMenuBar.pro. - ##################################################################### ## defaultUpMenuBar Binary: ##################################################################### @@ -16,6 +14,3 @@ qt_internal_add_manual_test(defaultUpMenuBar Qt::GuiPrivate Qt::Widgets ) - -#### Keys ignored in scope 1:.:.:defaultUpMenuBar.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp b/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp index 544de6a93d..c1d7c032d0 100644 --- a/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp +++ b/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // This test is to check that the menus in a menubar are displayed correctly in both the top and // bottom cases. Especially when using multiple screens. If possible relayout the screens in order @@ -71,9 +71,11 @@ int main(int argc, char **argv) MainWindow *mainWindow = new MainWindow; mainWindow->setGeometry(screen->geometry()); mainWindow->winId(); +#ifdef Q_OS_WIN using namespace QNativeInterface::Private; if (auto *windowsWindow = dynamic_cast<QWindowsWindow *>(mainWindow->windowHandle()->handle())) windowsWindow->setHasBorderInFullScreen(true); +#endif mainWindow->showMaximized(); } int ret = a.exec(); diff --git a/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt b/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt index 14d05224a7..b1aab749d7 100644 --- a/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt +++ b/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from multiscreen-menus.pro. - ##################################################################### ## multiscreen-menus Binary: ##################################################################### @@ -18,6 +16,3 @@ qt_internal_add_manual_test(multiscreen-menus ENABLE_AUTOGEN_TOOLS uic ) - -#### Keys ignored in scope 1:.:.:multiscreen-menus.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/widgets/widgets/multiscreen-menus/main.cpp b/tests/manual/widgets/widgets/multiscreen-menus/main.cpp index e99017338e..7f9628e374 100644 --- a/tests/manual/widgets/widgets/multiscreen-menus/main.cpp +++ b/tests/manual/widgets/widgets/multiscreen-menus/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "mainwindow.h" #include <QApplication> diff --git a/tests/manual/widgets/widgets/multiscreen-menus/mainwindow.cpp b/tests/manual/widgets/widgets/multiscreen-menus/mainwindow.cpp index ec3b4085a3..a3af329783 100644 --- a/tests/manual/widgets/widgets/multiscreen-menus/mainwindow.cpp +++ b/tests/manual/widgets/widgets/multiscreen-menus/mainwindow.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "mainwindow.h" #include "ui_mainwindow.h" diff --git a/tests/manual/widgets/widgets/multiscreen-menus/mainwindow.h b/tests/manual/widgets/widgets/multiscreen-menus/mainwindow.h index 9189339a1e..7a70b44657 100644 --- a/tests/manual/widgets/widgets/multiscreen-menus/mainwindow.h +++ b/tests/manual/widgets/widgets/multiscreen-menus/mainwindow.h @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef MAINWINDOW_H #define MAINWINDOW_H diff --git a/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt b/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt index 510e014aa4..a5eb676d69 100644 --- a/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt +++ b/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from saveStateSize.pro. - ##################################################################### ## saveStateSize Binary: ##################################################################### @@ -15,6 +13,3 @@ qt_internal_add_manual_test(saveStateSize Qt::Gui Qt::Widgets ) - -#### Keys ignored in scope 1:.:.:saveStateSize.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/widgets/widgets/qmainwindow/saveStateSize/main.cpp b/tests/manual/widgets/widgets/qmainwindow/saveStateSize/main.cpp index c7cf256415..6576bcf8ab 100644 --- a/tests/manual/widgets/widgets/qmainwindow/saveStateSize/main.cpp +++ b/tests/manual/widgets/widgets/qmainwindow/saveStateSize/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // Test that the size of the saved state bytearray does not change due to moving a // toolbar from one area to another. It should stay the same size as the first time diff --git a/tests/manual/widgets/widgets/qtabbar/CMakeLists.txt b/tests/manual/widgets/widgets/qtabbar/CMakeLists.txt index 550eac7a6f..56345e2797 100644 --- a/tests/manual/widgets/widgets/qtabbar/CMakeLists.txt +++ b/tests/manual/widgets/widgets/qtabbar/CMakeLists.txt @@ -1,17 +1,4 @@ -# Copyright (C) 2022 The Qt Company Ltd. +# Copyright (C) 2023 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qtabbar.pro. - -##################################################################### -## qtabbar Binary: -##################################################################### - -qt_internal_add_manual_test(qtabbar - GUI - LIBRARIES - Qt::Gui -) - -#### Keys ignored in scope 1:.:.:qtabbar.pro:<TRUE>: -# SUBDIRS = "stylesheet" +add_subdirectory(stylesheet) diff --git a/tests/manual/widgets/widgets/qtabbar/stylesheet/CMakeLists.txt b/tests/manual/widgets/widgets/qtabbar/stylesheet/CMakeLists.txt new file mode 100644 index 0000000000..f0723ae3e1 --- /dev/null +++ b/tests/manual/widgets/widgets/qtabbar/stylesheet/CMakeLists.txt @@ -0,0 +1,15 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +##################################################################### +## qtabbar Binary: +##################################################################### + +qt_internal_add_manual_test(qtabbar + GUI + SOURCES + main.cpp + LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/widgets/widgets/qtabbar/stylesheet/main.cpp b/tests/manual/widgets/widgets/qtabbar/stylesheet/main.cpp index 09a64b4437..7d886d1ebc 100644 --- a/tests/manual/widgets/widgets/qtabbar/stylesheet/main.cpp +++ b/tests/manual/widgets/widgets/qtabbar/stylesheet/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2020 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // This test is for checking that when there is padding set on the stylesheet and the elide mode is // set that it is correctly shown as elided and not clipped. diff --git a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt index 1620a8b2be..8f9e46d098 100644 --- a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt +++ b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from menuOnMultiScreens.pro. - ##################################################################### ## menuOnMultiScreens Binary: ##################################################################### @@ -15,6 +13,3 @@ qt_internal_add_manual_test(menuOnMultiScreens 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 f0e1b7ce59..3a575d8fe6 100644 --- a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/main.cpp +++ b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// 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 |