From 7d1cda9de3e88db33696675c9723209d0f876cdb Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 29 Jan 2021 18:56:54 +0100 Subject: Remove qmake project files for benchmarks Also remove tests/tests.pro that would be empty without the benchmarks. Change-Id: Iaf92a729d1286b3e0c03bf9f877b59e1d83708e6 Reviewed-by: Alexey Edelev Reviewed-by: Edward Welbourne --- .../GraphicsViewBenchmark.pro | 70 ---------------------- .../widgets/itemrecyclinglist.pri | 19 ------ .../widgets/graphicsview/functional/functional.pro | 4 -- .../widgets/graphicsview/graphicsview.pro | 10 ---- .../qgraphicsanchorlayout.pro | 7 --- .../graphicsview/qgraphicsitem/qgraphicsitem.pro | 6 -- .../qgraphicslayout/qgraphicslayout.pro | 5 -- .../qgraphicslinearlayout.pro | 5 -- .../graphicsview/qgraphicsscene/qgraphicsscene.pro | 7 --- .../qgraphicsview/benchapps/chipTest/chip.pro | 19 ------ .../benchapps/moveItems/moveItems.pro | 1 - .../benchapps/scrolltest/scrolltest.pro | 1 - .../qgraphicsview/chiptester/chiptester.pri | 13 ---- .../graphicsview/qgraphicsview/qgraphicsview.pro | 9 --- .../qgraphicswidget/qgraphicswidget.pro | 6 -- tests/benchmarks/widgets/itemviews/itemviews.pro | 5 -- .../widgets/itemviews/qheaderview/qheaderview.pro | 7 --- .../widgets/itemviews/qlistview/qlistview.pro | 7 --- .../widgets/itemviews/qtableview/qtableview.pro | 7 --- tests/benchmarks/widgets/kernel/kernel.pro | 4 -- .../widgets/kernel/qapplication/qapplication.pro | 8 --- .../benchmarks/widgets/kernel/qwidget/qwidget.pro | 4 -- .../styles/qstylesheetstyle/qstylesheetstyle.pro | 7 --- tests/benchmarks/widgets/styles/styles.pro | 3 - tests/benchmarks/widgets/widgets.pro | 13 ---- .../widgets/widgets/qtextbrowser/qtextbrowser.pro | 6 -- tests/benchmarks/widgets/widgets/widgets.pro | 3 - 27 files changed, 256 deletions(-) delete mode 100644 tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro delete mode 100644 tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.pri delete mode 100644 tests/benchmarks/widgets/graphicsview/functional/functional.pro delete mode 100644 tests/benchmarks/widgets/graphicsview/graphicsview.pro delete mode 100644 tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro delete mode 100644 tests/benchmarks/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro delete mode 100644 tests/benchmarks/widgets/graphicsview/qgraphicslayout/qgraphicslayout.pro delete mode 100644 tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro delete mode 100644 tests/benchmarks/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro delete mode 100644 tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro delete mode 100644 tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/moveItems/moveItems.pro delete mode 100644 tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/scrolltest/scrolltest.pro delete mode 100644 tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.pri delete mode 100644 tests/benchmarks/widgets/graphicsview/qgraphicsview/qgraphicsview.pro delete mode 100644 tests/benchmarks/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro delete mode 100644 tests/benchmarks/widgets/itemviews/itemviews.pro delete mode 100644 tests/benchmarks/widgets/itemviews/qheaderview/qheaderview.pro delete mode 100644 tests/benchmarks/widgets/itemviews/qlistview/qlistview.pro delete mode 100644 tests/benchmarks/widgets/itemviews/qtableview/qtableview.pro delete mode 100644 tests/benchmarks/widgets/kernel/kernel.pro delete mode 100644 tests/benchmarks/widgets/kernel/qapplication/qapplication.pro delete mode 100644 tests/benchmarks/widgets/kernel/qwidget/qwidget.pro delete mode 100644 tests/benchmarks/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro delete mode 100644 tests/benchmarks/widgets/styles/styles.pro delete mode 100644 tests/benchmarks/widgets/widgets.pro delete mode 100644 tests/benchmarks/widgets/widgets/qtextbrowser/qtextbrowser.pro delete mode 100644 tests/benchmarks/widgets/widgets/widgets.pro (limited to 'tests/benchmarks/widgets') diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro deleted file mode 100644 index addb60433b..0000000000 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro +++ /dev/null @@ -1,70 +0,0 @@ -TEMPLATE = app - -QT += svg testlib -qtHaveModule(opengl): QT += opengl openglwidgets - -HEADERS += widgets/gvbwidget.h \ - widgets/abstractscrollarea.h \ - widgets/mainview.h \ - widgets/iconitem.h \ - widgets/label.h \ - widgets/listitem.h \ - widgets/scrollbar.h \ - widgets/simplelistview.h \ - widgets/scroller.h \ - widgets/scroller_p.h \ - widgets/button.h \ - widgets/menu.h \ - widgets/themeevent.h \ - widgets/theme.h \ - widgets/backgrounditem.h \ - widgets/topbar.h \ - widgets/commandline.h \ - widgets/dummydatagen.h \ - widgets/settings.h \ - widgets/listitemcache.h \ - widgets/listwidget.h \ - widgets/simplelist.h \ - widgets/itemrecyclinglist.h \ - widgets/itemrecyclinglistview.h \ - widgets/abstractitemview.h \ - widgets/abstractviewitem.h \ - widgets/recycledlistitem.h \ - widgets/listitemcontainer.h \ - widgets/abstractitemcontainer.h \ - widgets/listmodel.h - -SOURCES += main.cpp \ - widgets/gvbwidget.cpp \ - widgets/abstractscrollarea.cpp \ - widgets/mainview.cpp \ - widgets/iconitem.cpp \ - widgets/label.cpp \ - widgets/listitem.cpp \ - widgets/scrollbar.cpp \ - widgets/simplelistview.cpp \ - widgets/scroller.cpp \ - widgets/button.cpp \ - widgets/menu.cpp \ - widgets/themeevent.cpp \ - widgets/theme.cpp \ - widgets/backgrounditem.cpp \ - widgets/topbar.cpp \ - widgets/commandline.cpp \ - widgets/dummydatagen.cpp \ - widgets/settings.cpp \ - widgets/listitemcache.cpp \ - widgets/listwidget.cpp \ - widgets/simplelist.cpp \ - widgets/itemrecyclinglist.cpp \ - widgets/itemrecyclinglistview.cpp \ - widgets/abstractitemview.cpp \ - widgets/abstractviewitem.cpp \ - widgets/recycledlistitem.cpp \ - widgets/listitemcontainer.cpp \ - widgets/abstractitemcontainer.cpp \ - widgets/listmodel.cpp - -TARGET = tst_GraphicsViewBenchmark -RESOURCES += GraphicsViewBenchmark.qrc -INCLUDEPATH += widgets diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.pri b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.pri deleted file mode 100644 index 55b551ef8f..0000000000 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.pri +++ /dev/null @@ -1,19 +0,0 @@ -HEADERS += $$ROOTDIR/tests/itemrecyclinglist/itemrecyclinglist.h \ - $$ROOTDIR/tests/itemrecyclinglist/itemrecyclinglistview.h \ - $$ROOTDIR/tests/itemrecyclinglist/abstractitemview.h \ - $$ROOTDIR/tests/itemrecyclinglist/abstractviewitem.h \ - $$ROOTDIR/tests/itemrecyclinglist/recycledlistitem.h \ - $$ROOTDIR/tests/itemrecyclinglist/listitemcontainer.h \ - $$ROOTDIR/tests/itemrecyclinglist/abstractitemcontainer.h \ - $$ROOTDIR/tests/itemrecyclinglist/listmodel.h - -SOURCES += $$ROOTDIR/tests/itemrecyclinglist/itemrecyclinglist.cpp \ - $$ROOTDIR/tests/itemrecyclinglist/itemrecyclinglistview.cpp \ - $$ROOTDIR/tests/itemrecyclinglist/abstractitemview.cpp \ - $$ROOTDIR/tests/itemrecyclinglist/abstractviewitem.cpp \ - $$ROOTDIR/tests/itemrecyclinglist/recycledlistitem.cpp \ - $$ROOTDIR/tests/itemrecyclinglist/listitemcontainer.cpp \ - $$ROOTDIR/tests/itemrecyclinglist/abstractitemcontainer.cpp \ - $$ROOTDIR/tests/itemrecyclinglist/listmodel.cpp - -INCLUDEPATH += $$ROOTDIR/tests/itemrecyclinglist diff --git a/tests/benchmarks/widgets/graphicsview/functional/functional.pro b/tests/benchmarks/widgets/graphicsview/functional/functional.pro deleted file mode 100644 index 3c2979448b..0000000000 --- a/tests/benchmarks/widgets/graphicsview/functional/functional.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = \ - #GraphicsViewBenchmark # FIXME: cannot be compiled by default as part of qtbase, - # since it depends on qtsvg diff --git a/tests/benchmarks/widgets/graphicsview/graphicsview.pro b/tests/benchmarks/widgets/graphicsview/graphicsview.pro deleted file mode 100644 index 8344cd4edf..0000000000 --- a/tests/benchmarks/widgets/graphicsview/graphicsview.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = \ - functional \ - qgraphicsanchorlayout \ - qgraphicsitem \ - qgraphicslayout \ - qgraphicslinearlayout \ - qgraphicsscene \ - qgraphicsview \ - qgraphicswidget diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro b/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro deleted file mode 100644 index 01c0dbd653..0000000000 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro +++ /dev/null @@ -1,7 +0,0 @@ -QT += widgets testlib - -TEMPLATE = app -TARGET = tst_bench_qgraphicsanchorlayout - -SOURCES += tst_qgraphicsanchorlayout.cpp - diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro b/tests/benchmarks/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro deleted file mode 100644 index 461ec13263..0000000000 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro +++ /dev/null @@ -1,6 +0,0 @@ -QT += widgets testlib - -TEMPLATE = app -TARGET = tst_bench_qgraphicsitem - -SOURCES += tst_qgraphicsitem.cpp diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicslayout/qgraphicslayout.pro b/tests/benchmarks/widgets/graphicsview/qgraphicslayout/qgraphicslayout.pro deleted file mode 100644 index a20d9e0921..0000000000 --- a/tests/benchmarks/widgets/graphicsview/qgraphicslayout/qgraphicslayout.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = app -TARGET = tst_bench_qgraphicslayout -QT += testlib widgets -SOURCES += tst_qgraphicslayout.cpp - diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro b/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro deleted file mode 100644 index e9a9e9353e..0000000000 --- a/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = app -TARGET = tst_bench_qgraphicslinearlayout -QT += testlib widgets -SOURCES += tst_qgraphicslinearlayout.cpp - diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro b/tests/benchmarks/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro deleted file mode 100644 index 769f84423e..0000000000 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro +++ /dev/null @@ -1,7 +0,0 @@ -QT += widgets testlib - -TEMPLATE = app -TARGET = tst_bench_qgraphicsscene - -SOURCES += tst_qgraphicsscene.cpp - diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro deleted file mode 100644 index 8ef79cef23..0000000000 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro +++ /dev/null @@ -1,19 +0,0 @@ -RESOURCES += images.qrc - -HEADERS += mainwindow.h view.h chip.h -SOURCES += main.cpp -SOURCES += mainwindow.cpp view.cpp chip.cpp - -qtHaveModule(opengl): QT += opengl - -build_all:!build_pass { - CONFIG -= build_all - CONFIG += release -} - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/chip -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images -sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/chip -INSTALLS += target sources - diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/moveItems/moveItems.pro b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/moveItems/moveItems.pro deleted file mode 100644 index 28dcadcbfa..0000000000 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/moveItems/moveItems.pro +++ /dev/null @@ -1 +0,0 @@ -SOURCES += main.cpp diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/scrolltest/scrolltest.pro b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/scrolltest/scrolltest.pro deleted file mode 100644 index 28dcadcbfa..0000000000 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/scrolltest/scrolltest.pro +++ /dev/null @@ -1 +0,0 @@ -SOURCES += main.cpp diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.pri b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.pri deleted file mode 100644 index 105117de30..0000000000 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.pri +++ /dev/null @@ -1,13 +0,0 @@ -SOURCES += \ - chiptester/chiptester.cpp \ - chiptester/chip.cpp - -HEADERS += \ - chiptester/chiptester.h \ - chiptester/chip.h - -RESOURCES += \ - chiptester/images.qrc - -QT += widgets -qtHaveModule(opengl): QT += opengl diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/qgraphicsview.pro b/tests/benchmarks/widgets/graphicsview/qgraphicsview/qgraphicsview.pro deleted file mode 100644 index 3d48959f3c..0000000000 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/qgraphicsview.pro +++ /dev/null @@ -1,9 +0,0 @@ -QT += widgets testlib - -TEMPLATE = app -TARGET = tst_bench_qgraphicsview - -SOURCES += tst_qgraphicsview.cpp -RESOURCES += qgraphicsview.qrc - -include(chiptester/chiptester.pri) diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro b/tests/benchmarks/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro deleted file mode 100644 index 00becec216..0000000000 --- a/tests/benchmarks/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro +++ /dev/null @@ -1,6 +0,0 @@ -QT += widgets testlib - -TEMPLATE = app -TARGET = tst_bench_qgraphicswidget - -SOURCES += tst_qgraphicswidget.cpp diff --git a/tests/benchmarks/widgets/itemviews/itemviews.pro b/tests/benchmarks/widgets/itemviews/itemviews.pro deleted file mode 100644 index 0c3256f307..0000000000 --- a/tests/benchmarks/widgets/itemviews/itemviews.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = \ - qtableview \ - qheaderview \ - qlistview diff --git a/tests/benchmarks/widgets/itemviews/qheaderview/qheaderview.pro b/tests/benchmarks/widgets/itemviews/qheaderview/qheaderview.pro deleted file mode 100644 index 7e8415e495..0000000000 --- a/tests/benchmarks/widgets/itemviews/qheaderview/qheaderview.pro +++ /dev/null @@ -1,7 +0,0 @@ -QT += widgets testlib - -TEMPLATE = app -TARGET = tst_bench_qheaderview - -SOURCES += qheaderviewbench.cpp - diff --git a/tests/benchmarks/widgets/itemviews/qlistview/qlistview.pro b/tests/benchmarks/widgets/itemviews/qlistview/qlistview.pro deleted file mode 100644 index 68537d09ea..0000000000 --- a/tests/benchmarks/widgets/itemviews/qlistview/qlistview.pro +++ /dev/null @@ -1,7 +0,0 @@ -QT += widgets testlib - -TEMPLATE = app -TARGET = tst_bench_qlistview - -SOURCES += tst_qlistview.cpp - diff --git a/tests/benchmarks/widgets/itemviews/qtableview/qtableview.pro b/tests/benchmarks/widgets/itemviews/qtableview/qtableview.pro deleted file mode 100644 index bd2306d646..0000000000 --- a/tests/benchmarks/widgets/itemviews/qtableview/qtableview.pro +++ /dev/null @@ -1,7 +0,0 @@ -QT += widgets testlib - -TEMPLATE = app -TARGET = tst_bench_qtableview - -SOURCES += tst_qtableview.cpp - diff --git a/tests/benchmarks/widgets/kernel/kernel.pro b/tests/benchmarks/widgets/kernel/kernel.pro deleted file mode 100644 index a50aad2014..0000000000 --- a/tests/benchmarks/widgets/kernel/kernel.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = \ - qapplication \ - qwidget diff --git a/tests/benchmarks/widgets/kernel/qapplication/qapplication.pro b/tests/benchmarks/widgets/kernel/qapplication/qapplication.pro deleted file mode 100644 index 86a016d42e..0000000000 --- a/tests/benchmarks/widgets/kernel/qapplication/qapplication.pro +++ /dev/null @@ -1,8 +0,0 @@ -QT += widgets testlib - -TEMPLATE = app -TARGET = tst_bench_qapplication - -CONFIG += release - -SOURCES += main.cpp diff --git a/tests/benchmarks/widgets/kernel/qwidget/qwidget.pro b/tests/benchmarks/widgets/kernel/qwidget/qwidget.pro deleted file mode 100644 index 758c9c5b98..0000000000 --- a/tests/benchmarks/widgets/kernel/qwidget/qwidget.pro +++ /dev/null @@ -1,4 +0,0 @@ -QT += widgets testlib - -TARGET = tst_bench_qwidget -SOURCES += tst_qwidget.cpp diff --git a/tests/benchmarks/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro b/tests/benchmarks/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro deleted file mode 100644 index 5aef3520c0..0000000000 --- a/tests/benchmarks/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = app -QT += widgets testlib -TARGET = tst_bench_qstylesheetstyle - -CONFIG += release - -SOURCES += main.cpp diff --git a/tests/benchmarks/widgets/styles/styles.pro b/tests/benchmarks/widgets/styles/styles.pro deleted file mode 100644 index 2c1d10b48c..0000000000 --- a/tests/benchmarks/widgets/styles/styles.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -qtHaveModule(widgets): SUBDIRS = \ - qstylesheetstyle diff --git a/tests/benchmarks/widgets/widgets.pro b/tests/benchmarks/widgets/widgets.pro deleted file mode 100644 index d241e31d0b..0000000000 --- a/tests/benchmarks/widgets/widgets.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = \ - graphicsview \ - itemviews \ - kernel \ - styles \ - widgets \ - -TRUSTED_BENCHMARKS += \ - graphicsview/functional/GraphicsViewBenchmark \ - graphicsview/qgraphicsview - -include(../trusted-benchmarks.pri) diff --git a/tests/benchmarks/widgets/widgets/qtextbrowser/qtextbrowser.pro b/tests/benchmarks/widgets/widgets/qtextbrowser/qtextbrowser.pro deleted file mode 100644 index d4a533b335..0000000000 --- a/tests/benchmarks/widgets/widgets/qtextbrowser/qtextbrowser.pro +++ /dev/null @@ -1,6 +0,0 @@ -QT += testlib widgets - -TEMPLATE = app -TARGET = tst_bench_QTextBrowser - -SOURCES += main.cpp diff --git a/tests/benchmarks/widgets/widgets/widgets.pro b/tests/benchmarks/widgets/widgets/widgets.pro deleted file mode 100644 index 593413a770..0000000000 --- a/tests/benchmarks/widgets/widgets/widgets.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = \ - qtextbrowser \ -- cgit v1.2.3