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 --- tests/benchmarks/corelib/kernel/events/CMakeLists.txt | 2 +- tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt | 2 +- tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt | 2 +- tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt | 2 +- tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt | 2 +- tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt | 2 +- tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/benchmarks/corelib/kernel') diff --git a/tests/benchmarks/corelib/kernel/events/CMakeLists.txt b/tests/benchmarks/corelib/kernel/events/CMakeLists.txt index e9c5cc694a..41add9350e 100644 --- a/tests/benchmarks/corelib/kernel/events/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/events/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_events Binary: ##################################################################### -qt_add_benchmark(tst_bench_events +qt_internal_add_benchmark(tst_bench_events SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt index c0d0562869..1618997909 100644 --- a/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qcoreapplication Binary: ##################################################################### -qt_add_benchmark(tst_bench_qcoreapplication +qt_internal_add_benchmark(tst_bench_qcoreapplication SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt index 8f7dd52376..db4c3ab12e 100644 --- a/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmetaobject Binary: ##################################################################### -qt_add_benchmark(tst_bench_qmetaobject +qt_internal_add_benchmark(tst_bench_qmetaobject SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt index ad63d9d8c8..ae4bc9c906 100644 --- a/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmetatype Binary: ##################################################################### -qt_add_benchmark(tst_bench_qmetatype +qt_internal_add_benchmark(tst_bench_qmetatype SOURCES tst_qmetatype.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt index 92cffc2980..ce834905b0 100644 --- a/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qobject Binary: ##################################################################### -qt_add_benchmark(tst_bench_qobject +qt_internal_add_benchmark(tst_bench_qobject SOURCES main.cpp object.cpp object.h diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt index 2619d89779..5ba14e43a2 100644 --- a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtimer_vs_qmetaobject Binary: ##################################################################### -qt_add_benchmark(qtimer_vs_qmetaobject +qt_internal_add_benchmark(qtimer_vs_qmetaobject SOURCES tst_qtimer_vs_qmetaobject.cpp INCLUDE_DIRECTORIES diff --git a/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt index f5104b11ff..418fd1da9f 100644 --- a/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qvariant Binary: ##################################################################### -qt_add_benchmark(tst_bench_qvariant +qt_internal_add_benchmark(tst_bench_qvariant SOURCES tst_qvariant.cpp PUBLIC_LIBRARIES @@ -15,7 +15,7 @@ qt_add_benchmark(tst_bench_qvariant ## Scopes: ##################################################################### -qt_extend_target(tst_bench_qvariant CONDITION NOT TARGET Qt::Gui +qt_internal_extend_target(tst_bench_qvariant CONDITION NOT TARGET Qt::Gui PUBLIC_LIBRARIES # Remove: gui ) -- cgit v1.2.3