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

Change-Id: I9f60da23df1547d685439b0263fa5bf533b7c69e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 236eec9cbe35f018f0c0617d4a0d707dea85b0ac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

24 files changed, 68 insertions, 170 deletions

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 02a17c296..573b1c7c3 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from examples.pro.
-
 qt_examples_build_begin(EXTERNAL_BUILD)
 
 add_subdirectory(multimedia)
diff --git a/examples/multimedia/CMakeLists.txt b/examples/multimedia/CMakeLists.txt
index 40c83308e..6123c7994 100644
--- a/examples/multimedia/CMakeLists.txt
+++ b/examples/multimedia/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from multimedia.pro.
-
 qt_internal_add_example(audiodecoder)
 if(NOT ANDROID AND NOT IOS)
     qt_internal_add_example(devices)
diff --git a/examples/multimedia/audiodecoder/CMakeLists.txt b/examples/multimedia/audiodecoder/CMakeLists.txt
index 7d9638549..85b9a45be 100644
--- a/examples/multimedia/audiodecoder/CMakeLists.txt
+++ b/examples/multimedia/audiodecoder/CMakeLists.txt
@@ -1,35 +1,30 @@
-# Generated from audiodecoder.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(audiodecoder 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}/multimedia/audiodecoder")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Multimedia)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia Widgets)
+
 if(ANDROID)
-    find_package(Qt6 COMPONENTS Widgets)
+
 endif()
 
 qt_add_executable(audiodecoder
     audiodecoder.cpp audiodecoder.h
     main.cpp
 )
+
 set_target_properties(audiodecoder PROPERTIES
     WIN32_EXECUTABLE FALSE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(audiodecoder PUBLIC
     Qt::Core
     Qt::Gui
diff --git a/examples/multimedia/audiodevices/CMakeLists.txt b/examples/multimedia/audiodevices/CMakeLists.txt
index 245b396be..6bf07e6e5 100644
--- a/examples/multimedia/audiodevices/CMakeLists.txt
+++ b/examples/multimedia/audiodevices/CMakeLists.txt
@@ -1,39 +1,32 @@
-# Generated from audiodevices.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(audiodevices 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}/multimedia/audiodevices")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Multimedia)
-find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia Widgets)
 
 qt_add_executable(audiodevices
     audiodevices.cpp audiodevices.h
     audiodevicesbase.ui
     main.cpp
 )
+
 set_target_properties(audiodevices PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-# special case begin
+
 target_include_directories(audiodevices PUBLIC
     ../shared
 )
-# special case end
+
 target_link_libraries(audiodevices PUBLIC
     Qt::Core
     Qt::Gui
diff --git a/examples/multimedia/audiooutput/CMakeLists.txt b/examples/multimedia/audiooutput/CMakeLists.txt
index 7f94e9ce7..09e6d13ac 100644
--- a/examples/multimedia/audiooutput/CMakeLists.txt
+++ b/examples/multimedia/audiooutput/CMakeLists.txt
@@ -1,33 +1,26 @@
-# Generated from audiooutput.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(audiooutput 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}/multimedia/audiooutput")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Multimedia)
-find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia Widgets)
 
 qt_add_executable(audiooutput
     audiooutput.cpp audiooutput.h
     main.cpp
 )
+
 set_target_properties(audiooutput PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(audiooutput PUBLIC
     Qt::Core
     Qt::Gui
diff --git a/examples/multimedia/audiorecorder/CMakeLists.txt b/examples/multimedia/audiorecorder/CMakeLists.txt
index de8bd4ffb..88b540805 100644
--- a/examples/multimedia/audiorecorder/CMakeLists.txt
+++ b/examples/multimedia/audiorecorder/CMakeLists.txt
@@ -1,30 +1,23 @@
-# Generated from audiorecorder.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(audiorecorder 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}/multimedia/audiorecorder")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Multimedia)
-find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia Widgets)
 
 qt_add_executable(audiorecorder
     audiolevel.cpp audiolevel.h
     audiorecorder.cpp audiorecorder.h audiorecorder.ui
     main.cpp
 )
+
 set_target_properties(audiorecorder PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
@@ -32,11 +25,11 @@ set_target_properties(audiorecorder PROPERTIES
     XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS
         "${CMAKE_CURRENT_LIST_DIR}/audiorecorder.entitlements"
 )
-# special case begin
+
 target_include_directories(audiorecorder PUBLIC
     ../shared
 )
-# special case end
+
 target_link_libraries(audiorecorder PUBLIC
     Qt::Core
     Qt::Gui
diff --git a/examples/multimedia/audiosource/CMakeLists.txt b/examples/multimedia/audiosource/CMakeLists.txt
index 692a24564..8584dc2fb 100644
--- a/examples/multimedia/audiosource/CMakeLists.txt
+++ b/examples/multimedia/audiosource/CMakeLists.txt
@@ -1,36 +1,30 @@
 cmake_minimum_required(VERSION 3.16)
 project(audiosource 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}/multimedia/audiosource")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Multimedia)
-find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia Widgets)
 
 qt_add_executable(audiosource
     audiosource.cpp audiosource.h
     main.cpp
 )
+
 set_target_properties(audiosource PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-# special case begin
+
 target_include_directories(audiosource PUBLIC
     ../shared
 )
-# special case end
+
 target_link_libraries(audiosource PUBLIC
     Qt::Core
     Qt::Gui
diff --git a/examples/multimedia/declarative-camera/CMakeLists.txt b/examples/multimedia/declarative-camera/CMakeLists.txt
index be903f2b7..1ca30c525 100644
--- a/examples/multimedia/declarative-camera/CMakeLists.txt
+++ b/examples/multimedia/declarative-camera/CMakeLists.txt
@@ -1,29 +1,20 @@
-# Generated from declarative-camera.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(declarative-camera 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}/multimedia/declarative-camera")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS Qml)
-find_package(Qt6 COMPONENTS Multimedia)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia Qml Quick)
 
 qt_add_executable(declarative-camera
     qmlcamera.cpp
 )
+
 set_target_properties(declarative-camera PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
@@ -31,11 +22,11 @@ set_target_properties(declarative-camera PROPERTIES
     XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS
         "${CMAKE_CURRENT_LIST_DIR}/declarative-camera.entitlements"
 )
-# special case begin
+
 target_include_directories(declarative-camera PUBLIC
     ../shared
 )
-# special case end
+
 target_link_libraries(declarative-camera PUBLIC
     Qt::Core
     Qt::Gui
diff --git a/examples/multimedia/devices/CMakeLists.txt b/examples/multimedia/devices/CMakeLists.txt
index d75b4f23f..3e19c12ec 100644
--- a/examples/multimedia/devices/CMakeLists.txt
+++ b/examples/multimedia/devices/CMakeLists.txt
@@ -1,36 +1,31 @@
-# Generated from audiodevices.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(devices 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}/multimedia/devices")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Multimedia)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia)
 
 qt_add_executable(devices
     main.cpp
 )
+
 set_target_properties(devices PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(devices PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Multimedia
 )
+
 install(TARGETS devices
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/multimedia/spectrum/3rdparty/fftreal/CMakeLists.txt b/examples/multimedia/spectrum/3rdparty/fftreal/CMakeLists.txt
index d348dde65..6c2af7a83 100644
--- a/examples/multimedia/spectrum/3rdparty/fftreal/CMakeLists.txt
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(Qt6 COMPONENTS Core REQUIRED)
+find_package(Qt6 REQUIRED COMPONENTS Core)
 
 add_library(fftreal STATIC
         Array.h Array.hpp
diff --git a/examples/multimedia/spectrum/CMakeLists.txt b/examples/multimedia/spectrum/CMakeLists.txt
index dfc7b8939..aea65446d 100644
--- a/examples/multimedia/spectrum/CMakeLists.txt
+++ b/examples/multimedia/spectrum/CMakeLists.txt
@@ -1,19 +1,15 @@
 cmake_minimum_required(VERSION 3.16)
 project(spectrum 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}/multimedia/spectrum")
 
-find_package(Qt6 COMPONENTS Multimedia Widgets REQUIRED)
+find_package(Qt6 REQUIRED COMPONENTS Multimedia Widgets)
 
 add_subdirectory(3rdparty/fftreal)
 
diff --git a/examples/multimedia/video/CMakeLists.txt b/examples/multimedia/video/CMakeLists.txt
index ced1ad737..d3f707074 100644
--- a/examples/multimedia/video/CMakeLists.txt
+++ b/examples/multimedia/video/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from video.pro.
-
 qt_internal_add_example(qmlvideo)
 if(TARGET Qt::QuickControls2)
     if(TARGET Qt::Svg)
diff --git a/examples/multimedia/video/mediaplayer/CMakeLists.txt b/examples/multimedia/video/mediaplayer/CMakeLists.txt
index 097a56109..9255ad2da 100644
--- a/examples/multimedia/video/mediaplayer/CMakeLists.txt
+++ b/examples/multimedia/video/mediaplayer/CMakeLists.txt
@@ -2,17 +2,13 @@ cmake_minimum_required(VERSION 3.16)
 
 project(mediaplayer LANGUAGES CXX)
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
+    set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
 set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/multimedia/video/mediaplayer")
@@ -30,7 +26,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/multimedia/video/mediaplayer")
 #    endif()
 #endif()
 
-find_package(Qt6 COMPONENTS Core Quick QuickControls2 Svg REQUIRED)
+find_package(Qt6 REQUIRED COMPONENTS Core Quick QuickControls2 Svg)
 
 set(PROJECT_SOURCES
         main.cpp
diff --git a/examples/multimedia/video/qmlvideo/CMakeLists.txt b/examples/multimedia/video/qmlvideo/CMakeLists.txt
index 516f9b5c3..9ef73b090 100644
--- a/examples/multimedia/video/qmlvideo/CMakeLists.txt
+++ b/examples/multimedia/video/qmlvideo/CMakeLists.txt
@@ -1,25 +1,15 @@
-# Generated from qmlvideo.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(qmlvideo 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}/multimedia/video/qmlvideo")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS Multimedia)
-find_package(Qt6 COMPONENTS Qml)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia Qml Quick)
 
 qt_add_executable(qmlvideo
     frequencymonitor.cpp frequencymonitor.h
@@ -29,6 +19,7 @@ qt_add_executable(qmlvideo
     main.cpp
     trace.h
 )
+
 set_target_properties(qmlvideo PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
@@ -50,17 +41,19 @@ target_link_libraries(qmlvideo PUBLIC
     Qt::Quick
 )
 
-
 # Resources:
 set_source_files_properties("images/folder.png"
     PROPERTIES QT_RESOURCE_ALIAS "folder.png"
 )
+
 set_source_files_properties("images/leaves.jpg"
     PROPERTIES QT_RESOURCE_ALIAS "leaves.jpg"
 )
+
 set_source_files_properties("images/up.png"
     PROPERTIES QT_RESOURCE_ALIAS "up.png"
 )
+
 set(qmlvideo_resource_files
     "images/folder.png"
     "images/leaves.jpg"
diff --git a/examples/multimedia/video/recorder/CMakeLists.txt b/examples/multimedia/video/recorder/CMakeLists.txt
index 5b213fe30..ab43bbb44 100644
--- a/examples/multimedia/video/recorder/CMakeLists.txt
+++ b/examples/multimedia/video/recorder/CMakeLists.txt
@@ -2,23 +2,19 @@ cmake_minimum_required(VERSION 3.16)
 
 project(recorder LANGUAGES CXX)
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
+    set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
 set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/multimedia/video/recorder")
 
 find_package(QT NAMES Qt6 COMPONENTS Core Quick Multimedia REQUIRED)
-find_package(Qt6 COMPONENTS Core Quick Multimedia REQUIRED)
+find_package(Qt6 REQUIRED COMPONENTS Core Multimedia Quick)
 
 set(PROJECT_SOURCES
         main.cpp
diff --git a/examples/multimediawidgets/CMakeLists.txt b/examples/multimediawidgets/CMakeLists.txt
index b7f0230cb..8d16458c2 100644
--- a/examples/multimediawidgets/CMakeLists.txt
+++ b/examples/multimediawidgets/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from multimediawidgets.pro.
-
 if(TARGET Qt::Widgets)
     qt_internal_add_example(camera)
     qt_internal_add_example(videographicsitem)
diff --git a/examples/multimediawidgets/camera/CMakeLists.txt b/examples/multimediawidgets/camera/CMakeLists.txt
index 53b858f78..ebcac8159 100644
--- a/examples/multimediawidgets/camera/CMakeLists.txt
+++ b/examples/multimediawidgets/camera/CMakeLists.txt
@@ -1,25 +1,16 @@
-# Generated from camera.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(camera 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}/multimediawidgets/camera")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Multimedia)
-find_package(Qt6 COMPONENTS MultimediaWidgets)
-find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia MultimediaWidgets Widgets)
 
 set(camera_form "")
 set(videosettings_form "")
@@ -39,6 +30,7 @@ qt_add_executable(camera
     videosettings.cpp videosettings.h ${videosettings_form}
     metadatadialog.cpp metadatadialog.h
 )
+
 set_target_properties(camera PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
@@ -73,7 +65,6 @@ target_link_libraries(camera PUBLIC
     Qt::Widgets
 )
 
-
 # Resources:
 set(camera_resource_files
     "images/shutter.svg"
diff --git a/examples/multimediawidgets/player/CMakeLists.txt b/examples/multimediawidgets/player/CMakeLists.txt
index 8aa735e96..7c0304eaf 100644
--- a/examples/multimediawidgets/player/CMakeLists.txt
+++ b/examples/multimediawidgets/player/CMakeLists.txt
@@ -1,22 +1,15 @@
-# Generated from player.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(player 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}/multimediawidgets/player")
 
-find_package(Qt6 COMPONENTS Network)
-find_package(Qt6 COMPONENTS MultimediaWidgets)
+find_package(Qt6 REQUIRED COMPONENTS MultimediaWidgets Network)
 
 qt_add_executable(player
     main.cpp
@@ -27,10 +20,12 @@ qt_add_executable(player
     qmediaplaylist.cpp qmediaplaylist.h qmediaplaylist_p.h
     qplaylistfileparser.cpp qplaylistfileparser_p.h
 )
+
 set_target_properties(player PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(player PUBLIC
     Qt::MultimediaWidgets
     Qt::Network
diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp
index 1560b6e13..25722673d 100644
--- a/examples/multimediawidgets/player/player.cpp
+++ b/examples/multimediawidgets/player/player.cpp
@@ -52,9 +52,9 @@
 
 #include "playercontrols.h"
 #include "playlistmodel.h"
+#include "qmediaplaylist.h"
 #include "videowidget.h"
 
-#include <qmediaplaylist.h>
 #include <QMediaMetaData>
 #include <QMediaDevices>
 #include <QAudioDevice>
diff --git a/examples/multimediawidgets/player/player.h b/examples/multimediawidgets/player/player.h
index f93a761ea..3f1c51795 100644
--- a/examples/multimediawidgets/player/player.h
+++ b/examples/multimediawidgets/player/player.h
@@ -51,9 +51,10 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
+#include "qmediaplaylist.h"
+
 #include <QWidget>
 #include <QMediaPlayer>
-#include <qmediaplaylist.h>
 #include <QMediaMetaData>
 
 QT_BEGIN_NAMESPACE
diff --git a/examples/multimediawidgets/player/playlistmodel.cpp b/examples/multimediawidgets/player/playlistmodel.cpp
index f6e683410..28fc58a83 100644
--- a/examples/multimediawidgets/player/playlistmodel.cpp
+++ b/examples/multimediawidgets/player/playlistmodel.cpp
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 #include "playlistmodel.h"
-#include <qmediaplaylist.h>
+#include "qmediaplaylist.h"
 
 #include <QFileInfo>
 #include <QUrl>
diff --git a/examples/multimediawidgets/player/qplaylistfileparser_p.h b/examples/multimediawidgets/player/qplaylistfileparser_p.h
index 590472d24..98011fce0 100644
--- a/examples/multimediawidgets/player/qplaylistfileparser_p.h
+++ b/examples/multimediawidgets/player/qplaylistfileparser_p.h
@@ -52,8 +52,8 @@
 //
 
 #include "qtmultimediaglobal.h"
+#include "qmediaplaylist.h"
 #include <QtCore/qobject.h>
-#include <qmediaplaylist.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/examples/multimediawidgets/videographicsitem/CMakeLists.txt b/examples/multimediawidgets/videographicsitem/CMakeLists.txt
index 8f10d3034..fb8f4d857 100644
--- a/examples/multimediawidgets/videographicsitem/CMakeLists.txt
+++ b/examples/multimediawidgets/videographicsitem/CMakeLists.txt
@@ -1,34 +1,26 @@
-# Generated from videographicsitem.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(videographicsitem 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}/multimediawidgets/videographicsitem")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Multimedia)
-find_package(Qt6 COMPONENTS MultimediaWidgets)
-find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia MultimediaWidgets Widgets)
 
 qt_add_executable(videographicsitem
     main.cpp
     videoplayer.cpp videoplayer.h
 )
+
 set_target_properties(videographicsitem PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(videographicsitem PUBLIC
     Qt::Core
     Qt::Gui
diff --git a/examples/multimediawidgets/videowidget/CMakeLists.txt b/examples/multimediawidgets/videowidget/CMakeLists.txt
index 74a49da57..fbfaba50b 100644
--- a/examples/multimediawidgets/videowidget/CMakeLists.txt
+++ b/examples/multimediawidgets/videowidget/CMakeLists.txt
@@ -1,34 +1,26 @@
-# Generated from videowidget.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(videowidget 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}/multimediawidgets/videowidget")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Multimedia)
-find_package(Qt6 COMPONENTS MultimediaWidgets)
-find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia MultimediaWidgets Widgets)
 
 qt_add_executable(videowidget
     main.cpp
     videoplayer.cpp videoplayer.h
 )
+
 set_target_properties(videowidget PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
+
 target_link_libraries(videowidget PUBLIC
     Qt::Core
     Qt::Gui