Improve examples CMakeLists.txt

- Remove "# generated from xyz.pro" comment from pro2cmake
- Remove automatic use of CMAKE_AUTORCC
- Only opt into CMAKE_AUTOUIC if .ui files are involved
- Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR
- Combine multiple find_package(Qt6 ... calls)
 - use REQUIRED COMPONENTS
 - sort components alphabetically
- Fix wrong indentations
- Use (only) one empty line after multi-line commands

Pick-to: 6.3
Change-Id: I09083474432ce171e8ee1e28120b062f2ef3c052
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>

6 files changed, 45 insertions, 58 deletions

diff --git a/examples/webenginequick/customdialogs/CMakeLists.txt b/examples/webenginequick/customdialogs/CMakeLists.txt
index 47d773c48..b1899fd66 100644
--- a/examples/webenginequick/customdialogs/CMakeLists.txt
+++ b/examples/webenginequick/customdialogs/CMakeLists.txt
@@ -1,30 +1,27 @@
 cmake_minimum_required(VERSION 3.16)
 project(customdialogs LANGUAGES CXX)
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
 set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
+    set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
 set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginequick/customdialogs")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS WebEngineQuick)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineQuick)
 
 qt_add_executable(customdialogs
     main.cpp
     server.cpp server.h
 )
+
 set_target_properties(customdialogs PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(customdialogs PUBLIC
     Qt::Core
     Qt::Gui
diff --git a/examples/webenginequick/lifecycle/CMakeLists.txt b/examples/webenginequick/lifecycle/CMakeLists.txt
index 8f90cbf48..556b50706 100644
--- a/examples/webenginequick/lifecycle/CMakeLists.txt
+++ b/examples/webenginequick/lifecycle/CMakeLists.txt
@@ -1,37 +1,31 @@
 cmake_minimum_required(VERSION 3.16)
 project(lifecycle LANGUAGES CXX)
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
 set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
 
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
+    set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
 set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginequick/lifecycle")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS QuickControls2)
-find_package(Qt6 COMPONENTS WebEngineQuick)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui QuickControls2 WebEngineQuick)
 
 qt_add_executable(lifecycle
     main.cpp
 )
+
 set_target_properties(lifecycle PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(lifecycle PUBLIC
     Qt::Core
     Qt::Gui
     Qt::WebEngineQuick
 )
 
-
 # Resources:
 set(resources_resource_files
     "WebBrowser.qml"
diff --git a/examples/webenginequick/minimal/CMakeLists.txt b/examples/webenginequick/minimal/CMakeLists.txt
index 9155ce040..e0cb66733 100644
--- a/examples/webenginequick/minimal/CMakeLists.txt
+++ b/examples/webenginequick/minimal/CMakeLists.txt
@@ -1,36 +1,31 @@
 cmake_minimum_required(VERSION 3.16)
 project(minimal LANGUAGES CXX)
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
 set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
 
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
+    set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
 set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginequick/minimal-qml")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS WebEngineQuick)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineQuick)
 
 qt_add_executable(webengine-minimal-qml
     main.cpp
 )
+
 set_target_properties(webengine-minimal-qml PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(webengine-minimal-qml PUBLIC
     Qt::Core
     Qt::Gui
     Qt::WebEngineQuick
 )
 
-
 # Resources:
 set(qml_resource_files
     "main.qml"
diff --git a/examples/webenginequick/quicknanobrowser/CMakeLists.txt b/examples/webenginequick/quicknanobrowser/CMakeLists.txt
index 9a70a2c22..cdccc26be 100644
--- a/examples/webenginequick/quicknanobrowser/CMakeLists.txt
+++ b/examples/webenginequick/quicknanobrowser/CMakeLists.txt
@@ -1,32 +1,26 @@
 cmake_minimum_required(VERSION 3.16)
 project(quicknanobrowser LANGUAGES CXX)
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
 set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
 
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
+    set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
 set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginequick/quicknanobrowser")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Qml)
-find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS WebEngineQuick)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick WebEngineQuick)
 
 qt_add_executable(quicknanobrowser
     main.cpp
     utils.h
 )
+
 set_target_properties(quicknanobrowser PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(quicknanobrowser PUBLIC
     Qt::Core
     Qt::Gui
@@ -35,7 +29,6 @@ target_link_libraries(quicknanobrowser PUBLIC
     Qt::WebEngineQuick
 )
 
-
 # Resources:
 set(resources_resource_files
     "ApplicationRoot.qml"
@@ -52,6 +45,7 @@ qt_add_resources(quicknanobrowser "resources"
     FILES
         ${resources_resource_files}
 )
+
 set(resources1_resource_files
     "icons/3rdparty/go-next.png"
     "icons/3rdparty/go-previous.png"
diff --git a/examples/webenginequick/recipebrowser/CMakeLists.txt b/examples/webenginequick/recipebrowser/CMakeLists.txt
index 9643234e7..57a73b4aa 100644
--- a/examples/webenginequick/recipebrowser/CMakeLists.txt
+++ b/examples/webenginequick/recipebrowser/CMakeLists.txt
@@ -1,32 +1,25 @@
 cmake_minimum_required(VERSION 3.16)
 project(recipebrowser LANGUAGES CXX)
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
 set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
 
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
+    set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
 set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginequick/recipebrowser")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS Qml)
-find_package(Qt6 COMPONENTS QuickControls2)
-find_package(Qt6 COMPONENTS WebEngineQuick)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick QuickControls2 WebEngineQuick)
 
 qt_add_executable(recipebrowser
     main.cpp
 )
+
 set_target_properties(recipebrowser PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(recipebrowser PUBLIC
     Qt::Core
     Qt::Gui
@@ -36,68 +29,87 @@ target_link_libraries(recipebrowser PUBLIC
     Qt::WebEngineQuick
 )
 
-
 # Resources:
 set_source_files_properties("resources/pages/assets/3rdparty/markdown.css"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/pages/assets/3rdparty/marked.js"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/pages/assets/custom.css"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/pages/assets/custom.js"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/pages/burger.html"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/pages/cupcakes.html"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/pages/images/burger.jpg"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/pages/images/cupcakes.jpg"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/pages/images/pasta.jpg"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/pages/images/pizza.jpg"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/pages/images/skewers.jpg"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/pages/images/soup.jpg"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/pages/images/steak.jpg"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/pages/pasta.html"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/pages/pizza.html"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/pages/skewers.html"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/pages/soup.html"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/pages/steak.html"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/qml/RecipeList.qml"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set_source_files_properties("resources/qml/main.qml"
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
+
 set(resources_resource_files
     "resources/pages/assets/3rdparty/markdown.css"
     "resources/pages/assets/3rdparty/marked.js"
diff --git a/examples/webenginequick/webengineaction/CMakeLists.txt b/examples/webenginequick/webengineaction/CMakeLists.txt
index 926825d21..1d6ae3fe5 100644
--- a/examples/webenginequick/webengineaction/CMakeLists.txt
+++ b/examples/webenginequick/webengineaction/CMakeLists.txt
@@ -1,36 +1,31 @@
 cmake_minimum_required(VERSION 3.16)
 project(webengineaction LANGUAGES CXX)
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
 set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
 
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
+    set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
 set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginequick/webengineaction")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS WebEngineQuick)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineQuick)
 
 qt_add_executable(webengineaction
     main.cpp
 )
+
 set_target_properties(webengineaction PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(webengineaction PUBLIC
     Qt::Core
     Qt::Gui
     Qt::WebEngineQuick
 )
 
-
 # Resources:
 set(qml_resource_files
     "main.qml"