diff options
Diffstat (limited to 'tests/manual/widgets')
53 files changed, 120 insertions, 133 deletions
diff --git a/tests/manual/widgets/CMakeLists.txt b/tests/manual/widgets/CMakeLists.txt index ac50f6c1ae..6b7969e8b7 100644 --- a/tests/manual/widgets/CMakeLists.txt +++ b/tests/manual/widgets/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from widgets.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(itemviews) add_subdirectory(qgraphicsview) diff --git a/tests/manual/widgets/itemviews/CMakeLists.txt b/tests/manual/widgets/itemviews/CMakeLists.txt index 2e6a7e563b..25348ad347 100644 --- a/tests/manual/widgets/itemviews/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from itemviews.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(delegate) add_subdirectory(qconcatenatetablesproxymodel) diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt index e37182121b..4d83d39783 100644 --- a/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from testtable1.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## testtable1 Binary: @@ -8,7 +9,7 @@ qt_internal_add_manual_test(testtable1 GUI SOURCES testtable1.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Widgets ) diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/testtable1.cpp b/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/testtable1.cpp index 1f194e3f7f..c3573a7852 100644 --- a/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/testtable1.cpp +++ b/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/testtable1.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Thorbjørn Lund Martsum - tmartsum[at]gmail.com -// 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 <QtWidgets/QtWidgets> diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt index ccb4477247..48da8d86a6 100644 --- a/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from testtable2.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## testtable2 Binary: @@ -8,7 +9,7 @@ qt_internal_add_manual_test(testtable2 GUI SOURCES testtable2.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Widgets ) diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/testtable2.cpp b/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/testtable2.cpp index 1f4070e589..4157dab9c3 100644 --- a/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/testtable2.cpp +++ b/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/testtable2.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Thorbjørn Lund Martsum - tmartsum[at]gmail.com -// 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 <QtWidgets/QtWidgets> diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt index 30fad7c910..8898ce2f12 100644 --- a/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from testtree.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## testtree Binary: @@ -8,7 +9,7 @@ qt_internal_add_manual_test(testtree GUI SOURCES testtree.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Widgets ) diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/treeview/testtree.cpp b/tests/manual/widgets/itemviews/autoResizePrecision/treeview/testtree.cpp index 42d987e493..37c6df7002 100644 --- a/tests/manual/widgets/itemviews/autoResizePrecision/treeview/testtree.cpp +++ b/tests/manual/widgets/itemviews/autoResizePrecision/treeview/testtree.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Thorbjørn Lund Martsum - tmartsum[at]gmail.com -// 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 <QtWidgets/QtWidgets> diff --git a/tests/manual/widgets/itemviews/delegate/CMakeLists.txt b/tests/manual/widgets/itemviews/delegate/CMakeLists.txt index 62ff4e33ca..8fb4d3e092 100644 --- a/tests/manual/widgets/itemviews/delegate/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/delegate/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from delegate.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## delegate Binary: @@ -8,10 +9,7 @@ qt_internal_add_manual_test(delegate GUI SOURCES example.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Widgets ) - -#### Keys ignored in scope 1:.:.:delegate.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/widgets/itemviews/delegate/example.cpp b/tests/manual/widgets/itemviews/delegate/example.cpp index 3421b7790b..7dbbf445df 100644 --- a/tests/manual/widgets/itemviews/delegate/example.cpp +++ b/tests/manual/widgets/itemviews/delegate/example.cpp @@ -1,11 +1,11 @@ // Copyright (C) 2012 Thorbjørn Lund Martsum - tmartsum[at]gmail.com -// 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 <QLineEdit> #include <QApplication> #include <QTableView> #include <QStandardItemModel> -#include <QItemDelegate> +#include <QStyledItemDelegate> #include <QDebug> #include <QComboBox> @@ -16,10 +16,10 @@ public: ~ExampleEditor() { QApplication::instance()->quit(); } }; -class ExampleDelegate : public QItemDelegate +class ExampleDelegate : public QStyledItemDelegate { public: - ExampleDelegate() : QItemDelegate() + ExampleDelegate() : QStyledItemDelegate() { m_editor = new ExampleEditor(0); m_combobox = new QComboBox(0); diff --git a/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt b/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt index 0859204297..c24d765331 100644 --- a/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from qconcatenatetablesproxymodel.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## qconcatenatetablesproxymodel Binary: @@ -10,10 +11,7 @@ qt_internal_add_manual_test(qconcatenatetablesproxymodel main.cpp INCLUDE_DIRECTORIES . - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Widgets ) - -#### Keys ignored in scope 1:.:.:qconcatenatetablesproxymodel.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/main.cpp b/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/main.cpp index d723464f4e..ce99a93d1f 100644 --- a/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/main.cpp +++ b/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author David Faure <david.faure@kdab.com> -// 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 <QApplication> #include <QConcatenateTablesProxyModel> diff --git a/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt b/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt index 02dc7fd5b1..1ab78071bd 100644 --- a/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from qheaderview.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## qheaderview Binary: @@ -8,10 +9,7 @@ qt_internal_add_manual_test(qheaderview GUI SOURCES qheaderviewtest1.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Widgets ) - -#### Keys ignored in scope 1:.:.:qheaderview.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp b/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp index f6ea484bed..437dbb6126 100644 --- a/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp +++ b/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Thorbjørn Lund Martsum - tmartsum[at]gmail.com -// 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 <QtWidgets/QtWidgets> diff --git a/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt b/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt index 719ef928c9..f591354556 100644 --- a/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from qtreeview.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## qtreeview Binary: @@ -8,10 +9,7 @@ qt_internal_add_manual_test(qtreeview GUI SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Widgets ) - -#### Keys ignored in scope 1:.:.:qtreeview.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/widgets/itemviews/qtreeview/main.cpp b/tests/manual/widgets/itemviews/qtreeview/main.cpp index 6389faf290..327d8ecb84 100644 --- a/tests/manual/widgets/itemviews/qtreeview/main.cpp +++ b/tests/manual/widgets/itemviews/qtreeview/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 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 <QtWidgets> diff --git a/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt b/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt index 1cefae616c..01c4989997 100644 --- a/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from qtreewidget.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## qtreewidget Binary: @@ -8,11 +9,8 @@ qt_internal_add_manual_test(qtreewidget GUI SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::Gui Qt::Widgets ) - -#### Keys ignored in scope 1:.:.:qtreewidget.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/widgets/itemviews/qtreewidget/main.cpp b/tests/manual/widgets/itemviews/qtreewidget/main.cpp index 3b67c0c4fe..1b292c1c3b 100644 --- a/tests/manual/widgets/itemviews/qtreewidget/main.cpp +++ b/tests/manual/widgets/itemviews/qtreewidget/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Thorbjørn Lund Martsum - tmartsum[at]gmail.com -// 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 <QVBoxLayout> #include <QTreeWidget> diff --git a/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt b/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt index a1ff2f70da..cc08160952 100644 --- a/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from tableview-span-navigation.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tableview-span-navigation Binary: @@ -10,10 +11,7 @@ qt_internal_add_manual_test(tableview-span-navigation main.cpp INCLUDE_DIRECTORIES . - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Widgets ) - -#### Keys ignored in scope 1:.:.:tableview-span-navigation.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/widgets/itemviews/tableview-span-navigation/main.cpp b/tests/manual/widgets/itemviews/tableview-span-navigation/main.cpp index 419ed0c73e..1e053eeb05 100644 --- a/tests/manual/widgets/itemviews/tableview-span-navigation/main.cpp +++ b/tests/manual/widgets/itemviews/tableview-span-navigation/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com> -// 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 <QApplication> #include <QStandardItemModel> diff --git a/tests/manual/widgets/kernel/CMakeLists.txt b/tests/manual/widgets/kernel/CMakeLists.txt index b4443fa3e2..c394151047 100644 --- a/tests/manual/widgets/kernel/CMakeLists.txt +++ b/tests/manual/widgets/kernel/CMakeLists.txt @@ -1,6 +1,7 @@ -# Generated from kernel.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause -# add_subdirectory(qtooltip) # special case broken in dev +# add_subdirectory(qtooltip) # TODO: broken in dev add_subdirectory(sizeonhide) add_subdirectory(layoutreplace) add_subdirectory(setscreen) diff --git a/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt b/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt index e6a54cfea3..7befd90454 100644 --- a/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt +++ b/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from layoutreplace.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## layoutreplace Binary: @@ -8,7 +9,7 @@ qt_internal_add_manual_test(layoutreplace GUI SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Widgets ) diff --git a/tests/manual/widgets/kernel/layoutreplace/main.cpp b/tests/manual/widgets/kernel/layoutreplace/main.cpp index e01b40a8b3..7d80efff8e 100644 --- a/tests/manual/widgets/kernel/layoutreplace/main.cpp +++ b/tests/manual/widgets/kernel/layoutreplace/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Thorbjørn Martsum - tmartsum[at]gmail.com -// 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 <QGridLayout> #include <QFormLayout> diff --git a/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt b/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt index bc076cf523..1ea3488ea3 100644 --- a/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt +++ b/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from qtooltip.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## qtooltip Binary: @@ -7,7 +8,7 @@ qt_internal_add_manual_test(qtooltip SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Test Qt::Widgets diff --git a/tests/manual/widgets/kernel/qtooltip/main.cpp b/tests/manual/widgets/kernel/qtooltip/main.cpp index f3600e0a1f..245738fb58 100644 --- a/tests/manual/widgets/kernel/qtooltip/main.cpp +++ b/tests/manual/widgets/kernel/qtooltip/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Thorbjørn Lund Martsum - tmartsum[at]gmail.com -// 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 <QTest> #include <QDialog> diff --git a/tests/manual/widgets/kernel/setscreen/CMakeLists.txt b/tests/manual/widgets/kernel/setscreen/CMakeLists.txt index 6754450481..12123107f4 100644 --- a/tests/manual/widgets/kernel/setscreen/CMakeLists.txt +++ b/tests/manual/widgets/kernel/setscreen/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from setscreen.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## setscreen Binary: @@ -8,10 +9,7 @@ qt_internal_add_manual_test(setscreen GUI SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Widgets ) - -#### Keys ignored in scope 1:.:.:setscreen.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/widgets/kernel/setscreen/main.cpp b/tests/manual/widgets/kernel/setscreen/main.cpp index 8c847d2b92..3610c9ff35 100644 --- a/tests/manual/widgets/kernel/setscreen/main.cpp +++ b/tests/manual/widgets/kernel/setscreen/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2020 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 <QtWidgets> diff --git a/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt b/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt index f1b420f1b2..e98c131f96 100644 --- a/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt +++ b/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from sizeonhide.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## sizeonhide Binary: @@ -8,11 +9,8 @@ qt_internal_add_manual_test(sizeonhide GUI SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::Gui Qt::Widgets ) - -#### Keys ignored in scope 1:.:.:sizeonhide.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/widgets/kernel/sizeonhide/main.cpp b/tests/manual/widgets/kernel/sizeonhide/main.cpp index 671da034e3..a20e6d3827 100644 --- a/tests/manual/widgets/kernel/sizeonhide/main.cpp +++ b/tests/manual/widgets/kernel/sizeonhide/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2013 Thorbjørn Martsum - tmartsum[at]gmail.com -// 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 <QtWidgets> diff --git a/tests/manual/widgets/qgraphicsview/CMakeLists.txt b/tests/manual/widgets/qgraphicsview/CMakeLists.txt index 5fd7e47ccd..4d79d7db57 100644 --- a/tests/manual/widgets/qgraphicsview/CMakeLists.txt +++ b/tests/manual/widgets/qgraphicsview/CMakeLists.txt @@ -1,3 +1,4 @@ -# Generated from qgraphicsview.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(rubberband) diff --git a/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt b/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt index 1e265eda2a..697e827991 100644 --- a/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt +++ b/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from rubberband.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## rubberband Binary: @@ -8,10 +9,7 @@ qt_internal_add_manual_test(rubberband GUI SOURCES rubberbandtest.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Widgets ) - -#### Keys ignored in scope 1:.:.:rubberband.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp b/tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp index 727c6d4c88..8a4c57e63d 100644 --- a/tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp +++ b/tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2012 Thorbjørn Lund Martsum - tmartsum[at]gmail.com -// 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 <QtWidgets> diff --git a/tests/manual/widgets/styles/CMakeLists.txt b/tests/manual/widgets/styles/CMakeLists.txt index c134472355..c417236c5d 100644 --- a/tests/manual/widgets/styles/CMakeLists.txt +++ b/tests/manual/widgets/styles/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from styles.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_manual_styles Binary: @@ -7,9 +8,6 @@ qt_internal_add_manual_test(tst_manual_styles SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Widgets ) - -#### Keys ignored in scope 1:.:.:styles.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/widgets/styles/main.cpp b/tests/manual/widgets/styles/main.cpp index 25802eb5b2..89050b90e1 100644 --- a/tests/manual/widgets/styles/main.cpp +++ b/tests/manual/widgets/styles/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 <QAction> #include <QApplication> diff --git a/tests/manual/widgets/widgets/CMakeLists.txt b/tests/manual/widgets/widgets/CMakeLists.txt index 446a3dfb03..b4477ce00a 100644 --- a/tests/manual/widgets/widgets/CMakeLists.txt +++ b/tests/manual/widgets/widgets/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from widgets.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(bigmenucreator) add_subdirectory(defaultUpMenuBar) diff --git a/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt b/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt index c44d839714..92557ec622 100644 --- a/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt +++ b/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from bigmenucreator.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## BigMenuCreator Binary: @@ -11,12 +12,9 @@ qt_internal_add_manual_test(BigMenuCreator mainwindow.cpp mainwindow.h mainwindow.ui DEFINES QT_DEPRECATED_WARNINGS - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Widgets ENABLE_AUTOGEN_TOOLS uic ) - -#### Keys ignored in scope 1:.:.:bigmenucreator.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro b/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro index 408dab6482..d5dbe729b9 100644 --- a/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro +++ b/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro @@ -18,7 +18,7 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also make your code fail to compile if you use deprecated APIs. # In order to do so, uncomment the following line. # You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 +#DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0x060000 # disables all APIs deprecated in Qt 6.0.0 and earlier SOURCES += \ 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 7e973fdcf2..8c40824284 100644 --- a/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt +++ b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from defaultUpMenuBar.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## defaultUpMenuBar Binary: @@ -8,11 +9,8 @@ qt_internal_add_manual_test(defaultUpMenuBar GUI SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui 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 b5e97479fb..b1aab749d7 100644 --- a/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt +++ b/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from multiscreen-menus.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## multiscreen-menus Binary: @@ -9,12 +10,9 @@ qt_internal_add_manual_test(multiscreen-menus SOURCES main.cpp mainwindow.cpp mainwindow.h mainwindow.ui - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Widgets 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 183855d6b2..a5eb676d69 100644 --- a/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt +++ b/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from saveStateSize.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## saveStateSize Binary: @@ -8,10 +9,7 @@ qt_internal_add_manual_test(saveStateSize GUI SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES 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 2b8b71eb44..56345e2797 100644 --- a/tests/manual/widgets/widgets/qtabbar/CMakeLists.txt +++ b/tests/manual/widgets/widgets/qtabbar/CMakeLists.txt @@ -1,14 +1,4 @@ -# Generated from qtabbar.pro. +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause -##################################################################### -## qtabbar Binary: -##################################################################### - -qt_internal_add_manual_test(qtabbar - GUI - PUBLIC_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 f1a4a13462..8f9e46d098 100644 --- a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt +++ b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from menuOnMultiScreens.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## menuOnMultiScreens Binary: @@ -8,10 +9,7 @@ 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 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 |