From 403213240c7b2dc09378e1cb8c147131e368f90c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 22 Sep 2020 10:16:58 +0200 Subject: CMake: Regenerate projects to use new qt_internal_ API Modify special case locations to use the new API as well. Clean up some stale .prev files that are not needed anymore. Clean up some project files that are not used anymore. Task-number: QTBUG-86815 Change-Id: I9947da921f98686023c6bb053dfcc101851276b5 Reviewed-by: Joerg Bornemann Reviewed-by: Qt CI Bot --- .../functional/GraphicsViewBenchmark/CMakeLists.txt | 12 ++++++------ .../graphicsview/qgraphicsanchorlayout/CMakeLists.txt | 2 +- .../widgets/graphicsview/qgraphicsitem/CMakeLists.txt | 2 +- .../widgets/graphicsview/qgraphicslayout/CMakeLists.txt | 2 +- .../graphicsview/qgraphicslinearlayout/CMakeLists.txt | 2 +- .../widgets/graphicsview/qgraphicsscene/CMakeLists.txt | 2 +- .../widgets/graphicsview/qgraphicsview/CMakeLists.txt | 8 ++++---- .../qgraphicsview/benchapps/chipTest/CMakeLists.txt | 6 +++--- .../qgraphicsview/benchapps/moveItems/CMakeLists.txt | 2 +- .../qgraphicsview/benchapps/scrolltest/CMakeLists.txt | 2 +- .../widgets/graphicsview/qgraphicswidget/CMakeLists.txt | 2 +- .../benchmarks/widgets/itemviews/qheaderview/CMakeLists.txt | 2 +- tests/benchmarks/widgets/itemviews/qlistview/CMakeLists.txt | 2 +- tests/benchmarks/widgets/itemviews/qtableview/CMakeLists.txt | 2 +- tests/benchmarks/widgets/kernel/qapplication/CMakeLists.txt | 2 +- tests/benchmarks/widgets/kernel/qwidget/CMakeLists.txt | 2 +- .../widgets/styles/qstylesheetstyle/CMakeLists.txt | 2 +- tests/benchmarks/widgets/widgets/qtextbrowser/CMakeLists.txt | 2 +- 18 files changed, 28 insertions(+), 28 deletions(-) (limited to 'tests/benchmarks/widgets') diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt index 3bdb724fae..491b7fc6d1 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_GraphicsViewBenchmark Binary: ##################################################################### -qt_add_benchmark(tst_GraphicsViewBenchmark +qt_internal_add_benchmark(tst_GraphicsViewBenchmark SOURCES main.cpp widgets/abstractitemcontainer.cpp widgets/abstractitemcontainer.h @@ -124,7 +124,7 @@ set(GraphicsViewBenchmark_resource_files "resources/blue_SVG/blue_user_status_online_38x38px.svg" ) -qt_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark" +qt_internal_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark" PREFIX "/themes/blue" FILES @@ -213,7 +213,7 @@ set(GraphicsViewBenchmark1_resource_files "resources/lime_SVG/lime_user_status_online_24x24px.svg" ) -qt_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark1" +qt_internal_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark1" PREFIX "/themes/lime" FILES @@ -322,7 +322,7 @@ set(GraphicsViewBenchmark2_resource_files "resources/avatars/avatar_woman_010_58x58.png" ) -qt_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark2" +qt_internal_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark2" PREFIX "/avatars" FILES @@ -347,7 +347,7 @@ set(GraphicsViewBenchmark3_resource_files "resources/contacts/lastnames.txt" ) -qt_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark3" +qt_internal_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark3" PREFIX "/contact" FILES @@ -361,7 +361,7 @@ qt_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark3" ## Scopes: ##################################################################### -qt_extend_target(tst_GraphicsViewBenchmark CONDITION TARGET Qt::OpenGL +qt_internal_extend_target(tst_GraphicsViewBenchmark CONDITION TARGET Qt::OpenGL PUBLIC_LIBRARIES Qt::OpenGL Qt::OpenGLWidgets diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt index 4355be1f99..eca0a60d0d 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qgraphicsanchorlayout Binary: ##################################################################### -qt_add_benchmark(tst_bench_qgraphicsanchorlayout +qt_internal_add_benchmark(tst_bench_qgraphicsanchorlayout SOURCES tst_qgraphicsanchorlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsitem/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsitem/CMakeLists.txt index e32fd82819..e5d19ceb24 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsitem/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsitem/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qgraphicsitem Binary: ##################################################################### -qt_add_benchmark(tst_bench_qgraphicsitem +qt_internal_add_benchmark(tst_bench_qgraphicsitem SOURCES tst_qgraphicsitem.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicslayout/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicslayout/CMakeLists.txt index aa25f356ca..5e50712496 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicslayout/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicslayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qgraphicslayout Binary: ##################################################################### -qt_add_benchmark(tst_bench_qgraphicslayout +qt_internal_add_benchmark(tst_bench_qgraphicslayout SOURCES tst_qgraphicslayout.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt index 5d682dcdde..247ca92eff 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qgraphicslinearlayout Binary: ##################################################################### -qt_add_benchmark(tst_bench_qgraphicslinearlayout +qt_internal_add_benchmark(tst_bench_qgraphicslinearlayout SOURCES tst_qgraphicslinearlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsscene/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsscene/CMakeLists.txt index 682fb1acae..4ac043e058 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsscene/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsscene/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qgraphicsscene Binary: ##################################################################### -qt_add_benchmark(tst_bench_qgraphicsscene +qt_internal_add_benchmark(tst_bench_qgraphicsscene SOURCES tst_qgraphicsscene.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt index a86f236664..178e5dc125 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qgraphicsview Binary: ##################################################################### -qt_add_benchmark(tst_bench_qgraphicsview +qt_internal_add_benchmark(tst_bench_qgraphicsview SOURCES chiptester/chip.cpp chiptester/chip.h chiptester/chiptester.cpp chiptester/chiptester.h @@ -23,7 +23,7 @@ set(qgraphicsview_resource_files "random.data" ) -qt_add_resource(tst_bench_qgraphicsview "qgraphicsview" +qt_internal_add_resource(tst_bench_qgraphicsview "qgraphicsview" PREFIX "/" FILES @@ -33,7 +33,7 @@ set(images_resource_files "qt4logo.png" ) -qt_add_resource(tst_bench_qgraphicsview "images" +qt_internal_add_resource(tst_bench_qgraphicsview "images" PREFIX "/" BASE @@ -49,7 +49,7 @@ qt_add_resource(tst_bench_qgraphicsview "images" ## Scopes: ##################################################################### -qt_extend_target(tst_bench_qgraphicsview CONDITION TARGET Qt::OpenGL +qt_internal_extend_target(tst_bench_qgraphicsview CONDITION TARGET Qt::OpenGL PUBLIC_LIBRARIES Qt::OpenGL ) diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/CMakeLists.txt index ae5a17f020..c3a708a56c 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/CMakeLists.txt @@ -4,7 +4,7 @@ ## chip Binary: ##################################################################### -qt_add_benchmark(chip +qt_internal_add_benchmark(chip GUI SOURCES chip.cpp chip.h @@ -25,7 +25,7 @@ set(images_resource_files "zoomout.png" ) -qt_add_resource(chip "images" +qt_internal_add_resource(chip "images" PREFIX "/" FILES @@ -42,7 +42,7 @@ qt_add_resource(chip "images" ## Scopes: ##################################################################### -qt_extend_target(chip CONDITION TARGET Qt::OpenGL +qt_internal_extend_target(chip CONDITION TARGET Qt::OpenGL PUBLIC_LIBRARIES Qt::OpenGL ) diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/moveItems/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/moveItems/CMakeLists.txt index 6b7867a7cb..82f665c4d4 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/moveItems/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/moveItems/CMakeLists.txt @@ -4,7 +4,7 @@ ## moveItems Binary: ##################################################################### -qt_add_benchmark(moveItems +qt_internal_add_benchmark(moveItems GUI SOURCES main.cpp diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/scrolltest/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/scrolltest/CMakeLists.txt index 716fc03774..f30ca15082 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/scrolltest/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/scrolltest/CMakeLists.txt @@ -4,7 +4,7 @@ ## scrolltest Binary: ##################################################################### -qt_add_benchmark(scrolltest +qt_internal_add_benchmark(scrolltest GUI SOURCES main.cpp diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicswidget/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicswidget/CMakeLists.txt index 2646da95fc..f2c32fbb78 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicswidget/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicswidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qgraphicswidget Binary: ##################################################################### -qt_add_benchmark(tst_bench_qgraphicswidget +qt_internal_add_benchmark(tst_bench_qgraphicswidget SOURCES tst_qgraphicswidget.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/itemviews/qheaderview/CMakeLists.txt b/tests/benchmarks/widgets/itemviews/qheaderview/CMakeLists.txt index 8271ff9df3..74fa7a37ed 100644 --- a/tests/benchmarks/widgets/itemviews/qheaderview/CMakeLists.txt +++ b/tests/benchmarks/widgets/itemviews/qheaderview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qheaderview Binary: ##################################################################### -qt_add_benchmark(tst_bench_qheaderview +qt_internal_add_benchmark(tst_bench_qheaderview SOURCES qheaderviewbench.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/itemviews/qlistview/CMakeLists.txt b/tests/benchmarks/widgets/itemviews/qlistview/CMakeLists.txt index 0e8dcd01bc..0a9a89f7cb 100644 --- a/tests/benchmarks/widgets/itemviews/qlistview/CMakeLists.txt +++ b/tests/benchmarks/widgets/itemviews/qlistview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qlistview Binary: ##################################################################### -qt_add_benchmark(tst_bench_qlistview +qt_internal_add_benchmark(tst_bench_qlistview SOURCES tst_qlistview.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/itemviews/qtableview/CMakeLists.txt b/tests/benchmarks/widgets/itemviews/qtableview/CMakeLists.txt index 0245ba6d47..9fecbeb232 100644 --- a/tests/benchmarks/widgets/itemviews/qtableview/CMakeLists.txt +++ b/tests/benchmarks/widgets/itemviews/qtableview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtableview Binary: ##################################################################### -qt_add_benchmark(tst_bench_qtableview +qt_internal_add_benchmark(tst_bench_qtableview SOURCES tst_qtableview.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/kernel/qapplication/CMakeLists.txt b/tests/benchmarks/widgets/kernel/qapplication/CMakeLists.txt index 7cb2318d7d..a89faa0c0e 100644 --- a/tests/benchmarks/widgets/kernel/qapplication/CMakeLists.txt +++ b/tests/benchmarks/widgets/kernel/qapplication/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qapplication Binary: ##################################################################### -qt_add_benchmark(tst_bench_qapplication +qt_internal_add_benchmark(tst_bench_qapplication SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/kernel/qwidget/CMakeLists.txt b/tests/benchmarks/widgets/kernel/qwidget/CMakeLists.txt index 5eb2ea97d1..fcdffbf425 100644 --- a/tests/benchmarks/widgets/kernel/qwidget/CMakeLists.txt +++ b/tests/benchmarks/widgets/kernel/qwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qwidget Binary: ##################################################################### -qt_add_benchmark(tst_bench_qwidget +qt_internal_add_benchmark(tst_bench_qwidget SOURCES tst_qwidget.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/styles/qstylesheetstyle/CMakeLists.txt b/tests/benchmarks/widgets/styles/qstylesheetstyle/CMakeLists.txt index ca86f324b5..be43709be7 100644 --- a/tests/benchmarks/widgets/styles/qstylesheetstyle/CMakeLists.txt +++ b/tests/benchmarks/widgets/styles/qstylesheetstyle/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qstylesheetstyle Binary: ##################################################################### -qt_add_benchmark(tst_bench_qstylesheetstyle +qt_internal_add_benchmark(tst_bench_qstylesheetstyle SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/widgets/widgets/qtextbrowser/CMakeLists.txt b/tests/benchmarks/widgets/widgets/qtextbrowser/CMakeLists.txt index 5a6f419533..22c321d5bb 100644 --- a/tests/benchmarks/widgets/widgets/qtextbrowser/CMakeLists.txt +++ b/tests/benchmarks/widgets/widgets/qtextbrowser/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_QTextBrowser Binary: ##################################################################### -qt_add_benchmark(tst_bench_QTextBrowser +qt_internal_add_benchmark(tst_bench_QTextBrowser SOURCES main.cpp PUBLIC_LIBRARIES -- cgit v1.2.3