Regenerate projects

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

16 files changed, 134 insertions, 151 deletions

diff --git a/src/designer/src/components/lib/CMakeLists.txt b/src/designer/src/components/lib/CMakeLists.txt
index afe73e08b..da3f062ca 100644
--- a/src/designer/src/components/lib/CMakeLists.txt
+++ b/src/designer/src/components/lib/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## DesignerComponents Module:
 #####################################################################
 
-add_qt_module(DesignerComponents
+qt_add_module(DesignerComponents
     INTERNAL_MODULE
     SOURCES
         ../buddyeditor/buddyeditor.cpp ../buddyeditor/buddyeditor.h
@@ -136,7 +136,7 @@ set(propertyeditor_resource_files
     "fontmapping.xml"
 )
 
-add_qt_resource(DesignerComponents "propertyeditor"
+qt_add_resource(DesignerComponents "propertyeditor"
     PREFIX
         "/qt-project.org/propertyeditor"
     BASE
@@ -835,7 +835,7 @@ set(formeditor_resource_files
     "images/win/widgettool.png"
 )
 
-add_qt_resource(DesignerComponents "formeditor"
+qt_add_resource(DesignerComponents "formeditor"
     PREFIX
         "/qt-project.org/formeditor"
     BASE
@@ -850,7 +850,7 @@ set(formeditor1_resource_files
     "defaultbrushes.xml"
 )
 
-add_qt_resource(DesignerComponents "formeditor1"
+qt_add_resource(DesignerComponents "formeditor1"
     PREFIX
         "/qt-project.org/brushes"
     BASE
@@ -865,7 +865,7 @@ set(widgetbox_resource_files
     "widgetbox.xml"
 )
 
-add_qt_resource(DesignerComponents "widgetbox"
+qt_add_resource(DesignerComponents "widgetbox"
     PREFIX
         "/qt-project.org/widgetbox"
     BASE
@@ -877,24 +877,23 @@ add_qt_resource(DesignerComponents "widgetbox"
 
 #### Keys ignored in scope 1:.:.:lib.pro:<TRUE>:
 # MODULE = "designercomponents"
-# _LOADED = "qt_module"
 
 ## Scopes:
 #####################################################################
 
-extend_target(DesignerComponents CONDITION static
+qt_extend_target(DesignerComponents CONDITION static
     DEFINES
         QT_DESIGNER_STATIC
 )
 
-extend_target(DesignerComponents CONDITION NOT QT_BUILD_SHARED_LIBS
+qt_extend_target(DesignerComponents CONDITION NOT QT_BUILD_SHARED_LIBS
     INCLUDE_DIRECTORIES
         ../../../../shared/findwidget
         ../../../../shared/qtgradienteditor
         ../../../../shared/qtpropertybrowser
 )
 
-extend_target(DesignerComponents CONDITION QT_BUILD_SHARED_LIBS
+qt_extend_target(DesignerComponents CONDITION QT_BUILD_SHARED_LIBS
     SOURCES
         ../../../../shared/findwidget/abstractfindwidget.cpp ../../../../shared/findwidget/abstractfindwidget.h
         ../../../../shared/findwidget/itemviewfindwidget.cpp ../../../../shared/findwidget/itemviewfindwidget.h
@@ -916,6 +915,53 @@ extend_target(DesignerComponents CONDITION QT_BUILD_SHARED_LIBS
 
 if(QT_BUILD_SHARED_LIBS)
     # Resources:
+    set_source_files_properties("../../../../shared/findwidget/images/mac/closetab.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/mac/closetab.png"
+    )
+    set_source_files_properties("../../../../shared/findwidget/images/mac/next.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/mac/next.png"
+    )
+    set_source_files_properties("../../../../shared/findwidget/images/mac/previous.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/mac/previous.png"
+    )
+    set_source_files_properties("../../../../shared/findwidget/images/mac/searchfind.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/mac/searchfind.png"
+    )
+    set_source_files_properties("../../../../shared/findwidget/images/win/closetab.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/win/closetab.png"
+    )
+    set_source_files_properties("../../../../shared/findwidget/images/win/next.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/win/next.png"
+    )
+    set_source_files_properties("../../../../shared/findwidget/images/win/previous.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/win/previous.png"
+    )
+    set_source_files_properties("../../../../shared/findwidget/images/win/searchfind.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/win/searchfind.png"
+    )
+    set_source_files_properties("../../../../shared/findwidget/images/wrap.png"
+        PROPERTIES QT_RESOURCE_ALIAS "images/wrap.png"
+    )
+    set(findwidget_resource_files
+        "images/mac/closetab.png"
+        "images/mac/next.png"
+        "images/mac/previous.png"
+        "images/mac/searchfind.png"
+        "images/win/closetab.png"
+        "images/win/next.png"
+        "images/win/previous.png"
+        "images/win/searchfind.png"
+        "images/wrap.png"
+    )
+
+    qt_add_resource(DesignerComponents "findwidget"
+        PREFIX
+            "/qt-project.org/shared"
+        BASE
+            "../../../../shared/findwidget"
+        FILES
+            ${findwidget_resource_files}
+    )
     set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-arrow.png"
         PROPERTIES QT_RESOURCE_ALIAS "images/cursor-arrow.png"
     )
@@ -990,8 +1036,8 @@ if(QT_BUILD_SHARED_LIBS)
         "images/cursor-wait.png"
         "images/cursor-whatsthis.png"
     )
-    
-    add_qt_resource(DesignerComponents "qtpropertybrowser"
+
+    qt_add_resource(DesignerComponents "qtpropertybrowser"
         PREFIX
             "/qt-project.org/qtpropertybrowser"
         BASE
@@ -999,51 +1045,4 @@ if(QT_BUILD_SHARED_LIBS)
         FILES
             ${qtpropertybrowser_resource_files}
     )
-    set_source_files_properties("../../../../shared/findwidget/images/mac/closetab.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/mac/closetab.png"
-    )
-    set_source_files_properties("../../../../shared/findwidget/images/mac/next.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/mac/next.png"
-    )
-    set_source_files_properties("../../../../shared/findwidget/images/mac/previous.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/mac/previous.png"
-    )
-    set_source_files_properties("../../../../shared/findwidget/images/mac/searchfind.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/mac/searchfind.png"
-    )
-    set_source_files_properties("../../../../shared/findwidget/images/win/closetab.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/win/closetab.png"
-    )
-    set_source_files_properties("../../../../shared/findwidget/images/win/next.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/win/next.png"
-    )
-    set_source_files_properties("../../../../shared/findwidget/images/win/previous.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/win/previous.png"
-    )
-    set_source_files_properties("../../../../shared/findwidget/images/win/searchfind.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/win/searchfind.png"
-    )
-    set_source_files_properties("../../../../shared/findwidget/images/wrap.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/wrap.png"
-    )
-    set(findwidget_resource_files
-        "images/mac/closetab.png"
-        "images/mac/next.png"
-        "images/mac/previous.png"
-        "images/mac/searchfind.png"
-        "images/win/closetab.png"
-        "images/win/next.png"
-        "images/win/previous.png"
-        "images/win/searchfind.png"
-        "images/wrap.png"
-    )
-    
-    add_qt_resource(DesignerComponents "findwidget"
-        PREFIX
-            "/qt-project.org/shared"
-        BASE
-            "../../../../shared/findwidget"
-        FILES
-            ${findwidget_resource_files}
-    )
 endif()
diff --git a/src/designer/src/designer/CMakeLists.txt b/src/designer/src/designer/CMakeLists.txt
index a4e0c8eed..2731cfa2d 100644
--- a/src/designer/src/designer/CMakeLists.txt
+++ b/src/designer/src/designer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## designer Binary:
 #####################################################################
 
-add_qt_executable(designer
+qt_add_executable(designer
     GUI
     SOURCES
         ../../../shared/fontpanel/fontpanel.cpp ../../../shared/fontpanel/fontpanel.h
@@ -55,7 +55,7 @@ set(designer_resource_files
     "images/designer.png"
 )
 
-add_qt_resource(designer "designer"
+qt_add_resource(designer "designer"
     PREFIX
         "/qt-project.org/designer"
     FILES
@@ -88,7 +88,7 @@ set(qttoolbardialog_resource_files
     "images/up.png"
 )
 
-add_qt_resource(designer "qttoolbardialog"
+qt_add_resource(designer "qttoolbardialog"
     PREFIX
         "/qt-project.org/qttoolbardialog"
     BASE
@@ -100,17 +100,16 @@ add_qt_resource(designer "qttoolbardialog"
 
 #### Keys ignored in scope 1:.:.:designer.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "Qt" "Designer"
-# _LOADED = "qt_app"
 
 ## Scopes:
 #####################################################################
 
-extend_target(designer CONDITION TARGET Qt::PrintSupport
+qt_extend_target(designer CONDITION TARGET Qt::PrintSupport
     PUBLIC_LIBRARIES
         Qt::PrintSupport
 )
 
-extend_target(designer CONDITION QT_CONFIG___contains___static
+qt_extend_target(designer CONDITION QT_CONFIG___contains___static
     DEFINES
         QT_DESIGNER_STATIC
 )
@@ -129,11 +128,11 @@ extend_target(designer CONDITION QT_CONFIG___contains___static
 # QMAKE_BUNDLE_DATA = "FILETYPES"
 # QMAKE_INFO_PLIST = "Info_mac.plist"
 
-extend_target(designer CONDITION UNIX AND NOT APPLE_OSX AND NOT HAIKU
+qt_extend_target(designer CONDITION UNIX AND NOT APPLE_OSX AND NOT HAIKU
     PUBLIC_LIBRARIES
         m
 )
-add_qt_docs(designer
+qt_add_docs(designer
     doc/qtdesigner.qdocconf
 )
 
diff --git a/src/designer/src/lib/CMakeLists.txt b/src/designer/src/lib/CMakeLists.txt
index 160e4828b..323e190be 100644
--- a/src/designer/src/lib/CMakeLists.txt
+++ b/src/designer/src/lib/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Designer Module:
 #####################################################################
 
-add_qt_module(Designer
+qt_add_module(Designer
     PLUGIN_TYPES designer
     SOURCES
         ../../../shared/deviceskin/deviceskin.cpp ../../../shared/deviceskin/deviceskin.h
@@ -177,31 +177,6 @@ add_qt_module(Designer
 )
 
 # Resources:
-set(shared_resource_files
-    "defaultgradients.xml"
-    "templates/forms/240x320/Dialog_with_Buttons_Bottom.ui"
-    "templates/forms/240x320/Dialog_with_Buttons_Right.ui"
-    "templates/forms/320x240/Dialog_with_Buttons_Bottom.ui"
-    "templates/forms/320x240/Dialog_with_Buttons_Right.ui"
-    "templates/forms/480x640/Dialog_with_Buttons_Bottom.ui"
-    "templates/forms/480x640/Dialog_with_Buttons_Right.ui"
-    "templates/forms/640x480/Dialog_with_Buttons_Bottom.ui"
-    "templates/forms/640x480/Dialog_with_Buttons_Right.ui"
-    "templates/forms/Dialog_with_Buttons_Bottom.ui"
-    "templates/forms/Dialog_with_Buttons_Right.ui"
-    "templates/forms/Dialog_without_Buttons.ui"
-    "templates/forms/Main_Window.ui"
-    "templates/forms/Widget.ui"
-)
-
-add_qt_resource(Designer "shared"
-    PREFIX
-        "/qt-project.org/designer"
-    BASE
-        "shared"
-    FILES
-        ${shared_resource_files}
-)
 set_source_files_properties("../../../shared/deviceskin/skins/ClamshellPhone.skin"
     PROPERTIES QT_RESOURCE_ALIAS "ClamshellPhone.skin"
 )
@@ -209,7 +184,7 @@ set(ClamshellPhone_resource_files
     "ClamshellPhone.skin"
 )
 
-add_qt_resource(Designer "ClamshellPhone"
+qt_add_resource(Designer "ClamshellPhone"
     PREFIX
         "/skins"
     BASE
@@ -224,7 +199,7 @@ set(SmartPhone2_resource_files
     "SmartPhone2.skin"
 )
 
-add_qt_resource(Designer "SmartPhone2"
+qt_add_resource(Designer "SmartPhone2"
     PREFIX
         "/skins"
     BASE
@@ -239,7 +214,7 @@ set(SmartPhone_resource_files
     "SmartPhone.skin"
 )
 
-add_qt_resource(Designer "SmartPhone"
+qt_add_resource(Designer "SmartPhone"
     PREFIX
         "/skins"
     BASE
@@ -254,7 +229,7 @@ set(SmartPhoneWithButtons_resource_files
     "SmartPhoneWithButtons.skin"
 )
 
-add_qt_resource(Designer "SmartPhoneWithButtons"
+qt_add_resource(Designer "SmartPhoneWithButtons"
     PREFIX
         "/skins"
     BASE
@@ -269,7 +244,7 @@ set(TouchscreenPhone_resource_files
     "TouchscreenPhone.skin"
 )
 
-add_qt_resource(Designer "TouchscreenPhone"
+qt_add_resource(Designer "TouchscreenPhone"
     PREFIX
         "/skins"
     BASE
@@ -284,7 +259,7 @@ set(PortableMedia_resource_files
     "PortableMedia.skin"
 )
 
-add_qt_resource(Designer "PortableMedia"
+qt_add_resource(Designer "PortableMedia"
     PREFIX
         "/skins"
     BASE
@@ -299,7 +274,7 @@ set(S60-QVGA-Candybar_resource_files
     "S60-QVGA-Candybar.skin"
 )
 
-add_qt_resource(Designer "S60-QVGA-Candybar"
+qt_add_resource(Designer "S60-QVGA-Candybar"
     PREFIX
         "/skins"
     BASE
@@ -314,7 +289,7 @@ set(S60-nHD-Touchscreen_resource_files
     "S60-nHD-Touchscreen.skin"
 )
 
-add_qt_resource(Designer "S60-nHD-Touchscreen"
+qt_add_resource(Designer "S60-nHD-Touchscreen"
     PREFIX
         "/skins"
     BASE
@@ -361,7 +336,7 @@ set(findwidget_resource_files
     "images/wrap.png"
 )
 
-add_qt_resource(Designer "findwidget"
+qt_add_resource(Designer "findwidget"
     PREFIX
         "/qt-project.org/shared"
     BASE
@@ -428,7 +403,7 @@ set(qtgradienteditor_resource_files
     "images/zoomout.png"
 )
 
-add_qt_resource(Designer "qtgradienteditor"
+qt_add_resource(Designer "qtgradienteditor"
     PREFIX
         "/qt-project.org/qtgradienteditor"
     BASE
@@ -436,21 +411,45 @@ add_qt_resource(Designer "qtgradienteditor"
     FILES
         ${qtgradienteditor_resource_files}
 )
+set(shared_resource_files
+    "defaultgradients.xml"
+    "templates/forms/240x320/Dialog_with_Buttons_Bottom.ui"
+    "templates/forms/240x320/Dialog_with_Buttons_Right.ui"
+    "templates/forms/320x240/Dialog_with_Buttons_Bottom.ui"
+    "templates/forms/320x240/Dialog_with_Buttons_Right.ui"
+    "templates/forms/480x640/Dialog_with_Buttons_Bottom.ui"
+    "templates/forms/480x640/Dialog_with_Buttons_Right.ui"
+    "templates/forms/640x480/Dialog_with_Buttons_Bottom.ui"
+    "templates/forms/640x480/Dialog_with_Buttons_Right.ui"
+    "templates/forms/Dialog_with_Buttons_Bottom.ui"
+    "templates/forms/Dialog_with_Buttons_Right.ui"
+    "templates/forms/Dialog_without_Buttons.ui"
+    "templates/forms/Main_Window.ui"
+    "templates/forms/Widget.ui"
+)
+
+qt_add_resource(Designer "shared"
+    PREFIX
+        "/qt-project.org/designer"
+    BASE
+        "shared"
+    FILES
+        ${shared_resource_files}
+)
 
 
 #### Keys ignored in scope 1:.:.:lib.pro:<TRUE>:
 # MODULE = "designer"
-# _LOADED = "qt_module"
 
 ## Scopes:
 #####################################################################
 
-extend_target(Designer CONDITION static
+qt_extend_target(Designer CONDITION static
     DEFINES
         QT_DESIGNER_STATIC
 )
 
-extend_target(Designer CONDITION NOT QT_BUILD_SHARED_LIBS
+qt_extend_target(Designer CONDITION NOT QT_BUILD_SHARED_LIBS
     SOURCES
         ../../../shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp ../../../shared/qtpropertybrowser/qtbuttonpropertybrowser.h
         ../../../shared/qtpropertybrowser/qteditorfactory.cpp ../../../shared/qtpropertybrowser/qteditorfactory.h
@@ -540,8 +539,8 @@ if(NOT QT_BUILD_SHARED_LIBS)
         "images/cursor-wait.png"
         "images/cursor-whatsthis.png"
     )
-    
-    add_qt_resource(Designer "qtpropertybrowser"
+
+    qt_add_resource(Designer "qtpropertybrowser"
         PREFIX
             "/qt-project.org/qtpropertybrowser"
         BASE
@@ -551,7 +550,7 @@ if(NOT QT_BUILD_SHARED_LIBS)
     )
 endif()
 
-extend_target(Designer CONDITION QT_BUILD_SHARED_LIBS
+qt_extend_target(Designer CONDITION QT_BUILD_SHARED_LIBS
     SOURCES
         ../../../shared/qtpropertybrowser/qtpropertybrowserutils.cpp ../../../shared/qtpropertybrowser/qtpropertybrowserutils_p.h
     INCLUDE_DIRECTORIES
diff --git a/src/designer/src/plugins/qquickwidget/CMakeLists.txt b/src/designer/src/plugins/qquickwidget/CMakeLists.txt
index dcfd0989c..f379e7a39 100644
--- a/src/designer/src/plugins/qquickwidget/CMakeLists.txt
+++ b/src/designer/src/plugins/qquickwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qquickwidget Plugin:
 #####################################################################
 
-add_qt_plugin(qquickwidget
+qt_add_plugin(qquickwidget
     TYPE designer
     CLASS_NAME QQuickWidgetPlugin
     SOURCES
@@ -22,7 +22,7 @@ set(qquickwidget_plugin_resource_files
     "images/qquickwidget.png"
 )
 
-add_qt_resource(qquickwidget "qquickwidget_plugin"
+qt_add_resource(qquickwidget "qquickwidget_plugin"
     PREFIX
         "/qt-project.org/qquickwidget"
     FILES
diff --git a/src/designer/src/uiplugin/CMakeLists.txt b/src/designer/src/uiplugin/CMakeLists.txt
index 39f373e43..01cddfea5 100644
--- a/src/designer/src/uiplugin/CMakeLists.txt
+++ b/src/designer/src/uiplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## UiPlugin Module:
 #####################################################################
 
-add_qt_module(UiPlugin
+qt_add_module(UiPlugin
     NO_PRIVATE_MODULE
     HEADER_MODULE
     QMAKE_MODULE_CONFIG designer_defines
@@ -16,4 +16,3 @@ add_qt_module(UiPlugin
 
 #### Keys ignored in scope 1:.:.:uiplugin.pro:<TRUE>:
 # MODULE_CONFIG = "designer_defines"
-# _LOADED = "qt_module"
diff --git a/src/designer/src/uitools/CMakeLists.txt b/src/designer/src/uitools/CMakeLists.txt
index 4623e84d2..5babb212f 100644
--- a/src/designer/src/uitools/CMakeLists.txt
+++ b/src/designer/src/uitools/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## UiTools Module:
 #####################################################################
 
-add_qt_module(UiTools
+qt_add_module(UiTools
     STATIC
     SOURCES
         ../lib/uilib/abstractformbuilder.cpp ../lib/uilib/abstractformbuilder.h
@@ -30,12 +30,9 @@ add_qt_module(UiTools
         Qt::Widgets
 )
 
-#### Keys ignored in scope 1:.:.:uitools.pro:<TRUE>:
-# _LOADED = "qt_module"
-
 ## Scopes:
 #####################################################################
-add_qt_docs(UiTools
+qt_add_docs(UiTools
     doc/qtuitools.qdocconf
 )
 
diff --git a/src/linguist/lconvert/CMakeLists.txt b/src/linguist/lconvert/CMakeLists.txt
index d0f96bc06..6a47b65fb 100644
--- a/src/linguist/lconvert/CMakeLists.txt
+++ b/src/linguist/lconvert/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## lconvert Tool:
 #####################################################################
 
-add_qt_tool(lconvert
+qt_add_tool(lconvert
     SOURCES
         ../shared/numerus.cpp
         ../shared/po.cpp
@@ -28,5 +28,4 @@ add_qt_tool(lconvert
 
 #### Keys ignored in scope 1:.:.:lconvert.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "Qt Translation File Converter"
-# _LOADED = "qt_tool"
 # _OPTION = "host_build"
diff --git a/src/linguist/linguist/CMakeLists.txt b/src/linguist/linguist/CMakeLists.txt
index eda0e9c4e..8d6d42700 100644
--- a/src/linguist/linguist/CMakeLists.txt
+++ b/src/linguist/linguist/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## linguist Binary:
 #####################################################################
 
-add_qt_executable(linguist
+qt_add_executable(linguist
     GUI
     SOURCES
         ../shared/numerus.cpp
@@ -121,7 +121,7 @@ set(linguist_resource_files
     "images/win/whatsthis.png"
 )
 
-add_qt_resource(linguist "linguist"
+qt_add_resource(linguist "linguist"
     PREFIX
         "/"
     FILES
@@ -132,14 +132,13 @@ add_qt_resource(linguist "linguist"
 #### Keys ignored in scope 1:.:.:linguist.pro:<TRUE>:
 # PROJECTNAME = "Qt" "Linguist"
 # QMAKE_TARGET_DESCRIPTION = "Qt" "Linguist"
-# _LOADED = "qt_app"
 # phrasebooks.files = "$$PWD/../phrasebooks/*"
 # phrasebooks.path = "$$[QT_INSTALL_DATA]/phrasebooks"
 
 ## Scopes:
 #####################################################################
 
-extend_target(linguist CONDITION QT_PRODUCT___contains___OpenSource._x_
+qt_extend_target(linguist CONDITION QT_PRODUCT___contains___OpenSource._x_
     DEFINES
         QT_OPENSOURCE
 )
@@ -154,7 +153,7 @@ extend_target(linguist CONDITION QT_PRODUCT___contains___OpenSource._x_
 #### Keys ignored in scope 5:.:.:linguist.pro:APPLE:
 # ICON = "linguist.icns"
 # QMAKE_INFO_PLIST = "Info_mac.plist"
-add_qt_docs(linguist
+qt_add_docs(linguist
     doc/qtlinguist.qdocconf
 )
 
diff --git a/src/linguist/lprodump/CMakeLists.txt b/src/linguist/lprodump/CMakeLists.txt
index f356f810a..2fb6df7f3 100644
--- a/src/linguist/lprodump/CMakeLists.txt
+++ b/src/linguist/lprodump/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## lprodump Tool:
 #####################################################################
 
-add_qt_tool(lprodump
+qt_add_tool(lprodump
     SOURCES
         ../shared/ioutils.cpp ../shared/ioutils.h
         ../shared/profileevaluator.cpp ../shared/profileevaluator.h
@@ -37,7 +37,7 @@ set(proparser_resource_files
     "exclusive_builds.prf"
 )
 
-add_qt_resource(lprodump "proparser"
+qt_add_resource(lprodump "proparser"
     PREFIX
         "/qmake/override_features"
     BASE
@@ -50,7 +50,6 @@ add_qt_resource(lprodump "proparser"
 #### Keys ignored in scope 1:.:.:lprodump.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "Qt Linguist QMake Project Dump Tool"
 # QT_TOOL_ENV = "qmake"
-# _LOADED = "qt_tool"
 # _OPTION = "host_build"
 # qmake.name = "QMAKE"
 # qmake.value = "$$shell_path($$QMAKE_QMAKE)"
diff --git a/src/linguist/lrelease-pro/CMakeLists.txt b/src/linguist/lrelease-pro/CMakeLists.txt
index fa0c34d44..c19616031 100644
--- a/src/linguist/lrelease-pro/CMakeLists.txt
+++ b/src/linguist/lrelease-pro/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## lrelease-pro Tool:
 #####################################################################
 
-add_qt_tool(lrelease-pro
+qt_add_tool(lrelease-pro
     SOURCES
         ../shared/runqttool.cpp ../shared/runqttool.h
         main.cpp
@@ -18,7 +18,6 @@ add_qt_tool(lrelease-pro
 #### Keys ignored in scope 1:.:.:lrelease-pro.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "Qt Translation File Compiler for QMake Projects"
 # QT_TOOL_ENV = "qmake"
-# _LOADED = "qt_tool"
 # _OPTION = "host_build"
 # qmake.name = "QMAKE"
 # qmake.value = "$$shell_path($$QMAKE_QMAKE)"
diff --git a/src/linguist/lrelease/CMakeLists.txt b/src/linguist/lrelease/CMakeLists.txt
index 03b149af7..307cef82d 100644
--- a/src/linguist/lrelease/CMakeLists.txt
+++ b/src/linguist/lrelease/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## lrelease Tool:
 #####################################################################
 
-add_qt_tool(lrelease
+qt_add_tool(lrelease
     SOURCES
         ../shared/numerus.cpp
         ../shared/po.cpp
@@ -31,7 +31,6 @@ add_qt_tool(lrelease
 #### Keys ignored in scope 1:.:.:lrelease.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "Qt Translation File Compiler"
 # QT_TOOL_ENV = "qmake"
-# _LOADED = "qt_tool"
 # _OPTION = "host_build"
 # qmake.name = "QMAKE"
 # qmake.value = "$$shell_path($$QMAKE_QMAKE)"
diff --git a/src/linguist/lupdate-pro/CMakeLists.txt b/src/linguist/lupdate-pro/CMakeLists.txt
index 958ba19a2..07f7af6f5 100644
--- a/src/linguist/lupdate-pro/CMakeLists.txt
+++ b/src/linguist/lupdate-pro/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## lupdate-pro Tool:
 #####################################################################
 
-add_qt_tool(lupdate-pro
+qt_add_tool(lupdate-pro
     SOURCES
         ../shared/runqttool.cpp ../shared/runqttool.h
         main.cpp
@@ -18,7 +18,6 @@ add_qt_tool(lupdate-pro
 #### Keys ignored in scope 1:.:.:lupdate-pro.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "Qt Translation File Update Tool for QMake Projects"
 # QT_TOOL_ENV = "qmake"
-# _LOADED = "qt_tool"
 # _OPTION = "host_build"
 # qmake.name = "QMAKE"
 # qmake.value = "$$shell_path($$QMAKE_QMAKE)"
diff --git a/src/linguist/lupdate/CMakeLists.txt b/src/linguist/lupdate/CMakeLists.txt
index 7a1e7bcd3..f418a870e 100644
--- a/src/linguist/lupdate/CMakeLists.txt
+++ b/src/linguist/lupdate/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## lupdate Tool:
 #####################################################################
 
-add_qt_tool(lupdate
+qt_add_tool(lupdate
     SOURCES
         ../shared/numerus.cpp
         ../shared/po.cpp
@@ -38,7 +38,6 @@ add_qt_tool(lupdate
 #### Keys ignored in scope 1:.:.:lupdate.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "Qt Translation File Update Tool"
 # QT_TOOL_ENV = "qmake"
-# _LOADED = "qt_tool"
 # _OPTION = "host_build"
 # qmake.name = "QMAKE"
 # qmake.value = "$$shell_path($$QMAKE_QMAKE)"
@@ -46,7 +45,7 @@ add_qt_tool(lupdate
 ## Scopes:
 #####################################################################
 
-extend_target(lupdate CONDITION TARGET Qt::QmlDevToolsPrivate
+qt_extend_target(lupdate CONDITION TARGET Qt::QmlDevToolsPrivate
     SOURCES
         qdeclarative.cpp
     LIBRARIES
@@ -55,7 +54,7 @@ extend_target(lupdate CONDITION TARGET Qt::QmlDevToolsPrivate
         Qt::QmlDevTools
 )
 
-extend_target(lupdate CONDITION NOT TARGET Qt::QmlDevToolsPrivate
+qt_extend_target(lupdate CONDITION NOT TARGET Qt::QmlDevToolsPrivate
     DEFINES
         QT_NO_QML
 )
diff --git a/src/qdoc/.prev_CMakeLists.txt b/src/qdoc/.prev_CMakeLists.txt
index 29816f431..b04e6af4b 100644
--- a/src/qdoc/.prev_CMakeLists.txt
+++ b/src/qdoc/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qdoc Tool:
 #####################################################################
 
-add_qt_tool(qdoc
+qt_add_tool(qdoc
     SOURCES
         atom.cpp atom.h
         clangcodeparser.cpp clangcodeparser.h
@@ -61,7 +61,6 @@ add_qt_tool(qdoc
 # QMAKE_SUBSTITUTES = "cmake_qdoc_config_file" "cmake_qdoc_config_version_file"
 # QMAKE_TARGET_DESCRIPTION = "Qt Documentation Compiler"
 # TR_EXCLUDE = "$$PWD/*"
-# _LOADED = "qt_tool" "cmake_functions" "qt_build_paths"
 # _OPTION = "host_build"
 # cmake_qdoc_config_file.input = "$$PWD/Qt5DocToolsConfig.cmake.in"
 # cmake_qdoc_config_file.output = "$$MODULE_BASE_OUTDIR/lib/cmake/Qt5DocTools/Qt5DocToolsConfig.cmake"
@@ -77,14 +76,14 @@ add_qt_tool(qdoc
 #### Keys ignored in scope 2:.:.:qdoc.pro:NOT force_bootstrap:
 # _REQUIREMENTS = "qtConfig(xmlstreamwriter)"
 
-extend_target(qdoc CONDITION TARGET Qt::QmlDevToolsPrivate
+qt_extend_target(qdoc CONDITION TARGET Qt::QmlDevToolsPrivate
     LIBRARIES
         Qt::QmlDevToolsPrivate
     PUBLIC_LIBRARIES
         Qt::QmlDevTools
 )
 
-extend_target(qdoc CONDITION NOT TARGET Qt::QmlDevToolsPrivate
+qt_extend_target(qdoc CONDITION NOT TARGET Qt::QmlDevToolsPrivate
     DEFINES
         QT_NO_DECLARATIVE
 )
@@ -92,7 +91,7 @@ extend_target(qdoc CONDITION NOT TARGET Qt::QmlDevToolsPrivate
 #### Keys ignored in scope 6:.:.:qdoc.pro:NOT QMAKE_DEFAULT_LIBDIRS___contains____ss_CLANG_LIBDIR AND NOT disable_external_rpath:
 # QMAKE_RPATHDIR = "$$CLANG_LIBDIR"
 
-extend_target(qdoc CONDITION win32-icc_x_ OR win32-msvc_x_
+qt_extend_target(qdoc CONDITION win32-icc_x_ OR win32-msvc_x_
     LINK_OPTIONS
         "/STACK:4194304"
 )
@@ -110,7 +109,7 @@ extend_target(qdoc CONDITION win32-icc_x_ OR win32-msvc_x_
 #### Keys ignored in scope 11:.:.:qdoc.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_:
 # CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/"
 # CMAKE_BIN_DIR_IS_ABSOLUTE = "True"
-add_qt_docs(qdoc
+qt_add_docs(qdoc
     doc/config/qdoc.qdocconf
 )
 
diff --git a/src/qdoc/CMakeLists.txt b/src/qdoc/CMakeLists.txt
index 8a4630158..7323f4cd7 100644
--- a/src/qdoc/CMakeLists.txt
+++ b/src/qdoc/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qdoc Tool:
 #####################################################################
 
-add_qt_tool(qdoc
+qt_add_tool(qdoc
     SOURCES
         atom.cpp atom.h
         clangcodeparser.cpp clangcodeparser.h
@@ -64,7 +64,6 @@ add_qt_tool(qdoc
 # QMAKE_SUBSTITUTES = "cmake_qdoc_config_file" "cmake_qdoc_config_version_file"
 # QMAKE_TARGET_DESCRIPTION = "Qt Documentation Compiler"
 # TR_EXCLUDE = "$$PWD/*"
-# _LOADED = "qt_tool" "cmake_functions" "qt_build_paths"
 # _OPTION = "host_build"
 # cmake_qdoc_config_file.input = "$$PWD/Qt5DocToolsConfig.cmake.in"
 # cmake_qdoc_config_file.output = "$$MODULE_BASE_OUTDIR/lib/cmake/Qt5DocTools/Qt5DocToolsConfig.cmake"
@@ -80,14 +79,14 @@ add_qt_tool(qdoc
 #### Keys ignored in scope 2:.:.:qdoc.pro:NOT force_bootstrap:
 # _REQUIREMENTS = "qtConfig(xmlstreamwriter)"
 
-extend_target(qdoc CONDITION TARGET Qt::QmlDevToolsPrivate
+qt_extend_target(qdoc CONDITION TARGET Qt::QmlDevToolsPrivate
     LIBRARIES
         Qt::QmlDevToolsPrivate
     PUBLIC_LIBRARIES
         Qt::QmlDevTools
 )
 
-extend_target(qdoc CONDITION NOT TARGET Qt::QmlDevToolsPrivate
+qt_extend_target(qdoc CONDITION NOT TARGET Qt::QmlDevToolsPrivate
     DEFINES
         QT_NO_DECLARATIVE
 )
@@ -95,7 +94,7 @@ extend_target(qdoc CONDITION NOT TARGET Qt::QmlDevToolsPrivate
 #### Keys ignored in scope 6:.:.:qdoc.pro:NOT QMAKE_DEFAULT_LIBDIRS___contains____ss_CLANG_LIBDIR AND NOT disable_external_rpath:
 # QMAKE_RPATHDIR = "$$CLANG_LIBDIR"
 
-extend_target(qdoc CONDITION win32-icc_x_ OR win32-msvc_x_
+qt_extend_target(qdoc CONDITION win32-icc_x_ OR win32-msvc_x_
     LINK_OPTIONS
         "/STACK:4194304"
 )
@@ -113,7 +112,7 @@ extend_target(qdoc CONDITION win32-icc_x_ OR win32-msvc_x_
 #### Keys ignored in scope 11:.:.:qdoc.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_:
 # CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/"
 # CMAKE_BIN_DIR_IS_ABSOLUTE = "True"
-add_qt_docs(qdoc
+qt_add_docs(qdoc
     doc/config/qdoc.qdocconf
 )
 
diff --git a/src/qtattributionsscanner/CMakeLists.txt b/src/qtattributionsscanner/CMakeLists.txt
index bbc8808b2..a7e7694ee 100644
--- a/src/qtattributionsscanner/CMakeLists.txt
+++ b/src/qtattributionsscanner/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtattributionsscanner Tool:
 #####################################################################
 
-add_qt_tool(qtattributionsscanner
+qt_add_tool(qtattributionsscanner
     SOURCES
         jsongenerator.cpp jsongenerator.h
         logging.h
@@ -28,7 +28,6 @@ add_qt_tool(qtattributionsscanner
 # INSTALLS = "cmake_qattributionsscanner_tools_files"
 # QMAKE_SUBSTITUTES = "cmake_qattributionsscanner_config_file" "cmake_qattributionsscanner_config_version_file"
 # QMAKE_TARGET_DESCRIPTION = "Qt Source Code Attribution Scanner"
-# _LOADED = "qt_tool" "cmake_functions" "qt_build_paths"
 # _OPTION = "host_build"
 # cmake_qattributionsscanner_config_file.input = "$$PWD/Qt5AttributionsScannerTools.cmake.in"
 # cmake_qattributionsscanner_config_file.output = "$$MODULE_BASE_OUTDIR/lib/cmake/Qt5AttributionsScannerTools/Qt5AttributionsScannerToolsConfig.cmake"