summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-07-07 17:25:24 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-07-08 11:01:38 +0200
commit1718948ed493cd5306e681c21a1c2f8e22b096f4 (patch)
treea8c30c54ac0a52d243c388274fddcf7ab43873a5
parent1339cc46678f475f788c9e86618c3824dd86a7ea (diff)
CMake: Regenerate benchmarks
Change-Id: I4154d9ebb8303338a07350b655c7b468751efd10 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt4
-rw-r--r--tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt4
-rw-r--r--tests/benchmarks/corelib/io/qfile/CMakeLists.txt4
-rw-r--r--tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt3
-rw-r--r--tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/io/qurl/CMakeLists.txt4
-rw-r--r--tests/benchmarks/corelib/json/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/kernel/events/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/.prev_CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt4
-rw-r--r--tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/text/qchar/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/text/qlocale/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/text/qregexp/CMakeLists.txt8
-rw-r--r--tests/benchmarks/corelib/text/qstring/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/time/qdate/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/tools/qalgorithms/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/tools/qhash/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/tools/qlist/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/tools/qmap/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/tools/qrect/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/tools/qset/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/tools/qstack/CMakeLists.txt2
-rw-r--r--tests/benchmarks/corelib/tools/qvector/CMakeLists.txt2
-rw-r--r--tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt2
-rw-r--r--tests/benchmarks/dbus/qdbusperformance/test/CMakeLists.txt2
-rw-r--r--tests/benchmarks/dbus/qdbustype/CMakeLists.txt6
-rw-r--r--tests/benchmarks/gui/animation/qanimation/CMakeLists.txt2
-rw-r--r--tests/benchmarks/gui/image/blendbench/CMakeLists.txt2
-rw-r--r--tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt6
-rw-r--r--tests/benchmarks/gui/image/qimagereader/CMakeLists.txt6
-rw-r--r--tests/benchmarks/gui/image/qimagescale/CMakeLists.txt2
-rw-r--r--tests/benchmarks/gui/image/qpixmap/CMakeLists.txt2
-rw-r--r--tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt2
-rw-r--r--tests/benchmarks/gui/kernel/qguimetatype/CMakeLists.txt2
-rw-r--r--tests/benchmarks/gui/kernel/qguivariant/CMakeLists.txt2
-rw-r--r--tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt2
-rw-r--r--tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt2
-rw-r--r--tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt2
-rw-r--r--tests/benchmarks/gui/painting/lancebench/CMakeLists.txt6
-rw-r--r--tests/benchmarks/gui/painting/qcolor/CMakeLists.txt2
-rw-r--r--tests/benchmarks/gui/painting/qpainter/CMakeLists.txt2
-rw-r--r--tests/benchmarks/gui/painting/qregion/CMakeLists.txt2
-rw-r--r--tests/benchmarks/gui/painting/qtbench/CMakeLists.txt2
-rw-r--r--tests/benchmarks/gui/painting/qtransform/CMakeLists.txt2
-rw-r--r--tests/benchmarks/gui/text/qfontmetrics/CMakeLists.txt2
-rw-r--r--tests/benchmarks/gui/text/qtext/CMakeLists.txt2
-rw-r--r--tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt2
-rw-r--r--tests/benchmarks/network/.prev_CMakeLists.txt8
-rw-r--r--tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/CMakeLists.txt2
-rw-r--r--tests/benchmarks/network/access/qnetworkdiskcache/CMakeLists.txt2
-rw-r--r--tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt2
-rw-r--r--tests/benchmarks/network/access/qnetworkreply_from_cache/CMakeLists.txt2
-rw-r--r--tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt2
-rw-r--r--tests/benchmarks/network/socket/qtcpserver/CMakeLists.txt2
-rw-r--r--tests/benchmarks/network/socket/qudpsocket/CMakeLists.txt2
-rw-r--r--tests/benchmarks/network/ssl/qsslsocket/CMakeLists.txt2
-rw-r--r--tests/benchmarks/plugins/imageformats/jpeg/CMakeLists.txt2
-rw-r--r--tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt2
-rw-r--r--tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt2
-rw-r--r--tests/benchmarks/testlib/tostring/CMakeLists.txt2
-rw-r--r--tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt12
-rw-r--r--tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt2
-rw-r--r--tests/benchmarks/widgets/graphicsview/qgraphicsitem/CMakeLists.txt2
-rw-r--r--tests/benchmarks/widgets/graphicsview/qgraphicslayout/CMakeLists.txt2
-rw-r--r--tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt2
-rw-r--r--tests/benchmarks/widgets/graphicsview/qgraphicsscene/CMakeLists.txt2
-rw-r--r--tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt8
-rw-r--r--tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/CMakeLists.txt6
-rw-r--r--tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/moveItems/CMakeLists.txt2
-rw-r--r--tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/scrolltest/CMakeLists.txt2
-rw-r--r--tests/benchmarks/widgets/graphicsview/qgraphicswidget/CMakeLists.txt2
-rw-r--r--tests/benchmarks/widgets/itemviews/qheaderview/CMakeLists.txt2
-rw-r--r--tests/benchmarks/widgets/itemviews/qlistview/CMakeLists.txt2
-rw-r--r--tests/benchmarks/widgets/itemviews/qtableview/CMakeLists.txt2
-rw-r--r--tests/benchmarks/widgets/kernel/qapplication/CMakeLists.txt2
-rw-r--r--tests/benchmarks/widgets/kernel/qwidget/CMakeLists.txt2
-rw-r--r--tests/benchmarks/widgets/styles/qstylesheetstyle/CMakeLists.txt2
-rw-r--r--tests/benchmarks/widgets/widgets/qtextbrowser/CMakeLists.txt2
106 files changed, 139 insertions, 132 deletions
diff --git a/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt b/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt
index 51f603b595..255befd99a 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:
#####################################################################
-add_qt_benchmark(tst_bench_qdir_10000
+qt_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 e3102a3389..1ea925928d 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:
#####################################################################
-add_qt_benchmark(bench_qdir_tree
+qt_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"
)
-add_qt_resource(bench_qdir_tree "bench_qdir_tree"
+qt_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 b1e86861b6..b534df5796 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:
#####################################################################
-add_qt_benchmark(tst_bench_qdiriterator
+qt_add_benchmark(tst_bench_qdiriterator
SOURCES
main.cpp
qfilesystemiterator.cpp qfilesystemiterator.h
@@ -15,7 +15,7 @@ add_qt_benchmark(tst_bench_qdiriterator
## Scopes:
#####################################################################
-extend_target(tst_bench_qdiriterator CONDITION (QT_FEATURE_cxx17_filesystem) AND (GCC AND (QMAKE_GCC_MAJOR_VERSION LESS 9))
+qt_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 7d1e19d75a..df33c1169f 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:
#####################################################################
-add_qt_benchmark(tst_bench_qfile
+qt_add_benchmark(tst_bench_qfile
SOURCES
main.cpp
PUBLIC_LIBRARIES
@@ -18,7 +18,7 @@ add_qt_benchmark(tst_bench_qfile
## Scopes:
#####################################################################
-extend_target(tst_bench_qfile CONDITION WIN32
+qt_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 195419f52e..691c3fb51d 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:
#####################################################################
-add_qt_benchmark(tst_bench_qfileinfo
+qt_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 7663bdb99d..21052a584c 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:
#####################################################################
-add_qt_benchmark(tst_bench_qiodevice
+qt_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 00bbe74c2d..93cca1827f 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:
#####################################################################
-add_qt_benchmark(tst_bench_qprocess
+qt_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 59806127fe..6c67fdbbed 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_executable(testProcessLoopback
+add_qt_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 b5a7fe83f5..0d0115f785 100644
--- a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt
@@ -4,8 +4,7 @@
## testProcessLoopback Binary:
#####################################################################
-# add_qt_executable(testProcessLoopback # special case
-add_qt_benchmark(testProcessLoopback # special case
+qt_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 82b885bb17..b9bc9164a7 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:
#####################################################################
-add_qt_benchmark(tst_bench_qtemporaryfile
+qt_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 6dd11f1bbb..d84ba59f41 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:
#####################################################################
-add_qt_benchmark(tst_bench_qtextstream
+qt_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 26d98b7eb4..77ede07536 100644
--- a/tests/benchmarks/corelib/io/qurl/CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qurl/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qurl Binary:
#####################################################################
-add_qt_benchmark(tst_qurl
+qt_add_benchmark(tst_qurl
SOURCES
main.cpp
PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ add_qt_benchmark(tst_qurl
## Scopes:
#####################################################################
-extend_target(tst_qurl CONDITION WIN32
+qt_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 312cae8a45..2f81190182 100644
--- a/tests/benchmarks/corelib/json/CMakeLists.txt
+++ b/tests/benchmarks/corelib/json/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_bench_qtbinaryjson Binary:
#####################################################################
-add_qt_benchmark(tst_bench_qtbinaryjson
+qt_add_benchmark(tst_bench_qtbinaryjson
SOURCES
tst_bench_qtbinaryjson.cpp
PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/kernel/events/CMakeLists.txt b/tests/benchmarks/corelib/kernel/events/CMakeLists.txt
index 1e35891126..e9c5cc694a 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:
#####################################################################
-add_qt_benchmark(tst_bench_events
+qt_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 173b3b9077..c0d0562869 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:
#####################################################################
-add_qt_benchmark(tst_bench_qcoreapplication
+qt_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 e6da0721d3..8f7dd52376 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:
#####################################################################
-add_qt_benchmark(tst_bench_qmetaobject
+qt_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 00ca47aadc..ad63d9d8c8 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:
#####################################################################
-add_qt_benchmark(tst_bench_qmetatype
+qt_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 4644708b54..92cffc2980 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:
#####################################################################
-add_qt_benchmark(tst_bench_qobject
+qt_add_benchmark(tst_bench_qobject
SOURCES
main.cpp
object.cpp object.h
diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/.prev_CMakeLists.txt b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/.prev_CMakeLists.txt
index 4160fe7e36..2619d89779 100644
--- a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/.prev_CMakeLists.txt
+++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qtimer_vs_qmetaobject Binary:
#####################################################################
-add_qt_benchmark(qtimer_vs_qmetaobject
+qt_add_benchmark(qtimer_vs_qmetaobject
SOURCES
tst_qtimer_vs_qmetaobject.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt
index c76c4dca18..4dfba51735 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:
#####################################################################
-add_qt_benchmark(qtimer_vs_qmetaobject
+qt_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 5e5230566d..f5104b11ff 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:
#####################################################################
-add_qt_benchmark(tst_bench_qvariant
+qt_add_benchmark(tst_bench_qvariant
SOURCES
tst_qvariant.cpp
PUBLIC_LIBRARIES
@@ -15,7 +15,7 @@ add_qt_benchmark(tst_bench_qvariant
## Scopes:
#####################################################################
-extend_target(tst_bench_qvariant CONDITION NOT TARGET Qt::Gui
+qt_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 7d6b6dc4f8..7f4ce4df13 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:
#####################################################################
-add_qt_benchmark(tst_bench_qmimedatabase
+qt_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 2251914957..3f8b26c883 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:
#####################################################################
-add_qt_benchmark(tst_bench_quuid
+qt_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 9c7fae62eb..cdae659c92 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:
#####################################################################
-add_qt_benchmark(tst_bench_qbytearray
+qt_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 ba99813d2b..af45da6bfa 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:
#####################################################################
-add_qt_benchmark(tst_bench_qchar
+qt_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 7e67472013..830c6dbf12 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:
#####################################################################
-add_qt_benchmark(tst_bench_qlocale
+qt_add_benchmark(tst_bench_qlocale
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/text/qregexp/CMakeLists.txt b/tests/benchmarks/corelib/text/qregexp/CMakeLists.txt
index e1dcd5c131..1646f4778a 100644
--- a/tests/benchmarks/corelib/text/qregexp/CMakeLists.txt
+++ b/tests/benchmarks/corelib/text/qregexp/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_bench_qregexp Binary:
#####################################################################
-add_qt_benchmark(tst_bench_qregexp
+qt_add_benchmark(tst_bench_qregexp
EXCEPTIONS
SOURCES
main.cpp
@@ -17,7 +17,7 @@ set(qregexp_resource_files
"main.cpp"
)
-add_qt_resource(tst_bench_qregexp "qregexp"
+qt_add_resource(tst_bench_qregexp "qregexp"
PREFIX
"/"
FILES
@@ -31,14 +31,14 @@ add_qt_resource(tst_bench_qregexp "qregexp"
## Scopes:
#####################################################################
-extend_target(tst_bench_qregexp CONDITION TARGET Qt::Script AND NOT pcre
+qt_extend_target(tst_bench_qregexp CONDITION TARGET Qt::Script AND NOT pcre
DEFINES
HAVE_JSC
PUBLIC_LIBRARIES
Qt::Script
)
-extend_target(tst_bench_qregexp CONDITION (NOT QNX) AND (EXISTS _ss_[QT_SYSROOT]/usr/include/boost/regex.hpp)
+qt_extend_target(tst_bench_qregexp CONDITION (NOT QNX) AND (EXISTS _ss_[QT_SYSROOT]/usr/include/boost/regex.hpp)
DEFINES
HAVE_BOOST
PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/text/qstring/CMakeLists.txt b/tests/benchmarks/corelib/text/qstring/CMakeLists.txt
index 2999cb4682..e0f3a0e279 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:
#####################################################################
-add_qt_benchmark(tst_bench_qstring
+qt_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 e326414d7a..3182c3faaa 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:
#####################################################################
-add_qt_benchmark(tst_bench_qstringbuilder
+qt_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 a341f1aaa8..f62b4a82a1 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:
#####################################################################
-add_qt_benchmark(tst_bench_qstringlist
+qt_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 71226282ab..4ba55034d8 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:
#####################################################################
-add_qt_benchmark(tst_bench_qmutex
+qt_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 d582dba8db..228f589e08 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:
#####################################################################
-add_qt_benchmark(tst_bench_qreadwritelock
+qt_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 00dbc9c298..fef77ff03c 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:
#####################################################################
-add_qt_benchmark(tst_bench_qthreadpool
+qt_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 ed60ec4495..45e8c92c38 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:
#####################################################################
-add_qt_benchmark(tst_bench_qthreadstorage
+qt_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 4de82d7cc9..d686746e58 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:
#####################################################################
-add_qt_benchmark(tst_bench_qwaitcondition
+qt_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 7ae18a42f5..2a70ef5f4f 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:
#####################################################################
-add_qt_benchmark(tst_bench_qdate
+qt_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 b44f1a5bfc..6abe0035c7 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:
#####################################################################
-add_qt_benchmark(tst_bench_qdatetime
+qt_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 60e8ceba13..b4836337bc 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:
#####################################################################
-add_qt_benchmark(tst_bench_qtimezone
+qt_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 0e2dace380..d07794c25e 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:
#####################################################################
-add_qt_benchmark(tst_bench_containers-associative
+qt_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 40f455752e..77e889160c 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:
#####################################################################
-add_qt_benchmark(tst_bench_containers-sequential
+qt_add_benchmark(tst_bench_containers-sequential
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/tools/qalgorithms/CMakeLists.txt b/tests/benchmarks/corelib/tools/qalgorithms/CMakeLists.txt
index 99c6a7061d..949dda2167 100644
--- a/tests/benchmarks/corelib/tools/qalgorithms/CMakeLists.txt
+++ b/tests/benchmarks/corelib/tools/qalgorithms/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_bench_qalgorithms Binary:
#####################################################################
-add_qt_benchmark(tst_bench_qalgorithms
+qt_add_benchmark(tst_bench_qalgorithms
SOURCES
tst_qalgorithms.cpp
PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt b/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt
index 126c0e7a50..8d4bff5979 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:
#####################################################################
-add_qt_benchmark(tst_bench_qcontiguouscache
+qt_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 1400027c1f..77168e443b 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:
#####################################################################
-add_qt_benchmark(tst_bench_qcryptographichash
+qt_add_benchmark(tst_bench_qcryptographichash
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt b/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt
index 5b3a0fe5f5..760b1848d7 100644
--- a/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt
+++ b/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_hash Binary:
#####################################################################
-add_qt_benchmark(tst_hash
+qt_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 ba40760910..40be9e9374 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:
#####################################################################
-add_qt_benchmark(tst_bench_qlist
+qt_add_benchmark(tst_bench_qlist
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt b/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt
index a98c7d7157..b814b018c0 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:
#####################################################################
-add_qt_benchmark(tst_bench_qmap
+qt_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 4218092a88..fd9ea5a6f2 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:
#####################################################################
-add_qt_benchmark(tst_bench_qrect
+qt_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 e0323b90db..fd10411ff3 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:
#####################################################################
-add_qt_benchmark(tst_bench_qringbuffer
+qt_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 40ee622f89..9627338414 100644
--- a/tests/benchmarks/corelib/tools/qset/CMakeLists.txt
+++ b/tests/benchmarks/corelib/tools/qset/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qset Binary:
#####################################################################
-add_qt_benchmark(tst_qset
+qt_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 530d55b19b..2389dd51ce 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:
#####################################################################
-add_qt_benchmark(tst_bench_stack
+qt_add_benchmark(tst_bench_stack
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt b/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt
index 0cc9b24236..ae40297604 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:
#####################################################################
-add_qt_benchmark(tst_bench_vector
+qt_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 a3b5e98d4a..49658f2ee7 100644
--- a/tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt
+++ b/tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt
@@ -4,7 +4,7 @@
## server Binary:
#####################################################################
-add_qt_benchmark(server
+qt_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 dadca9412c..a31a310f05 100644
--- a/tests/benchmarks/dbus/qdbusperformance/test/CMakeLists.txt
+++ b/tests/benchmarks/dbus/qdbusperformance/test/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qdbusperformance Binary:
#####################################################################
-add_qt_benchmark(tst_qdbusperformance
+qt_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 fb250f9f00..9493dd43d0 100644
--- a/tests/benchmarks/dbus/qdbustype/CMakeLists.txt
+++ b/tests/benchmarks/dbus/qdbustype/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_bench_qdbustype Binary:
#####################################################################
-add_qt_benchmark(tst_bench_qdbustype
+qt_add_benchmark(tst_bench_qdbustype
SOURCES
main.cpp
PUBLIC_LIBRARIES
@@ -16,14 +16,14 @@ add_qt_benchmark(tst_bench_qdbustype
## Scopes:
#####################################################################
-extend_target(tst_bench_qdbustype CONDITION QT_FEATURE_dbus_linked
+qt_extend_target(tst_bench_qdbustype CONDITION QT_FEATURE_dbus_linked
DEFINES
QT_LINKED_LIBDBUS
PUBLIC_LIBRARIES
dbus-1
)
-extend_target(tst_bench_qdbustype CONDITION NOT QT_FEATURE_dbus_linked
+qt_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 38b4c50db8..30022b270f 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:
#####################################################################
-add_qt_benchmark(tst_bench_qanimation
+qt_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 3599a51371..1569e8f8b1 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:
#####################################################################
-add_qt_benchmark(tst_bench_blendbench
+qt_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 d9b481ca46..5b0bb33018 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:
#####################################################################
-add_qt_benchmark(tst_bench_imageConversion
+qt_add_benchmark(tst_bench_imageConversion
SOURCES
tst_qimageconversion.cpp
PUBLIC_LIBRARIES
@@ -19,12 +19,12 @@ add_qt_benchmark(tst_bench_imageConversion
## Scopes:
#####################################################################
-extend_target(tst_bench_imageConversion CONDITION QT_FEATURE_gif
+qt_extend_target(tst_bench_imageConversion CONDITION QT_FEATURE_gif
DEFINES
QTEST_HAVE_GIF
)
-extend_target(tst_bench_imageConversion CONDITION QT_FEATURE_jpeg
+qt_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 be72a44187..d652247877 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:
#####################################################################
-add_qt_benchmark(tst_bench_qimagereader
+qt_add_benchmark(tst_bench_qimagereader
SOURCES
tst_qimagereader.cpp
PUBLIC_LIBRARIES
@@ -20,12 +20,12 @@ add_qt_benchmark(tst_bench_qimagereader
## Scopes:
#####################################################################
-extend_target(tst_bench_qimagereader CONDITION QT_FEATURE_gif
+qt_extend_target(tst_bench_qimagereader CONDITION QT_FEATURE_gif
DEFINES
QTEST_HAVE_GIF
)
-extend_target(tst_bench_qimagereader CONDITION QT_FEATURE_jpeg
+qt_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 cbf3e5459b..84011be1bd 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:
#####################################################################
-add_qt_benchmark(tst_bench_imageScale
+qt_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 e75703f33d..5413cc700e 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:
#####################################################################
-add_qt_benchmark(tst_bench_qpixmap
+qt_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 46347ef94a..b8d72d7659 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:
#####################################################################
-add_qt_benchmark(tst_bench_qpixmapcache
+qt_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 cf250cdaf6..ac0e5f3566 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:
#####################################################################
-add_qt_benchmark(tst_bench_qguimetatype
+qt_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 0a6ddda456..0d2c99f3ec 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:
#####################################################################
-add_qt_benchmark(tst_bench_qguivariant
+qt_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 8d594ef1e7..4d7162a678 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:
#####################################################################
-add_qt_benchmark(tst_bench_qmatrix4x4
+qt_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 2409a6c43a..863179b171 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:
#####################################################################
-add_qt_benchmark(tst_bench_qquaternion
+qt_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 add15f25fb..843c84e050 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:
#####################################################################
-add_qt_benchmark(tst_bench_drawtexture
+qt_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 677a3d98d4..b272dcac73 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:
#####################################################################
-add_qt_benchmark(tst_bench_lancebench
+qt_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"
)
-add_qt_resource(tst_bench_lancebench "images"
+qt_add_resource(tst_bench_lancebench "images"
PREFIX
"/"
BASE
@@ -151,7 +151,7 @@ add_qt_resource(tst_bench_lancebench "images"
## Scopes:
#####################################################################
-extend_target(tst_bench_lancebench CONDITION QT_FEATURE_opengl
+qt_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 d5367704ae..423047f906 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:
#####################################################################
-add_qt_benchmark(tst_bench_qcolor
+qt_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 a4e3242409..590d85b1b6 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:
#####################################################################
-add_qt_benchmark(tst_bench_qpainter
+qt_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 e864a1f61d..1cb2a8b24c 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:
#####################################################################
-add_qt_benchmark(tst_bench_qregion
+qt_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 009deeb528..ce065d070c 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:
#####################################################################
-add_qt_benchmark(tst_bench_qtbench
+qt_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 aa24b4a19e..33df9646c7 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:
#####################################################################
-add_qt_benchmark(tst_bench_qtransform
+qt_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 af42a93d27..fff90a7172 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:
#####################################################################
-add_qt_benchmark(tst_bench_QFontMetrics
+qt_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 b2380c8316..abf152a326 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:
#####################################################################
-add_qt_benchmark(tst_bench_QText
+qt_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 eb1f633d9b..4cfda68a1b 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:
#####################################################################
-add_qt_benchmark(tst_bench_QTextDocument
+qt_add_benchmark(tst_bench_QTextDocument
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/network/.prev_CMakeLists.txt b/tests/benchmarks/network/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..8b1a7ac1ff
--- /dev/null
+++ b/tests/benchmarks/network/.prev_CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from network.pro.
+
+add_subdirectory(access)
+add_subdirectory(kernel)
+add_subdirectory(socket)
+if(QT_FEATURE_openssl)
+ add_subdirectory(ssl)
+endif()
diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/CMakeLists.txt b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/CMakeLists.txt
index abfb0206d3..f34a3c475c 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:
#####################################################################
-add_qt_benchmark(tst_bench_qfile_vs_qnetworkaccessmanager
+qt_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 d70d2756a9..e7f966da66 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:
#####################################################################
-add_qt_benchmark(tst_bench_qnetworkdiskcache
+qt_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 c77f7b56f8..feefb7c825 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:
#####################################################################
-add_qt_benchmark(tst_bench_qnetworkreply
+qt_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 57cfebb1ff..4f321d125a 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:
#####################################################################
-add_qt_benchmark(tst_bench_qnetworkreply_from_cache
+qt_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 f234b5d7a4..0d847e60c5 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:
#####################################################################
-add_qt_benchmark(tst_bench_qhostinfo
+qt_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 7e1eab88a9..7f20130b37 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:
#####################################################################
-add_qt_benchmark(tst_bench_qtcpserver
+qt_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 58b4ab17d4..ff357490e7 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:
#####################################################################
-add_qt_benchmark(tst_bench_qudpsocket
+qt_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 7a127b071d..f8e546c970 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:
#####################################################################
-add_qt_benchmark(tst_bench_qsslsocket
+qt_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 63262d19ce..c2586ce86c 100644
--- a/tests/benchmarks/plugins/imageformats/jpeg/CMakeLists.txt
+++ b/tests/benchmarks/plugins/imageformats/jpeg/CMakeLists.txt
@@ -4,7 +4,7 @@
## jpeg Binary:
#####################################################################
-add_qt_benchmark(jpeg
+qt_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 95e3aca221..3f79595c43 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:
#####################################################################
-add_qt_benchmark(tst_bench_qsqlquery
+qt_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 b55d46984f..fe955851db 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:
#####################################################################
-add_qt_benchmark(tst_bench_qsqlrecord
+qt_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 76c0f1db1c..3fa3b9e2da 100644
--- a/tests/benchmarks/testlib/tostring/CMakeLists.txt
+++ b/tests/benchmarks/testlib/tostring/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_bench_tostring Binary:
#####################################################################
-add_qt_benchmark(tst_bench_tostring
+qt_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 e5398b4c1e..3bdb724fae 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:
#####################################################################
-add_qt_benchmark(tst_GraphicsViewBenchmark
+qt_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"
)
-add_qt_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark"
+qt_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"
)
-add_qt_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark1"
+qt_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark1"
PREFIX
"/themes/lime"
FILES
@@ -322,7 +322,7 @@ set(GraphicsViewBenchmark2_resource_files
"resources/avatars/avatar_woman_010_58x58.png"
)
-add_qt_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark2"
+qt_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark2"
PREFIX
"/avatars"
FILES
@@ -347,7 +347,7 @@ set(GraphicsViewBenchmark3_resource_files
"resources/contacts/lastnames.txt"
)
-add_qt_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark3"
+qt_add_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark3"
PREFIX
"/contact"
FILES
@@ -361,7 +361,7 @@ add_qt_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark3"
## Scopes:
#####################################################################
-extend_target(tst_GraphicsViewBenchmark CONDITION TARGET Qt::OpenGL
+qt_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 4f526cc7b1..4355be1f99 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:
#####################################################################
-add_qt_benchmark(tst_bench_qgraphicsanchorlayout
+qt_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 a63c37e323..e32fd82819 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:
#####################################################################
-add_qt_benchmark(tst_bench_qgraphicsitem
+qt_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 84f277df1b..aa25f356ca 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:
#####################################################################
-add_qt_benchmark(tst_bench_qgraphicslayout
+qt_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 ab88de5bec..5d682dcdde 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:
#####################################################################
-add_qt_benchmark(tst_bench_qgraphicslinearlayout
+qt_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 0c72479efd..682fb1acae 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:
#####################################################################
-add_qt_benchmark(tst_bench_qgraphicsscene
+qt_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 d98e3dba19..a86f236664 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:
#####################################################################
-add_qt_benchmark(tst_bench_qgraphicsview
+qt_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"
)
-add_qt_resource(tst_bench_qgraphicsview "qgraphicsview"
+qt_add_resource(tst_bench_qgraphicsview "qgraphicsview"
PREFIX
"/"
FILES
@@ -33,7 +33,7 @@ set(images_resource_files
"qt4logo.png"
)
-add_qt_resource(tst_bench_qgraphicsview "images"
+qt_add_resource(tst_bench_qgraphicsview "images"
PREFIX
"/"
BASE
@@ -49,7 +49,7 @@ add_qt_resource(tst_bench_qgraphicsview "images"
## Scopes:
#####################################################################
-extend_target(tst_bench_qgraphicsview CONDITION TARGET Qt::OpenGL
+qt_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 e5e01a8434..ae5a17f020 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:
#####################################################################
-add_qt_benchmark(chip
+qt_add_benchmark(chip
GUI
SOURCES
chip.cpp chip.h
@@ -25,7 +25,7 @@ set(images_resource_files
"zoomout.png"
)
-add_qt_resource(chip "images"
+qt_add_resource(chip "images"
PREFIX
"/"
FILES
@@ -42,7 +42,7 @@ add_qt_resource(chip "images"
## Scopes:
#####################################################################
-extend_target(chip CONDITION TARGET Qt::OpenGL
+qt_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 ce86e56722..6b7867a7cb 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:
#####################################################################
-add_qt_benchmark(moveItems
+qt_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 310fcd0622..716fc03774 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:
#####################################################################
-add_qt_benchmark(scrolltest
+qt_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 ab16f7081e..2646da95fc 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:
#####################################################################
-add_qt_benchmark(tst_bench_qgraphicswidget
+qt_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 6d616d2579..8271ff9df3 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:
#####################################################################
-add_qt_benchmark(tst_bench_qheaderview
+qt_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 58062db6c0..0e8dcd01bc 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:
#####################################################################
-add_qt_benchmark(tst_bench_qlistview
+qt_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 f0b47692d8..0245ba6d47 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:
#####################################################################
-add_qt_benchmark(tst_bench_qtableview
+qt_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 05bc480302..7cb2318d7d 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:
#####################################################################
-add_qt_benchmark(tst_bench_qapplication
+qt_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 6165cba25a..5eb2ea97d1 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:
#####################################################################
-add_qt_benchmark(tst_bench_qwidget
+qt_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 13aa6a1f62..ca86f324b5 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:
#####################################################################
-add_qt_benchmark(tst_bench_qstylesheetstyle
+qt_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 983d255787..5a6f419533 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:
#####################################################################
-add_qt_benchmark(tst_bench_QTextBrowser
+qt_add_benchmark(tst_bench_QTextBrowser
SOURCES
main.cpp
PUBLIC_LIBRARIES