Regenerate projects to be in sync with the script

Change-Id: I30d599c2f5e74293ff7037b5e667c0a3dab5be87
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

23 files changed, 34 insertions, 46 deletions

diff --git a/src/plugins/imageformats/icns/CMakeLists.txt b/src/plugins/imageformats/icns/CMakeLists.txt
index cde94c2..06980a6 100644
--- a/src/plugins/imageformats/icns/CMakeLists.txt
+++ b/src/plugins/imageformats/icns/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qicns Plugin:
 #####################################################################
 
-add_qt_plugin(qicns
+qt_add_plugin(qicns
     TYPE imageformats
     CLASS_NAME QICNSPlugin
     SOURCES
@@ -20,4 +20,3 @@ add_qt_plugin(qicns
 
 #### Keys ignored in scope 1:.:.:icns.pro:<TRUE>:
 # OTHER_FILES = "icns.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/jp2/CMakeLists.txt b/src/plugins/imageformats/jp2/CMakeLists.txt
index f45df46..175c834 100644
--- a/src/plugins/imageformats/jp2/CMakeLists.txt
+++ b/src/plugins/imageformats/jp2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qjp2 Plugin:
 #####################################################################
 
-add_qt_plugin(qjp2
+qt_add_plugin(qjp2
     TYPE imageformats
     CLASS_NAME QJp2Plugin
     SOURCES
@@ -20,4 +20,3 @@ add_qt_plugin(qjp2
 #### Keys ignored in scope 1:.:.:jp2.pro:<TRUE>:
 # OTHER_FILES = "jp2.json"
 # QT_FOR_CONFIG = "imageformats-private"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/macheif/.prev_CMakeLists.txt b/src/plugins/imageformats/macheif/.prev_CMakeLists.txt
index 4ee32c7..b791f5c 100644
--- a/src/plugins/imageformats/macheif/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/macheif/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmacheif Plugin:
 #####################################################################
 
-add_qt_plugin(qmacheif
+qt_add_plugin(qmacheif
     TYPE imageformats
     CLASS_NAME QMacHeifPlugin
     SOURCES
@@ -26,4 +26,3 @@ add_qt_plugin(qmacheif
 
 #### Keys ignored in scope 1:.:.:macheif.pro:<TRUE>:
 # OTHER_FILES = "macheif.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/macheif/CMakeLists.txt b/src/plugins/imageformats/macheif/CMakeLists.txt
index 22631d7..6df9758 100644
--- a/src/plugins/imageformats/macheif/CMakeLists.txt
+++ b/src/plugins/imageformats/macheif/CMakeLists.txt
@@ -10,7 +10,7 @@ find_library(FWCoreGraphics CoreGraphics)
 find_library(FWImageIO ImageIO)
 # special case end
 
-add_qt_plugin(qmacheif
+qt_add_plugin(qmacheif
     TYPE imageformats
     CLASS_NAME QMacHeifPlugin
     SOURCES
@@ -32,4 +32,3 @@ add_qt_plugin(qmacheif
 
 #### Keys ignored in scope 1:.:.:macheif.pro:<TRUE>:
 # OTHER_FILES = "macheif.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/macjp2/CMakeLists.txt b/src/plugins/imageformats/macjp2/CMakeLists.txt
index 9fbb1a4..3dfbe12 100644
--- a/src/plugins/imageformats/macjp2/CMakeLists.txt
+++ b/src/plugins/imageformats/macjp2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmacjp2 Plugin:
 #####################################################################
 
-add_qt_plugin(qmacjp2
+qt_add_plugin(qmacjp2
     TYPE imageformats
     CLASS_NAME QMacJp2Plugin
     SOURCES
@@ -26,4 +26,3 @@ add_qt_plugin(qmacjp2
 
 #### Keys ignored in scope 1:.:.:macjp2.pro:<TRUE>:
 # OTHER_FILES = "macjp2.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/mng/CMakeLists.txt b/src/plugins/imageformats/mng/CMakeLists.txt
index 095f5a7..ad84e53 100644
--- a/src/plugins/imageformats/mng/CMakeLists.txt
+++ b/src/plugins/imageformats/mng/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmng Plugin:
 #####################################################################
 
-add_qt_plugin(qmng
+qt_add_plugin(qmng
     TYPE imageformats
     CLASS_NAME QMngPlugin
     SOURCES
@@ -20,4 +20,3 @@ add_qt_plugin(qmng
 #### Keys ignored in scope 1:.:.:mng.pro:<TRUE>:
 # OTHER_FILES = "mng.json"
 # QT_FOR_CONFIG = "imageformats-private"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/tga/CMakeLists.txt b/src/plugins/imageformats/tga/CMakeLists.txt
index 6f28762..19f6f38 100644
--- a/src/plugins/imageformats/tga/CMakeLists.txt
+++ b/src/plugins/imageformats/tga/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtga Plugin:
 #####################################################################
 
-add_qt_plugin(qtga
+qt_add_plugin(qtga
     TYPE imageformats
     CLASS_NAME QTgaPlugin
     SOURCES
@@ -18,4 +18,3 @@ add_qt_plugin(qtga
 
 #### Keys ignored in scope 1:.:.:tga.pro:<TRUE>:
 # OTHER_FILES = "tga.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/tiff/.prev_CMakeLists.txt b/src/plugins/imageformats/tiff/.prev_CMakeLists.txt
index 3fb2da8..fc9a65b 100644
--- a/src/plugins/imageformats/tiff/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/tiff/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtiff Plugin:
 #####################################################################
 
-add_qt_plugin(qtiff
+qt_add_plugin(qtiff
     TYPE imageformats
     CLASS_NAME QTiffPlugin
     SOURCES
@@ -20,4 +20,3 @@ add_qt_plugin(qtiff
 #### Keys ignored in scope 1:.:.:tiff.pro:<TRUE>:
 # OTHER_FILES = "tiff.json"
 # QT_FOR_CONFIG = "imageformats-private"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/tiff/CMakeLists.txt b/src/plugins/imageformats/tiff/CMakeLists.txt
index 5224c78..bc85225 100644
--- a/src/plugins/imageformats/tiff/CMakeLists.txt
+++ b/src/plugins/imageformats/tiff/CMakeLists.txt
@@ -15,7 +15,7 @@ if(BUILD_SHARED_LIBS)
 endif()
 # special case end
 
-add_qt_plugin(qtiff
+qt_add_plugin(qtiff
     TYPE imageformats
     CLASS_NAME QTiffPlugin
     SOURCES
@@ -33,4 +33,3 @@ add_qt_plugin(qtiff
 #### Keys ignored in scope 1:.:.:tiff.pro:<TRUE>:
 # OTHER_FILES = "tiff.json"
 # QT_FOR_CONFIG = "imageformats-private"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/wbmp/CMakeLists.txt b/src/plugins/imageformats/wbmp/CMakeLists.txt
index ae25820..b446a1b 100644
--- a/src/plugins/imageformats/wbmp/CMakeLists.txt
+++ b/src/plugins/imageformats/wbmp/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qwbmp Plugin:
 #####################################################################
 
-add_qt_plugin(qwbmp
+qt_add_plugin(qwbmp
     TYPE imageformats
     CLASS_NAME QWbmpPlugin
     SOURCES
@@ -17,4 +17,3 @@ add_qt_plugin(qwbmp
 
 #### Keys ignored in scope 1:.:.:wbmp.pro:<TRUE>:
 # OTHER_FILES = "wbmp.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/webp/.prev_CMakeLists.txt b/src/plugins/imageformats/webp/.prev_CMakeLists.txt
index c37829b..3b5416f 100644
--- a/src/plugins/imageformats/webp/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/webp/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qwebp Plugin:
 #####################################################################
 
-add_qt_plugin(qwebp
+qt_add_plugin(qwebp
     TYPE imageformats
     CLASS_NAME QWebpPlugin
     SOURCES
@@ -19,4 +19,3 @@ add_qt_plugin(qwebp
 #### Keys ignored in scope 1:.:.:webp.pro:<TRUE>:
 # OTHER_FILES = "webp.json"
 # QT_FOR_CONFIG = "imageformats-private"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/webp/CMakeLists.txt b/src/plugins/imageformats/webp/CMakeLists.txt
index 4b6322e..1385e63 100644
--- a/src/plugins/imageformats/webp/CMakeLists.txt
+++ b/src/plugins/imageformats/webp/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qwebp Plugin:
 #####################################################################
 
-add_qt_plugin(qwebp
+qt_add_plugin(qwebp
     TYPE imageformats
     CLASS_NAME QWebpPlugin
     SOURCES
@@ -20,4 +20,3 @@ add_qt_plugin(qwebp
 #### Keys ignored in scope 1:.:.:webp.pro:<TRUE>:
 # OTHER_FILES = "webp.json"
 # QT_FOR_CONFIG = "imageformats-private"
-# _LOADED = "qt_plugin"
diff --git a/tests/auto/dds/CMakeLists.txt b/tests/auto/dds/CMakeLists.txt
index 9a25bcb..6da7a9a 100644
--- a/tests/auto/dds/CMakeLists.txt
+++ b/tests/auto/dds/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdds Test:
 #####################################################################
 
-add_qt_test(tst_qdds
+qt_add_test(tst_qdds
     SOURCES
         tst_qdds.cpp
     PUBLIC_LIBRARIES
@@ -215,7 +215,7 @@ set(dds_resource_files
     "dds/mipmaps.dds"
 )
 
-add_qt_resource(tst_qdds "dds"
+qt_add_resource(tst_qdds "dds"
     PREFIX
         "/"
     BASE
diff --git a/tests/auto/heif/CMakeLists.txt b/tests/auto/heif/CMakeLists.txt
index c40e1f7..c4ca92d 100644
--- a/tests/auto/heif/CMakeLists.txt
+++ b/tests/auto/heif/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qheif Test:
 #####################################################################
 
-add_qt_test(tst_qheif
+qt_add_test(tst_qheif
     SOURCES
         tst_qheif.cpp
     PUBLIC_LIBRARIES
@@ -23,7 +23,7 @@ set(heif_resource_files
     "heif/newlogoCCW.heic"
 )
 
-add_qt_resource(tst_qheif "heif"
+qt_add_resource(tst_qheif "heif"
     PREFIX
         "/"
     BASE
diff --git a/tests/auto/icns/CMakeLists.txt b/tests/auto/icns/CMakeLists.txt
index 0ab146b..c7d9806 100644
--- a/tests/auto/icns/CMakeLists.txt
+++ b/tests/auto/icns/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qicns Test:
 #####################################################################
 
-add_qt_test(tst_qicns
+qt_add_test(tst_qicns
     SOURCES
         tst_qicns.cpp
     PUBLIC_LIBRARIES
@@ -63,7 +63,7 @@ set(icns_resource_files
     "icns/test-write-64.png"
 )
 
-add_qt_resource(tst_qicns "icns"
+qt_add_resource(tst_qicns "icns"
     PREFIX
         "/"
     BASE
diff --git a/tests/auto/jp2/CMakeLists.txt b/tests/auto/jp2/CMakeLists.txt
index 49383f7..7b998e6 100644
--- a/tests/auto/jp2/CMakeLists.txt
+++ b/tests/auto/jp2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qjp2 Test:
 #####################################################################
 
-add_qt_test(tst_qjp2
+qt_add_test(tst_qjp2
     SOURCES
         tst_qjp2.cpp
     PUBLIC_LIBRARIES
@@ -23,7 +23,7 @@ set(jp2_resource_files
     "jp2/logo.jp2"
 )
 
-add_qt_resource(tst_qjp2 "jp2"
+qt_add_resource(tst_qjp2 "jp2"
     PREFIX
         "/"
     BASE
diff --git a/tests/auto/mng/CMakeLists.txt b/tests/auto/mng/CMakeLists.txt
index 9bf7abb..56e53a8 100644
--- a/tests/auto/mng/CMakeLists.txt
+++ b/tests/auto/mng/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmng Test:
 #####################################################################
 
-add_qt_test(tst_qmng
+qt_add_test(tst_qmng
     SOURCES
         tst_qmng.cpp
     PUBLIC_LIBRARIES
@@ -35,7 +35,7 @@ set(mng_resource_files
     "mng/fire.mng"
 )
 
-add_qt_resource(tst_qmng "mng"
+qt_add_resource(tst_qmng "mng"
     PREFIX
         "/"
     BASE
diff --git a/tests/auto/tga/CMakeLists.txt b/tests/auto/tga/CMakeLists.txt
index f6e1760..feed14d 100644
--- a/tests/auto/tga/CMakeLists.txt
+++ b/tests/auto/tga/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtga Test:
 #####################################################################
 
-add_qt_test(tst_qtga
+qt_add_test(tst_qtga
     SOURCES
         tst_qtga.cpp
     PUBLIC_LIBRARIES
@@ -19,7 +19,7 @@ set(tga_resource_files
     "tga/test-flag.tga"
 )
 
-add_qt_resource(tst_qtga "tga"
+qt_add_resource(tst_qtga "tga"
     PREFIX
         "/"
     BASE
diff --git a/tests/auto/tiff/CMakeLists.txt b/tests/auto/tiff/CMakeLists.txt
index fa8fadd..92335d3 100644
--- a/tests/auto/tiff/CMakeLists.txt
+++ b/tests/auto/tiff/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtiff Test:
 #####################################################################
 
-add_qt_test(tst_qtiff
+qt_add_test(tst_qtiff
     SOURCES
         tst_qtiff.cpp
     PUBLIC_LIBRARIES
@@ -223,7 +223,7 @@ set(tiff_resource_files
     "tiff/tiled_rgb.tiff"
 )
 
-add_qt_resource(tst_qtiff "tiff"
+qt_add_resource(tst_qtiff "tiff"
     PREFIX
         "/"
     BASE
diff --git a/tests/auto/wbmp/CMakeLists.txt b/tests/auto/wbmp/CMakeLists.txt
index 9b7a3fb..09d4cbd 100644
--- a/tests/auto/wbmp/CMakeLists.txt
+++ b/tests/auto/wbmp/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwbmp Test:
 #####################################################################
 
-add_qt_test(tst_qwbmp
+qt_add_test(tst_qwbmp
     SOURCES
         tst_qwbmp.cpp
     PUBLIC_LIBRARIES
@@ -23,7 +23,7 @@ set(wbmp_resource_files
     "wbmp/qt-logo-small.wbmp"
 )
 
-add_qt_resource(tst_qwbmp "wbmp"
+qt_add_resource(tst_qwbmp "wbmp"
     PREFIX
         "/"
     BASE
diff --git a/tests/auto/webp/CMakeLists.txt b/tests/auto/webp/CMakeLists.txt
index 6c257ec..9d94e6b 100644
--- a/tests/auto/webp/CMakeLists.txt
+++ b/tests/auto/webp/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwebp Test:
 #####################################################################
 
-add_qt_test(tst_qwebp
+qt_add_test(tst_qwebp
     SOURCES
         tst_qwebp.cpp
     PUBLIC_LIBRARIES
@@ -20,7 +20,7 @@ set(webp_resource_files
     "images/kollada_noalpha.webp"
 )
 
-add_qt_resource(tst_qwebp "webp"
+qt_add_resource(tst_qwebp "webp"
     PREFIX
         "/"
     FILES
diff --git a/tests/benchmarks/mng/CMakeLists.txt b/tests/benchmarks/mng/CMakeLists.txt
index bbe61cf..2531a6e 100644
--- a/tests/benchmarks/mng/CMakeLists.txt
+++ b/tests/benchmarks/mng/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qmng Binary:
 #####################################################################
 
-add_qt_executable(tst_bench_qmng
+qt_add_benchmark(tst_bench_qmng
     SOURCES
         tst_qmng.cpp
     PUBLIC_LIBRARIES
@@ -36,7 +36,7 @@ set(mng_resource_files
     "mng/fire.mng"
 )
 
-add_qt_resource(tst_bench_qmng "mng"
+qt_add_resource(tst_bench_qmng "mng"
     PREFIX
         "/"
     BASE
diff --git a/tests/benchmarks/tiff/CMakeLists.txt b/tests/benchmarks/tiff/CMakeLists.txt
index 20d9ce7..37a700c 100644
--- a/tests/benchmarks/tiff/CMakeLists.txt
+++ b/tests/benchmarks/tiff/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qtiff Binary:
 #####################################################################
 
-add_qt_executable(tst_bench_qtiff
+qt_add_benchmark(tst_bench_qtiff
     SOURCES
         tst_qtiff.cpp
     PUBLIC_LIBRARIES
@@ -224,7 +224,7 @@ set(tiff_resource_files
     "tiff/tiled_rgb.tiff"
 )
 
-add_qt_resource(tst_bench_qtiff "tiff"
+qt_add_resource(tst_bench_qtiff "tiff"
     PREFIX
         "/"
     BASE