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/io/qdir/10000/CMakeLists.txt | 2 +- tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt | 4 ++-- tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt | 4 ++-- tests/benchmarks/corelib/io/qfile/CMakeLists.txt | 4 ++-- tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt | 2 +- tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt | 2 +- tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt | 2 +- .../io/qprocess/testProcessLoopback/.prev_CMakeLists.txt | 2 +- .../corelib/io/qprocess/testProcessLoopback/CMakeLists.txt | 2 +- tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt | 2 +- tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt | 2 +- tests/benchmarks/corelib/io/qurl/CMakeLists.txt | 4 ++-- tests/benchmarks/corelib/json/CMakeLists.txt | 2 +- tests/benchmarks/corelib/kernel/events/CMakeLists.txt | 2 +- .../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 +- .../corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt | 2 +- tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt | 4 ++-- .../corelib/mimetypes/qmimedatabase/CMakeLists.txt | 2 +- tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt | 2 +- tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt | 2 +- tests/benchmarks/corelib/text/qchar/CMakeLists.txt | 2 +- tests/benchmarks/corelib/text/qlocale/CMakeLists.txt | 2 +- tests/benchmarks/corelib/text/qstring/CMakeLists.txt | 2 +- tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt | 2 +- tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt | 2 +- tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt | 2 +- .../benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt | 2 +- tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt | 2 +- .../benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt | 2 +- .../benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt | 2 +- tests/benchmarks/corelib/time/qdate/CMakeLists.txt | 2 +- tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt | 2 +- tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt | 2 +- .../corelib/tools/containers-associative/CMakeLists.txt | 2 +- .../corelib/tools/containers-sequential/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qchar/CMakeLists.txt | 1 - .../benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt | 2 +- .../corelib/tools/qcryptographichash/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt | 1 - tests/benchmarks/corelib/tools/qhash/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qlist/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt | 1 - tests/benchmarks/corelib/tools/qmap/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qrect/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qset/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qstack/CMakeLists.txt | 2 +- tests/benchmarks/corelib/tools/qstring/CMakeLists.txt | 1 - tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt | 1 - tests/benchmarks/corelib/tools/qvector/CMakeLists.txt | 2 +- tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt | 2 +- tests/benchmarks/dbus/qdbusperformance/test/CMakeLists.txt | 2 +- tests/benchmarks/dbus/qdbustype/CMakeLists.txt | 6 +++--- tests/benchmarks/gui/animation/qanimation/CMakeLists.txt | 2 +- tests/benchmarks/gui/image/blendbench/CMakeLists.txt | 2 +- tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt | 6 +++--- tests/benchmarks/gui/image/qimagereader/CMakeLists.txt | 6 +++--- tests/benchmarks/gui/image/qimagescale/CMakeLists.txt | 2 +- tests/benchmarks/gui/image/qpixmap/CMakeLists.txt | 2 +- tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt | 2 +- tests/benchmarks/gui/kernel/qguimetatype/CMakeLists.txt | 2 +- tests/benchmarks/gui/kernel/qguivariant/CMakeLists.txt | 2 +- tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt | 2 +- tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt | 2 +- tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt | 2 +- tests/benchmarks/gui/painting/lancebench/CMakeLists.txt | 6 +++--- tests/benchmarks/gui/painting/qcolor/CMakeLists.txt | 2 +- tests/benchmarks/gui/painting/qpainter/CMakeLists.txt | 2 +- tests/benchmarks/gui/painting/qregion/CMakeLists.txt | 2 +- tests/benchmarks/gui/painting/qtbench/CMakeLists.txt | 2 +- tests/benchmarks/gui/painting/qtransform/CMakeLists.txt | 2 +- tests/benchmarks/gui/text/qfontmetrics/CMakeLists.txt | 2 +- tests/benchmarks/gui/text/qtext/CMakeLists.txt | 2 +- tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt | 2 +- .../network/access/qdecompresshelper/.prev_CMakeLists.txt | 2 +- .../network/access/qdecompresshelper/CMakeLists.txt | 2 +- .../access/qfile_vs_qnetworkaccessmanager/CMakeLists.txt | 2 +- .../network/access/qnetworkdiskcache/CMakeLists.txt | 2 +- tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt | 2 +- .../network/access/qnetworkreply_from_cache/CMakeLists.txt | 2 +- tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt | 2 +- tests/benchmarks/network/socket/qtcpserver/CMakeLists.txt | 2 +- tests/benchmarks/network/socket/qudpsocket/CMakeLists.txt | 2 +- tests/benchmarks/network/ssl/qsslsocket/CMakeLists.txt | 2 +- tests/benchmarks/plugins/imageformats/jpeg/CMakeLists.txt | 2 +- tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt | 2 +- tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt | 2 +- tests/benchmarks/testlib/tostring/CMakeLists.txt | 2 +- .../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 +- 109 files changed, 127 insertions(+), 132 deletions(-) delete mode 100644 tests/benchmarks/corelib/tools/qchar/CMakeLists.txt delete mode 100644 tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt delete mode 100644 tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt delete mode 100644 tests/benchmarks/corelib/tools/qstring/CMakeLists.txt delete mode 100644 tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt (limited to 'tests/benchmarks') diff --git a/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt b/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt index 255befd99a..e83c4e9acc 100644 --- a/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qdir_10000 Binary: ##################################################################### -qt_add_benchmark(tst_bench_qdir_10000 +qt_internal_add_benchmark(tst_bench_qdir_10000 SOURCES bench_qdir_10000.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt b/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt index 1ea925928d..c60bfcfdc3 100644 --- a/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt @@ -4,7 +4,7 @@ ## bench_qdir_tree Binary: ##################################################################### -qt_add_benchmark(bench_qdir_tree +qt_internal_add_benchmark(bench_qdir_tree SOURCES bench_qdir_tree.cpp PUBLIC_LIBRARIES @@ -16,7 +16,7 @@ set(bench_qdir_tree_resource_files "4.6.0-list.txt" ) -qt_add_resource(bench_qdir_tree "bench_qdir_tree" +qt_internal_add_resource(bench_qdir_tree "bench_qdir_tree" PREFIX "/" FILES diff --git a/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt b/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt index b534df5796..8ba331a113 100644 --- a/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qdiriterator Binary: ##################################################################### -qt_add_benchmark(tst_bench_qdiriterator +qt_internal_add_benchmark(tst_bench_qdiriterator SOURCES main.cpp qfilesystemiterator.cpp qfilesystemiterator.h @@ -15,7 +15,7 @@ qt_add_benchmark(tst_bench_qdiriterator ## Scopes: ##################################################################### -qt_extend_target(tst_bench_qdiriterator CONDITION (QT_FEATURE_cxx17_filesystem) AND (GCC AND (QMAKE_GCC_MAJOR_VERSION LESS 9)) +qt_internal_extend_target(tst_bench_qdiriterator CONDITION (QT_FEATURE_cxx17_filesystem) AND (GCC AND (QMAKE_GCC_MAJOR_VERSION LESS 9)) LINK_OPTIONS "-lstdc++fs" ) diff --git a/tests/benchmarks/corelib/io/qfile/CMakeLists.txt b/tests/benchmarks/corelib/io/qfile/CMakeLists.txt index df33c1169f..6ae5029a8a 100644 --- a/tests/benchmarks/corelib/io/qfile/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qfile/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qfile Binary: ##################################################################### -qt_add_benchmark(tst_bench_qfile +qt_internal_add_benchmark(tst_bench_qfile SOURCES main.cpp PUBLIC_LIBRARIES @@ -18,7 +18,7 @@ qt_add_benchmark(tst_bench_qfile ## Scopes: ##################################################################### -qt_extend_target(tst_bench_qfile CONDITION WIN32 +qt_internal_extend_target(tst_bench_qfile CONDITION WIN32 DEFINES _CRT_SECURE_NO_WARNINGS ) diff --git a/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt b/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt index 691c3fb51d..1c088bf71a 100644 --- a/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qfileinfo Binary: ##################################################################### -qt_add_benchmark(tst_bench_qfileinfo +qt_internal_add_benchmark(tst_bench_qfileinfo SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt b/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt index 21052a584c..3af6d4f214 100644 --- a/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qiodevice Binary: ##################################################################### -qt_add_benchmark(tst_bench_qiodevice +qt_internal_add_benchmark(tst_bench_qiodevice SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt b/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt index 93cca1827f..ca7011a661 100644 --- a/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qprocess Binary: ##################################################################### -qt_add_benchmark(tst_bench_qprocess +qt_internal_add_benchmark(tst_bench_qprocess SOURCES ../tst_bench_qprocess.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt index 6c67fdbbed..02c50f7df2 100644 --- a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessLoopback Binary: ##################################################################### -add_qt_benchmark(testProcessLoopback +qt_internal_add_benchmark(testProcessLoopback OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt index 0d0115f785..02c50f7df2 100644 --- a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessLoopback Binary: ##################################################################### -qt_add_benchmark(testProcessLoopback +qt_internal_add_benchmark(testProcessLoopback OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt b/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt index b9bc9164a7..a12bfd1260 100644 --- a/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtemporaryfile Binary: ##################################################################### -qt_add_benchmark(tst_bench_qtemporaryfile +qt_internal_add_benchmark(tst_bench_qtemporaryfile SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt b/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt index d84ba59f41..0393b91119 100644 --- a/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtextstream Binary: ##################################################################### -qt_add_benchmark(tst_bench_qtextstream +qt_internal_add_benchmark(tst_bench_qtextstream SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/io/qurl/CMakeLists.txt b/tests/benchmarks/corelib/io/qurl/CMakeLists.txt index 77ede07536..d38c8b18c0 100644 --- a/tests/benchmarks/corelib/io/qurl/CMakeLists.txt +++ b/tests/benchmarks/corelib/io/qurl/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qurl Binary: ##################################################################### -qt_add_benchmark(tst_qurl +qt_internal_add_benchmark(tst_qurl SOURCES main.cpp PUBLIC_LIBRARIES @@ -17,7 +17,7 @@ qt_add_benchmark(tst_qurl ## Scopes: ##################################################################### -qt_extend_target(tst_qurl CONDITION WIN32 +qt_internal_extend_target(tst_qurl CONDITION WIN32 DEFINES _CRT_SECURE_NO_WARNINGS ) diff --git a/tests/benchmarks/corelib/json/CMakeLists.txt b/tests/benchmarks/corelib/json/CMakeLists.txt index 2108deb6bb..657a268741 100644 --- a/tests/benchmarks/corelib/json/CMakeLists.txt +++ b/tests/benchmarks/corelib/json/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtjson Binary: ##################################################################### -qt_add_benchmark(tst_bench_qtjson +qt_internal_add_benchmark(tst_bench_qtjson SOURCES tst_bench_qtjson.cpp PUBLIC_LIBRARIES 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 ) diff --git a/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt b/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt index 7f4ce4df13..7adc043639 100644 --- a/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt +++ b/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmimedatabase Binary: ##################################################################### -qt_add_benchmark(tst_bench_qmimedatabase +qt_internal_add_benchmark(tst_bench_qmimedatabase SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt b/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt index 3f8b26c883..3b787dc8e8 100644 --- a/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt +++ b/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_quuid Binary: ##################################################################### -qt_add_benchmark(tst_bench_quuid +qt_internal_add_benchmark(tst_bench_quuid SOURCES tst_quuid.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt b/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt index cdae659c92..50574aa221 100644 --- a/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qbytearray Binary: ##################################################################### -qt_add_benchmark(tst_bench_qbytearray +qt_internal_add_benchmark(tst_bench_qbytearray SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qchar/CMakeLists.txt b/tests/benchmarks/corelib/text/qchar/CMakeLists.txt index af45da6bfa..afdf96e9d4 100644 --- a/tests/benchmarks/corelib/text/qchar/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qchar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qchar Binary: ##################################################################### -qt_add_benchmark(tst_bench_qchar +qt_internal_add_benchmark(tst_bench_qchar SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt b/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt index 830c6dbf12..1c692af6c8 100644 --- a/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qlocale Binary: ##################################################################### -qt_add_benchmark(tst_bench_qlocale +qt_internal_add_benchmark(tst_bench_qlocale SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qstring/CMakeLists.txt b/tests/benchmarks/corelib/text/qstring/CMakeLists.txt index e0f3a0e279..4b443cd4aa 100644 --- a/tests/benchmarks/corelib/text/qstring/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qstring/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qstring Binary: ##################################################################### -qt_add_benchmark(tst_bench_qstring +qt_internal_add_benchmark(tst_bench_qstring SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt b/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt index 3182c3faaa..33b1b5fe5e 100644 --- a/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qstringbuilder Binary: ##################################################################### -qt_add_benchmark(tst_bench_qstringbuilder +qt_internal_add_benchmark(tst_bench_qstringbuilder SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt b/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt index f62b4a82a1..4649e3408a 100644 --- a/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt +++ b/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qstringlist Binary: ##################################################################### -qt_add_benchmark(tst_bench_qstringlist +qt_internal_add_benchmark(tst_bench_qstringlist SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt b/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt index 4ba55034d8..8872a50227 100644 --- a/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt +++ b/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmutex Binary: ##################################################################### -qt_add_benchmark(tst_bench_qmutex +qt_internal_add_benchmark(tst_bench_qmutex SOURCES tst_qmutex.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt b/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt index 228f589e08..79d3a2f879 100644 --- a/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt +++ b/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qreadwritelock Binary: ##################################################################### -qt_add_benchmark(tst_bench_qreadwritelock +qt_internal_add_benchmark(tst_bench_qreadwritelock SOURCES tst_qreadwritelock.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt b/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt index fef77ff03c..7b0c81891e 100644 --- a/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt +++ b/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qthreadpool Binary: ##################################################################### -qt_add_benchmark(tst_bench_qthreadpool +qt_internal_add_benchmark(tst_bench_qthreadpool SOURCES tst_qthreadpool.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt b/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt index 45e8c92c38..78ac072d35 100644 --- a/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt +++ b/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qthreadstorage Binary: ##################################################################### -qt_add_benchmark(tst_bench_qthreadstorage +qt_internal_add_benchmark(tst_bench_qthreadstorage SOURCES tst_qthreadstorage.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt b/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt index d686746e58..68c6e88342 100644 --- a/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt +++ b/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qwaitcondition Binary: ##################################################################### -qt_add_benchmark(tst_bench_qwaitcondition +qt_internal_add_benchmark(tst_bench_qwaitcondition SOURCES tst_qwaitcondition.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/time/qdate/CMakeLists.txt b/tests/benchmarks/corelib/time/qdate/CMakeLists.txt index 2a70ef5f4f..edc55463d8 100644 --- a/tests/benchmarks/corelib/time/qdate/CMakeLists.txt +++ b/tests/benchmarks/corelib/time/qdate/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qdate Binary: ##################################################################### -qt_add_benchmark(tst_bench_qdate +qt_internal_add_benchmark(tst_bench_qdate SOURCES tst_bench_qdate.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt b/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt index 6abe0035c7..2585b0d25d 100644 --- a/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt +++ b/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qdatetime Binary: ##################################################################### -qt_add_benchmark(tst_bench_qdatetime +qt_internal_add_benchmark(tst_bench_qdatetime SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt b/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt index b4836337bc..c6487499af 100644 --- a/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt +++ b/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtimezone Binary: ##################################################################### -qt_add_benchmark(tst_bench_qtimezone +qt_internal_add_benchmark(tst_bench_qtimezone SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt b/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt index d07794c25e..1e653fa98d 100644 --- a/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_containers-associative Binary: ##################################################################### -qt_add_benchmark(tst_bench_containers-associative +qt_internal_add_benchmark(tst_bench_containers-associative SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt b/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt index 77e889160c..f8ebc69c29 100644 --- a/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_containers-sequential Binary: ##################################################################### -qt_add_benchmark(tst_bench_containers-sequential +qt_internal_add_benchmark(tst_bench_containers-sequential SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qchar/CMakeLists.txt b/tests/benchmarks/corelib/tools/qchar/CMakeLists.txt deleted file mode 100644 index c51e2a0059..0000000000 --- a/tests/benchmarks/corelib/tools/qchar/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_qt_test(tst_bench_qchar SOURCES main.cpp) diff --git a/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt b/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt index 8d4bff5979..e683d60de2 100644 --- a/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qcontiguouscache Binary: ##################################################################### -qt_add_benchmark(tst_bench_qcontiguouscache +qt_internal_add_benchmark(tst_bench_qcontiguouscache SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt b/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt index 77168e443b..2ca8e683e1 100644 --- a/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qcryptographichash Binary: ##################################################################### -qt_add_benchmark(tst_bench_qcryptographichash +qt_internal_add_benchmark(tst_bench_qcryptographichash SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt b/tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt deleted file mode 100644 index 6875fdd613..0000000000 --- a/tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_qt_test(tst_bench_qdatetime SOURCES main.cpp) diff --git a/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt b/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt index 760b1848d7..5286484b0c 100644 --- a/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_hash Binary: ##################################################################### -qt_add_benchmark(tst_hash +qt_internal_add_benchmark(tst_hash SOURCES main.cpp outofline.cpp diff --git a/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt b/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt index 40be9e9374..46ca1c8514 100644 --- a/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qlist Binary: ##################################################################### -qt_add_benchmark(tst_bench_qlist +qt_internal_add_benchmark(tst_bench_qlist SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt b/tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt deleted file mode 100644 index b8a23bc757..0000000000 --- a/tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_qt_test(tst_bench_qlocale SOURCES main.cpp) diff --git a/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt b/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt index b814b018c0..5937eda37c 100644 --- a/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmap Binary: ##################################################################### -qt_add_benchmark(tst_bench_qmap +qt_internal_add_benchmark(tst_bench_qmap SOURCES main.cpp INCLUDE_DIRECTORIES diff --git a/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt b/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt index fd9ea5a6f2..30234c7055 100644 --- a/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qrect Binary: ##################################################################### -qt_add_benchmark(tst_bench_qrect +qt_internal_add_benchmark(tst_bench_qrect SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt b/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt index fd10411ff3..63128f5f95 100644 --- a/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qringbuffer Binary: ##################################################################### -qt_add_benchmark(tst_bench_qringbuffer +qt_internal_add_benchmark(tst_bench_qringbuffer SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qset/CMakeLists.txt b/tests/benchmarks/corelib/tools/qset/CMakeLists.txt index 9627338414..00fd088776 100644 --- a/tests/benchmarks/corelib/tools/qset/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qset/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qset Binary: ##################################################################### -qt_add_benchmark(tst_qset +qt_internal_add_benchmark(tst_qset SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt b/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt index 2389dd51ce..4526af60db 100644 --- a/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_stack Binary: ##################################################################### -qt_add_benchmark(tst_bench_stack +qt_internal_add_benchmark(tst_bench_stack SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/corelib/tools/qstring/CMakeLists.txt b/tests/benchmarks/corelib/tools/qstring/CMakeLists.txt deleted file mode 100644 index 1dd6678e8e..0000000000 --- a/tests/benchmarks/corelib/tools/qstring/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_qt_test(tst_bench_qstring SOURCES main.cpp) diff --git a/tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt b/tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt deleted file mode 100644 index 3947ae1c5e..0000000000 --- a/tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_qt_test(tst_bench_qtimezone SOURCES main.cpp) diff --git a/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt b/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt index ae40297604..467405eea0 100644 --- a/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_vector Binary: ##################################################################### -qt_add_benchmark(tst_bench_vector +qt_internal_add_benchmark(tst_bench_vector SOURCES main.cpp outofline.cpp diff --git a/tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt b/tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt index 49658f2ee7..ff4612d042 100644 --- a/tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt +++ b/tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt @@ -4,7 +4,7 @@ ## server Binary: ##################################################################### -qt_add_benchmark(server +qt_internal_add_benchmark(server GUI OUTPUT_DIRECTORY "." SOURCES diff --git a/tests/benchmarks/dbus/qdbusperformance/test/CMakeLists.txt b/tests/benchmarks/dbus/qdbusperformance/test/CMakeLists.txt index a31a310f05..6b22096b4d 100644 --- a/tests/benchmarks/dbus/qdbusperformance/test/CMakeLists.txt +++ b/tests/benchmarks/dbus/qdbusperformance/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusperformance Binary: ##################################################################### -qt_add_benchmark(tst_qdbusperformance +qt_internal_add_benchmark(tst_qdbusperformance SOURCES ../serverobject.h ../tst_qdbusperformance.cpp diff --git a/tests/benchmarks/dbus/qdbustype/CMakeLists.txt b/tests/benchmarks/dbus/qdbustype/CMakeLists.txt index 9493dd43d0..13169cc0a0 100644 --- a/tests/benchmarks/dbus/qdbustype/CMakeLists.txt +++ b/tests/benchmarks/dbus/qdbustype/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qdbustype Binary: ##################################################################### -qt_add_benchmark(tst_bench_qdbustype +qt_internal_add_benchmark(tst_bench_qdbustype SOURCES main.cpp PUBLIC_LIBRARIES @@ -16,14 +16,14 @@ qt_add_benchmark(tst_bench_qdbustype ## Scopes: ##################################################################### -qt_extend_target(tst_bench_qdbustype CONDITION QT_FEATURE_dbus_linked +qt_internal_extend_target(tst_bench_qdbustype CONDITION QT_FEATURE_dbus_linked DEFINES QT_LINKED_LIBDBUS PUBLIC_LIBRARIES dbus-1 ) -qt_extend_target(tst_bench_qdbustype CONDITION NOT QT_FEATURE_dbus_linked +qt_internal_extend_target(tst_bench_qdbustype CONDITION NOT QT_FEATURE_dbus_linked SOURCES ../../../../src/dbus/qdbus_symbols.cpp ) diff --git a/tests/benchmarks/gui/animation/qanimation/CMakeLists.txt b/tests/benchmarks/gui/animation/qanimation/CMakeLists.txt index 30022b270f..4d611eedb1 100644 --- a/tests/benchmarks/gui/animation/qanimation/CMakeLists.txt +++ b/tests/benchmarks/gui/animation/qanimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qanimation Binary: ##################################################################### -qt_add_benchmark(tst_bench_qanimation +qt_internal_add_benchmark(tst_bench_qanimation SOURCES dummyanimation.cpp dummyanimation.h dummyobject.cpp dummyobject.h diff --git a/tests/benchmarks/gui/image/blendbench/CMakeLists.txt b/tests/benchmarks/gui/image/blendbench/CMakeLists.txt index 1569e8f8b1..d0d61cea19 100644 --- a/tests/benchmarks/gui/image/blendbench/CMakeLists.txt +++ b/tests/benchmarks/gui/image/blendbench/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_blendbench Binary: ##################################################################### -qt_add_benchmark(tst_bench_blendbench +qt_internal_add_benchmark(tst_bench_blendbench SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt b/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt index 5b0bb33018..f67a2b6908 100644 --- a/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt +++ b/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_imageConversion Binary: ##################################################################### -qt_add_benchmark(tst_bench_imageConversion +qt_internal_add_benchmark(tst_bench_imageConversion SOURCES tst_qimageconversion.cpp PUBLIC_LIBRARIES @@ -19,12 +19,12 @@ qt_add_benchmark(tst_bench_imageConversion ## Scopes: ##################################################################### -qt_extend_target(tst_bench_imageConversion CONDITION QT_FEATURE_gif +qt_internal_extend_target(tst_bench_imageConversion CONDITION QT_FEATURE_gif DEFINES QTEST_HAVE_GIF ) -qt_extend_target(tst_bench_imageConversion CONDITION QT_FEATURE_jpeg +qt_internal_extend_target(tst_bench_imageConversion CONDITION QT_FEATURE_jpeg DEFINES QTEST_HAVE_JPEG ) diff --git a/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt b/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt index d652247877..d0ef0e3984 100644 --- a/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt +++ b/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qimagereader Binary: ##################################################################### -qt_add_benchmark(tst_bench_qimagereader +qt_internal_add_benchmark(tst_bench_qimagereader SOURCES tst_qimagereader.cpp PUBLIC_LIBRARIES @@ -20,12 +20,12 @@ qt_add_benchmark(tst_bench_qimagereader ## Scopes: ##################################################################### -qt_extend_target(tst_bench_qimagereader CONDITION QT_FEATURE_gif +qt_internal_extend_target(tst_bench_qimagereader CONDITION QT_FEATURE_gif DEFINES QTEST_HAVE_GIF ) -qt_extend_target(tst_bench_qimagereader CONDITION QT_FEATURE_jpeg +qt_internal_extend_target(tst_bench_qimagereader CONDITION QT_FEATURE_jpeg DEFINES QTEST_HAVE_JPEG ) diff --git a/tests/benchmarks/gui/image/qimagescale/CMakeLists.txt b/tests/benchmarks/gui/image/qimagescale/CMakeLists.txt index 84011be1bd..51610fa567 100644 --- a/tests/benchmarks/gui/image/qimagescale/CMakeLists.txt +++ b/tests/benchmarks/gui/image/qimagescale/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_imageScale Binary: ##################################################################### -qt_add_benchmark(tst_bench_imageScale +qt_internal_add_benchmark(tst_bench_imageScale SOURCES tst_qimagescale.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt b/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt index 5413cc700e..f8b1a4c754 100644 --- a/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt +++ b/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qpixmap Binary: ##################################################################### -qt_add_benchmark(tst_bench_qpixmap +qt_internal_add_benchmark(tst_bench_qpixmap SOURCES tst_qpixmap.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt b/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt index b8d72d7659..0f4a57c191 100644 --- a/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt +++ b/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qpixmapcache Binary: ##################################################################### -qt_add_benchmark(tst_bench_qpixmapcache +qt_internal_add_benchmark(tst_bench_qpixmapcache SOURCES tst_qpixmapcache.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/kernel/qguimetatype/CMakeLists.txt b/tests/benchmarks/gui/kernel/qguimetatype/CMakeLists.txt index ac0e5f3566..1b11788093 100644 --- a/tests/benchmarks/gui/kernel/qguimetatype/CMakeLists.txt +++ b/tests/benchmarks/gui/kernel/qguimetatype/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qguimetatype Binary: ##################################################################### -qt_add_benchmark(tst_bench_qguimetatype +qt_internal_add_benchmark(tst_bench_qguimetatype SOURCES tst_qguimetatype.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/kernel/qguivariant/CMakeLists.txt b/tests/benchmarks/gui/kernel/qguivariant/CMakeLists.txt index 0d2c99f3ec..ef1c220259 100644 --- a/tests/benchmarks/gui/kernel/qguivariant/CMakeLists.txt +++ b/tests/benchmarks/gui/kernel/qguivariant/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qguivariant Binary: ##################################################################### -qt_add_benchmark(tst_bench_qguivariant +qt_internal_add_benchmark(tst_bench_qguivariant SOURCES tst_qguivariant.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt b/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt index 4d7162a678..28ada45257 100644 --- a/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt +++ b/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmatrix4x4 Binary: ##################################################################### -qt_add_benchmark(tst_bench_qmatrix4x4 +qt_internal_add_benchmark(tst_bench_qmatrix4x4 SOURCES tst_qmatrix4x4.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt b/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt index 863179b171..147f4ce15f 100644 --- a/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt +++ b/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qquaternion Binary: ##################################################################### -qt_add_benchmark(tst_bench_qquaternion +qt_internal_add_benchmark(tst_bench_qquaternion SOURCES tst_qquaternion.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt b/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt index 843c84e050..2d30686339 100644 --- a/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_drawtexture Binary: ##################################################################### -qt_add_benchmark(tst_bench_drawtexture +qt_internal_add_benchmark(tst_bench_drawtexture SOURCES tst_drawtexture.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt index b272dcac73..2807332cca 100644 --- a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_lancebench Binary: ##################################################################### -qt_add_benchmark(tst_bench_lancebench +qt_internal_add_benchmark(tst_bench_lancebench SOURCES ../../../../auto/other/lancelot/paintcommands.cpp ../../../../auto/other/lancelot/paintcommands.h tst_lancebench.cpp @@ -134,7 +134,7 @@ set(images_resource_files "images/zebra.png" ) -qt_add_resource(tst_bench_lancebench "images" +qt_internal_add_resource(tst_bench_lancebench "images" PREFIX "/" BASE @@ -151,7 +151,7 @@ qt_add_resource(tst_bench_lancebench "images" ## Scopes: ##################################################################### -qt_extend_target(tst_bench_lancebench CONDITION QT_FEATURE_opengl +qt_internal_extend_target(tst_bench_lancebench CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES Qt::OpenGL ) diff --git a/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt b/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt index 423047f906..d482102f1b 100644 --- a/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qcolor Binary: ##################################################################### -qt_add_benchmark(tst_bench_qcolor +qt_internal_add_benchmark(tst_bench_qcolor SOURCES tst_qcolor.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt b/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt index 590d85b1b6..ce302599cf 100644 --- a/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qpainter Binary: ##################################################################### -qt_add_benchmark(tst_bench_qpainter +qt_internal_add_benchmark(tst_bench_qpainter SOURCES tst_qpainter.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/painting/qregion/CMakeLists.txt b/tests/benchmarks/gui/painting/qregion/CMakeLists.txt index 1cb2a8b24c..43d397c456 100644 --- a/tests/benchmarks/gui/painting/qregion/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qregion/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qregion Binary: ##################################################################### -qt_add_benchmark(tst_bench_qregion +qt_internal_add_benchmark(tst_bench_qregion SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/painting/qtbench/CMakeLists.txt b/tests/benchmarks/gui/painting/qtbench/CMakeLists.txt index ce065d070c..e6e2ed76ab 100644 --- a/tests/benchmarks/gui/painting/qtbench/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qtbench/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtbench Binary: ##################################################################### -qt_add_benchmark(tst_bench_qtbench +qt_internal_add_benchmark(tst_bench_qtbench SOURCES tst_qtbench.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/painting/qtransform/CMakeLists.txt b/tests/benchmarks/gui/painting/qtransform/CMakeLists.txt index 33df9646c7..b9adb340dc 100644 --- a/tests/benchmarks/gui/painting/qtransform/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qtransform/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtransform Binary: ##################################################################### -qt_add_benchmark(tst_bench_qtransform +qt_internal_add_benchmark(tst_bench_qtransform SOURCES tst_qtransform.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/text/qfontmetrics/CMakeLists.txt b/tests/benchmarks/gui/text/qfontmetrics/CMakeLists.txt index fff90a7172..b580a6fd3d 100644 --- a/tests/benchmarks/gui/text/qfontmetrics/CMakeLists.txt +++ b/tests/benchmarks/gui/text/qfontmetrics/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_QFontMetrics Binary: ##################################################################### -qt_add_benchmark(tst_bench_QFontMetrics +qt_internal_add_benchmark(tst_bench_QFontMetrics SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/text/qtext/CMakeLists.txt b/tests/benchmarks/gui/text/qtext/CMakeLists.txt index abf152a326..5b154a431b 100644 --- a/tests/benchmarks/gui/text/qtext/CMakeLists.txt +++ b/tests/benchmarks/gui/text/qtext/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_QText Binary: ##################################################################### -qt_add_benchmark(tst_bench_QText +qt_internal_add_benchmark(tst_bench_QText SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt b/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt index 4cfda68a1b..9a9017c8e0 100644 --- a/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt +++ b/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_QTextDocument Binary: ##################################################################### -qt_add_benchmark(tst_bench_QTextDocument +qt_internal_add_benchmark(tst_bench_QTextDocument SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/access/qdecompresshelper/.prev_CMakeLists.txt b/tests/benchmarks/network/access/qdecompresshelper/.prev_CMakeLists.txt index 6ac77db67d..eef53e1133 100644 --- a/tests/benchmarks/network/access/qdecompresshelper/.prev_CMakeLists.txt +++ b/tests/benchmarks/network/access/qdecompresshelper/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qdecompresshelper Binary: ##################################################################### -qt_add_benchmark(qdecompresshelper +qt_internal_add_benchmark(qdecompresshelper SOURCES main.cpp DEFINES diff --git a/tests/benchmarks/network/access/qdecompresshelper/CMakeLists.txt b/tests/benchmarks/network/access/qdecompresshelper/CMakeLists.txt index e8c7493250..92a729d373 100644 --- a/tests/benchmarks/network/access/qdecompresshelper/CMakeLists.txt +++ b/tests/benchmarks/network/access/qdecompresshelper/CMakeLists.txt @@ -4,7 +4,7 @@ ## qdecompresshelper Binary: ##################################################################### -qt_add_benchmark(qdecompresshelper +qt_internal_add_benchmark(qdecompresshelper SOURCES main.cpp DEFINES diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/CMakeLists.txt b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/CMakeLists.txt index f34a3c475c..929e87908b 100644 --- a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/CMakeLists.txt +++ b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qfile_vs_qnetworkaccessmanager Binary: ##################################################################### -qt_add_benchmark(tst_bench_qfile_vs_qnetworkaccessmanager +qt_internal_add_benchmark(tst_bench_qfile_vs_qnetworkaccessmanager SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/access/qnetworkdiskcache/CMakeLists.txt b/tests/benchmarks/network/access/qnetworkdiskcache/CMakeLists.txt index e7f966da66..4b8f3f4406 100644 --- a/tests/benchmarks/network/access/qnetworkdiskcache/CMakeLists.txt +++ b/tests/benchmarks/network/access/qnetworkdiskcache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qnetworkdiskcache Binary: ##################################################################### -qt_add_benchmark(tst_bench_qnetworkdiskcache +qt_internal_add_benchmark(tst_bench_qnetworkdiskcache SOURCES tst_qnetworkdiskcache.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt b/tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt index feefb7c825..ad0224e82c 100644 --- a/tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt +++ b/tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qnetworkreply Binary: ##################################################################### -qt_add_benchmark(tst_bench_qnetworkreply +qt_internal_add_benchmark(tst_bench_qnetworkreply SOURCES tst_qnetworkreply.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/access/qnetworkreply_from_cache/CMakeLists.txt b/tests/benchmarks/network/access/qnetworkreply_from_cache/CMakeLists.txt index 4f321d125a..ced1a0850e 100644 --- a/tests/benchmarks/network/access/qnetworkreply_from_cache/CMakeLists.txt +++ b/tests/benchmarks/network/access/qnetworkreply_from_cache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qnetworkreply_from_cache Binary: ##################################################################### -qt_add_benchmark(tst_bench_qnetworkreply_from_cache +qt_internal_add_benchmark(tst_bench_qnetworkreply_from_cache SOURCES tst_qnetworkreply_from_cache.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt b/tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt index 0d847e60c5..7611998c26 100644 --- a/tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt +++ b/tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qhostinfo Binary: ##################################################################### -qt_add_benchmark(tst_bench_qhostinfo +qt_internal_add_benchmark(tst_bench_qhostinfo SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/socket/qtcpserver/CMakeLists.txt b/tests/benchmarks/network/socket/qtcpserver/CMakeLists.txt index 7f20130b37..f566c4f341 100644 --- a/tests/benchmarks/network/socket/qtcpserver/CMakeLists.txt +++ b/tests/benchmarks/network/socket/qtcpserver/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtcpserver Binary: ##################################################################### -qt_add_benchmark(tst_bench_qtcpserver +qt_internal_add_benchmark(tst_bench_qtcpserver SOURCES tst_qtcpserver.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/socket/qudpsocket/CMakeLists.txt b/tests/benchmarks/network/socket/qudpsocket/CMakeLists.txt index ff357490e7..02293cdae6 100644 --- a/tests/benchmarks/network/socket/qudpsocket/CMakeLists.txt +++ b/tests/benchmarks/network/socket/qudpsocket/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qudpsocket Binary: ##################################################################### -qt_add_benchmark(tst_bench_qudpsocket +qt_internal_add_benchmark(tst_bench_qudpsocket SOURCES tst_qudpsocket.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/ssl/qsslsocket/CMakeLists.txt b/tests/benchmarks/network/ssl/qsslsocket/CMakeLists.txt index f8e546c970..95bbda6758 100644 --- a/tests/benchmarks/network/ssl/qsslsocket/CMakeLists.txt +++ b/tests/benchmarks/network/ssl/qsslsocket/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qsslsocket Binary: ##################################################################### -qt_add_benchmark(tst_bench_qsslsocket +qt_internal_add_benchmark(tst_bench_qsslsocket SOURCES tst_qsslsocket.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/plugins/imageformats/jpeg/CMakeLists.txt b/tests/benchmarks/plugins/imageformats/jpeg/CMakeLists.txt index c2586ce86c..d0fcd51f4e 100644 --- a/tests/benchmarks/plugins/imageformats/jpeg/CMakeLists.txt +++ b/tests/benchmarks/plugins/imageformats/jpeg/CMakeLists.txt @@ -4,7 +4,7 @@ ## jpeg Binary: ##################################################################### -qt_add_benchmark(jpeg +qt_internal_add_benchmark(jpeg SOURCES jpeg.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt b/tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt index 3f79595c43..977ea673ac 100644 --- a/tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt +++ b/tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qsqlquery Binary: ##################################################################### -qt_add_benchmark(tst_bench_qsqlquery +qt_internal_add_benchmark(tst_bench_qsqlquery SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt b/tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt index fe955851db..ac42589146 100644 --- a/tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt +++ b/tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qsqlrecord Binary: ##################################################################### -qt_add_benchmark(tst_bench_qsqlrecord +qt_internal_add_benchmark(tst_bench_qsqlrecord SOURCES tst_qsqlrecord.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/testlib/tostring/CMakeLists.txt b/tests/benchmarks/testlib/tostring/CMakeLists.txt index 3fa3b9e2da..161fae4c01 100644 --- a/tests/benchmarks/testlib/tostring/CMakeLists.txt +++ b/tests/benchmarks/testlib/tostring/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_tostring Binary: ##################################################################### -qt_add_benchmark(tst_bench_tostring +qt_internal_add_benchmark(tst_bench_tostring SOURCES tst_tostring.cpp PUBLIC_LIBRARIES 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