Regenerate all projects with new CMake API version

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

24 files changed, 57 insertions, 57 deletions

diff --git a/tools/qml/.prev_CMakeLists.txt b/tools/qml/.prev_CMakeLists.txt
index fc1f44d336..9c65660ece 100644
--- a/tools/qml/.prev_CMakeLists.txt
+++ b/tools/qml/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qml Tool:
 #####################################################################
 
-add_qt_tool(qml
+qt_add_tool(qml
     SOURCES
         conf.h
         main.cpp
@@ -24,7 +24,7 @@ set(qml_resource_files
     "resources/qml-64.png"
 )
 
-add_qt_resource(qml "qml"
+qt_add_resource(qml "qml"
     PREFIX
         "/qt-project.org/QmlRuntime"
     FILES
@@ -39,12 +39,12 @@ add_qt_resource(qml "qml"
 ## Scopes:
 #####################################################################
 
-extend_target(qml CONDITION TARGET Qt::Gui
+qt_extend_target(qml CONDITION TARGET Qt::Gui
     PUBLIC_LIBRARIES
         Qt::Gui
 )
 
-extend_target(qml CONDITION TARGET Qt::Widgets
+qt_extend_target(qml CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
@@ -57,7 +57,7 @@ extend_target(qml CONDITION TARGET Qt::Widgets
 # OTHER_FILES = "resources/Info.plist"
 # QMAKE_INFO_PLIST = "resources/Info.plist"
 
-extend_target(qml CONDITION QT_FEATURE_qml_debug
+qt_extend_target(qml CONDITION QT_FEATURE_qml_debug
     DEFINES
         QT_QML_DEBUG_NO_WARNING
 )
diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt
index 84d4c9b803..12cec77288 100644
--- a/tools/qml/CMakeLists.txt
+++ b/tools/qml/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qml Tool:
 #####################################################################
 
-add_qt_tool(qml
+qt_add_tool(qml
     TOOLS_TARGET Qml # special case
     SOURCES
         conf.h
@@ -35,7 +35,7 @@ set(qml_resource_files
     "resources/qml-64.png"
 )
 
-add_qt_resource(qml "qml"
+qt_add_resource(qml "qml"
     PREFIX
         "/qt-project.org/QmlRuntime"
     FILES
@@ -50,12 +50,12 @@ add_qt_resource(qml "qml"
 ## Scopes:
 #####################################################################
 
-extend_target(qml CONDITION TARGET Qt::Gui
+qt_extend_target(qml CONDITION TARGET Qt::Gui
     PUBLIC_LIBRARIES
         Qt::Gui
 )
 
-extend_target(qml CONDITION TARGET Qt::Widgets
+qt_extend_target(qml CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
@@ -68,7 +68,7 @@ extend_target(qml CONDITION TARGET Qt::Widgets
 # OTHER_FILES = "resources/Info.plist"
 # QMAKE_INFO_PLIST = "resources/Info.plist"
 
-extend_target(qml CONDITION QT_FEATURE_qml_debug
+qt_extend_target(qml CONDITION QT_FEATURE_qml_debug
     DEFINES
         QT_QML_DEBUG_NO_WARNING
 )
diff --git a/tools/qmlcachegen/.prev_CMakeLists.txt b/tools/qmlcachegen/.prev_CMakeLists.txt
index d509bad865..51e66d54d2 100644
--- a/tools/qmlcachegen/.prev_CMakeLists.txt
+++ b/tools/qmlcachegen/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlcachegen Tool:
 #####################################################################
 
-add_qt_tool(qmlcachegen
+qt_add_tool(qmlcachegen
     SOURCES
         generateloader.cpp
         qmlcachegen.cpp
diff --git a/tools/qmlcachegen/CMakeLists.txt b/tools/qmlcachegen/CMakeLists.txt
index 4d82c9ce3e..a7fa98ebd8 100644
--- a/tools/qmlcachegen/CMakeLists.txt
+++ b/tools/qmlcachegen/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlcachegen Tool:
 #####################################################################
 
-add_qt_tool(qmlcachegen
+qt_add_tool(qmlcachegen
     TOOLS_TARGET Qml # special case
     SOURCES
         generateloader.cpp
diff --git a/tools/qmleasing/CMakeLists.txt b/tools/qmleasing/CMakeLists.txt
index 9893d8e657..a057e4c50c 100644
--- a/tools/qmleasing/CMakeLists.txt
+++ b/tools/qmleasing/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmleasing Binary:
 #####################################################################
 
-add_qt_executable(qmleasing
+qt_add_executable(qmleasing
     GUI
     SOURCES
         import.ui
@@ -29,7 +29,7 @@ set(resources_resource_files
     "preview.qml"
 )
 
-add_qt_resource(qmleasing "resources"
+qt_add_resource(qmleasing "resources"
     PREFIX
         "/"
     FILES
diff --git a/tools/qmlimportscanner/.prev_CMakeLists.txt b/tools/qmlimportscanner/.prev_CMakeLists.txt
index cdaf3b8bbe..7f736f24df 100644
--- a/tools/qmlimportscanner/.prev_CMakeLists.txt
+++ b/tools/qmlimportscanner/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlimportscanner Tool:
 #####################################################################
 
-add_qt_tool(qmlimportscanner
+qt_add_tool(qmlimportscanner
     SOURCES
         main.cpp
     DEFINES
diff --git a/tools/qmlimportscanner/CMakeLists.txt b/tools/qmlimportscanner/CMakeLists.txt
index 05f8837880..bffbb5f47b 100644
--- a/tools/qmlimportscanner/CMakeLists.txt
+++ b/tools/qmlimportscanner/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlimportscanner Tool:
 #####################################################################
 
-add_qt_tool(qmlimportscanner
+qt_add_tool(qmlimportscanner
     TOOLS_TARGET Qml # special case
     SOURCES
         main.cpp
diff --git a/tools/qmljs/.prev_CMakeLists.txt b/tools/qmljs/.prev_CMakeLists.txt
index 2c3b500e03..0f845fa3ed 100644
--- a/tools/qmljs/.prev_CMakeLists.txt
+++ b/tools/qmljs/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmljs Tool:
 #####################################################################
 
-add_qt_tool(qmljs
+qt_add_tool(qmljs
     SOURCES
         qmljs.cpp
     DEFINES
@@ -45,42 +45,42 @@ add_qt_tool(qmljs
 ## Scopes:
 #####################################################################
 
-extend_target(qmljs CONDITION WIN32
+qt_extend_target(qmljs CONDITION WIN32
     DEFINES
         NOMINMAX
 )
 
-extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
     DEFINES
         WTF_USE_UDIS86=1
 )
 
-extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
     DEFINES
         WTF_USE_ARMV7_DISASSEMBLER=1
 )
 
-extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
     DEFINES
         WTF_USE_ARM64_DISASSEMBLER=1
 )
 
-extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
     DEFINES
         WTF_USE_MIPS32_DISASSEMBLER=1
 )
 
-extend_target(qmljs CONDITION NOT disassembler
+qt_extend_target(qmljs CONDITION NOT disassembler
     DEFINES
         WTF_USE_UDIS86=0
 )
 
-extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release
     DEFINES
         NDEBUG
 )
 
-extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
     COMPILE_OPTIONS
         -Wno-expansion-to-defined
 )
diff --git a/tools/qmljs/CMakeLists.txt b/tools/qmljs/CMakeLists.txt
index 300a9ac47a..4655bfb9fc 100644
--- a/tools/qmljs/CMakeLists.txt
+++ b/tools/qmljs/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmljs Tool:
 #####################################################################
 
-add_qt_tool(qmljs
+qt_add_tool(qmljs
     TOOLS_TARGET Qml # special case
     SOURCES
         qmljs.cpp
@@ -46,42 +46,42 @@ add_qt_tool(qmljs
 ## Scopes:
 #####################################################################
 
-extend_target(qmljs CONDITION WIN32
+qt_extend_target(qmljs CONDITION WIN32
     DEFINES
         NOMINMAX
 )
 
-extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
     DEFINES
         WTF_USE_UDIS86=1
 )
 
-extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
     DEFINES
         WTF_USE_ARMV7_DISASSEMBLER=1
 )
 
-extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
     DEFINES
         WTF_USE_ARM64_DISASSEMBLER=1
 )
 
-extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
     DEFINES
         WTF_USE_MIPS32_DISASSEMBLER=1
 )
 
-extend_target(qmljs CONDITION NOT disassembler
+qt_extend_target(qmljs CONDITION NOT disassembler
     DEFINES
         WTF_USE_UDIS86=0
 )
 
-extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release
     DEFINES
         NDEBUG
 )
 
-extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
     COMPILE_OPTIONS
         -Wno-expansion-to-defined
 )
diff --git a/tools/qmllint/.prev_CMakeLists.txt b/tools/qmllint/.prev_CMakeLists.txt
index cdc76dd106..4dcfce16e8 100644
--- a/tools/qmllint/.prev_CMakeLists.txt
+++ b/tools/qmllint/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmllint Tool:
 #####################################################################
 
-add_qt_tool(qmllint
+qt_add_tool(qmllint
     SOURCES
         componentversion.cpp componentversion.h
         fakemetaobject.cpp fakemetaobject.h
diff --git a/tools/qmllint/CMakeLists.txt b/tools/qmllint/CMakeLists.txt
index 949e6e51fa..80a5f11128 100644
--- a/tools/qmllint/CMakeLists.txt
+++ b/tools/qmllint/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmllint Tool:
 #####################################################################
 
-add_qt_tool(qmllint
+qt_add_tool(qmllint
     TOOLS_TARGET Qml # special case
     SOURCES
         componentversion.cpp componentversion.h
diff --git a/tools/qmlmin/.prev_CMakeLists.txt b/tools/qmlmin/.prev_CMakeLists.txt
index 39df27a3bd..6e897137ba 100644
--- a/tools/qmlmin/.prev_CMakeLists.txt
+++ b/tools/qmlmin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlmin Tool:
 #####################################################################
 
-add_qt_tool(qmlmin
+qt_add_tool(qmlmin
     SOURCES
         main.cpp
     LIBRARIES
diff --git a/tools/qmlmin/CMakeLists.txt b/tools/qmlmin/CMakeLists.txt
index 73d764aace..51ea6b52b6 100644
--- a/tools/qmlmin/CMakeLists.txt
+++ b/tools/qmlmin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlmin Tool:
 #####################################################################
 
-add_qt_tool(qmlmin
+qt_add_tool(qmlmin
     TOOLS_TARGET Qml # special case
     SOURCES
         main.cpp
diff --git a/tools/qmlplugindump/.prev_CMakeLists.txt b/tools/qmlplugindump/.prev_CMakeLists.txt
index 561a1cc6d9..90fd3d2ebb 100644
--- a/tools/qmlplugindump/.prev_CMakeLists.txt
+++ b/tools/qmlplugindump/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlplugindump Tool:
 #####################################################################
 
-add_qt_tool(qmlplugindump
+qt_add_tool(qmlplugindump
     SOURCES
         main.cpp
         qmlstreamwriter.cpp qmlstreamwriter.h
@@ -26,12 +26,12 @@ add_qt_tool(qmlplugindump
 ## Scopes:
 #####################################################################
 
-extend_target(qmlplugindump CONDITION TARGET Qt::Widgets
+qt_extend_target(qmlplugindump CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-extend_target(qmlplugindump CONDITION APPLE_OSX
+qt_extend_target(qmlplugindump CONDITION APPLE_OSX
     LINK_OPTIONS
         "-Wl,-sectcreate,__TEXT,__info_plist,$$shell_quote$$PWD/Info.plist"
 )
diff --git a/tools/qmlplugindump/CMakeLists.txt b/tools/qmlplugindump/CMakeLists.txt
index 57f96a1f94..887fe0999e 100644
--- a/tools/qmlplugindump/CMakeLists.txt
+++ b/tools/qmlplugindump/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlplugindump Tool:
 #####################################################################
 
-add_qt_tool(qmlplugindump
+qt_add_tool(qmlplugindump
     TOOLS_TARGET Qml # special case
     SOURCES
         main.cpp
@@ -27,12 +27,12 @@ add_qt_tool(qmlplugindump
 ## Scopes:
 #####################################################################
 
-extend_target(qmlplugindump CONDITION TARGET Qt::Widgets
+qt_extend_target(qmlplugindump CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-extend_target(qmlplugindump CONDITION APPLE_OSX
+qt_extend_target(qmlplugindump CONDITION APPLE_OSX
     LINK_OPTIONS
         "-Wl,-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" # special case
 )
diff --git a/tools/qmlpreview/.prev_CMakeLists.txt b/tools/qmlpreview/.prev_CMakeLists.txt
index c1c40d5fbf..87754e3ff0 100644
--- a/tools/qmlpreview/.prev_CMakeLists.txt
+++ b/tools/qmlpreview/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlpreview Tool:
 #####################################################################
 
-add_qt_tool(qmlpreview
+qt_add_tool(qmlpreview
     SOURCES
         main.cpp
         qmlpreviewapplication.cpp qmlpreviewapplication.h
diff --git a/tools/qmlpreview/CMakeLists.txt b/tools/qmlpreview/CMakeLists.txt
index 7e0b808f2c..b0885beee1 100644
--- a/tools/qmlpreview/CMakeLists.txt
+++ b/tools/qmlpreview/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlpreview Tool:
 #####################################################################
 
-add_qt_tool(qmlpreview
+qt_add_tool(qmlpreview
     TOOLS_TARGET Qml # special case
     SOURCES
         main.cpp
diff --git a/tools/qmlprofiler/.prev_CMakeLists.txt b/tools/qmlprofiler/.prev_CMakeLists.txt
index 1d6ac20ad6..f182f00b01 100644
--- a/tools/qmlprofiler/.prev_CMakeLists.txt
+++ b/tools/qmlprofiler/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlprofiler Tool:
 #####################################################################
 
-add_qt_tool(qmlprofiler
+qt_add_tool(qmlprofiler
     SOURCES
         commandlistener.cpp commandlistener.h
         constants.h
diff --git a/tools/qmlprofiler/CMakeLists.txt b/tools/qmlprofiler/CMakeLists.txt
index 672a782136..6ff683926b 100644
--- a/tools/qmlprofiler/CMakeLists.txt
+++ b/tools/qmlprofiler/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlprofiler Tool:
 #####################################################################
 
-add_qt_tool(qmlprofiler
+qt_add_tool(qmlprofiler
     TOOLS_TARGET Qml # special case
     SOURCES
         commandlistener.cpp commandlistener.h
diff --git a/tools/qmlscene/.prev_CMakeLists.txt b/tools/qmlscene/.prev_CMakeLists.txt
index da19ae27bb..c56301e359 100644
--- a/tools/qmlscene/.prev_CMakeLists.txt
+++ b/tools/qmlscene/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlscene Tool:
 #####################################################################
 
-add_qt_tool(qmlscene
+qt_add_tool(qmlscene
     SOURCES
         main.cpp
     DEFINES
@@ -25,12 +25,12 @@ add_qt_tool(qmlscene
 ## Scopes:
 #####################################################################
 
-extend_target(qmlscene CONDITION TARGET Qt::Widgets
+qt_extend_target(qmlscene CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-extend_target(qmlscene CONDITION QT_FEATURE_qml_debug
+qt_extend_target(qmlscene CONDITION QT_FEATURE_qml_debug
     DEFINES
         QT_QML_DEBUG_NO_WARNING
 )
diff --git a/tools/qmlscene/CMakeLists.txt b/tools/qmlscene/CMakeLists.txt
index 1414009587..4212c627d4 100644
--- a/tools/qmlscene/CMakeLists.txt
+++ b/tools/qmlscene/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlscene Tool:
 #####################################################################
 
-add_qt_tool(qmlscene
+qt_add_tool(qmlscene
     TOOLS_TARGET Qml # special case
     SOURCES
         main.cpp
@@ -26,12 +26,12 @@ add_qt_tool(qmlscene
 ## Scopes:
 #####################################################################
 
-extend_target(qmlscene CONDITION TARGET Qt::Widgets
+qt_extend_target(qmlscene CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-extend_target(qmlscene CONDITION QT_FEATURE_qml_debug
+qt_extend_target(qmlscene CONDITION QT_FEATURE_qml_debug
     DEFINES
         QT_QML_DEBUG_NO_WARNING
 )
diff --git a/tools/qmltestrunner/.prev_CMakeLists.txt b/tools/qmltestrunner/.prev_CMakeLists.txt
index c02d6e0226..0033cc0679 100644
--- a/tools/qmltestrunner/.prev_CMakeLists.txt
+++ b/tools/qmltestrunner/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmltestrunner Tool:
 #####################################################################
 
-add_qt_tool(qmltestrunner
+qt_add_tool(qmltestrunner
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tools/qmltestrunner/CMakeLists.txt b/tools/qmltestrunner/CMakeLists.txt
index 0823d57c00..03d6cb77fb 100644
--- a/tools/qmltestrunner/CMakeLists.txt
+++ b/tools/qmltestrunner/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmltestrunner Tool:
 #####################################################################
 
-add_qt_tool(qmltestrunner
+qt_add_tool(qmltestrunner
     TOOLS_TARGET Qml # special case
     SOURCES
         main.cpp
diff --git a/tools/qmltime/CMakeLists.txt b/tools/qmltime/CMakeLists.txt
index 77b3e59368..4fb203cfbe 100644
--- a/tools/qmltime/CMakeLists.txt
+++ b/tools/qmltime/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmltime Binary:
 #####################################################################
 
-add_qt_executable(qmltime
+qt_add_executable(qmltime
     GUI
     SOURCES
         qmltime.cpp