Merge remote-tracking branch 'origin/wip/cmake' into dev

Change-Id: If75ae006db6eb977cf66af4c3d36cb5c8098a1f1
2020-02-10 18:31:58 +01:00 · 2020-02-10 18:31:58 +01:00 · 3af9d49bb7
commit 3af9d49bb7
parent 71436d5499 c431e2d33c
417 changed files with 6639 additions and 1583 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,3 +1,4 @@
+# special case skip regeneration
 cmake_minimum_required(VERSION 3.15.0)

 # Run auto detection routines
--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindWaylandScanner.cmake
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindWaylandScanner.cmake
@ -129,11 +129,15 @@ function(ecm_add_wayland_client_protocol out_var)

    add_custom_command(OUTPUT "${_client_header}"
        COMMAND ${WaylandScanner_EXECUTABLE} client-header ${_infile} ${_client_header}
-        DEPENDS ${_infile} VERBATIM)
+        DEPENDS ${WaylandScanner_EXECUTABLE} ${_infile}
+        VERBATIM
+    )

    add_custom_command(OUTPUT "${_code}"
        COMMAND ${WaylandScanner_EXECUTABLE} code ${_infile} ${_code}
-        DEPENDS ${_infile} ${_client_header} VERBATIM)
+        DEPENDS ${WaylandScanner_EXECUTABLE} ${_infile} ${_client_header}
+        VERBATIM
+    )

    list(APPEND ${out_var} "${_client_header}" "${_code}")
    set(${out_var} ${${out_var}} PARENT_SCOPE)
@ -160,7 +164,9 @@ function(ecm_add_wayland_server_protocol out_var)

    add_custom_command(OUTPUT "${_server_header}"
        COMMAND ${WaylandScanner_EXECUTABLE} server-header ${_infile} ${_server_header}
-        DEPENDS ${_infile} VERBATIM)
+        DEPENDS ${WaylandScanner_EXECUTABLE} ${_infile}
+        VERBATIM
+   )

    list(APPEND ${out_var} "${_server_header}")
    set(${out_var} ${${out_var}} PARENT_SCOPE)
--- a/cmake/3rdparty/kwin/FindLibdrm.cmake
+++ b/cmake/3rdparty/kwin/FindLibdrm.cmake
@ -105,13 +105,19 @@ if(NOT WIN32)
            INTERFACE_INCLUDE_DIRECTORIES "${Libdrm_INCLUDE_DIR}"
            INTERFACE_INCLUDE_DIRECTORIES "${Libdrm_INCLUDE_DIR}/libdrm"
        )
+        if(EXISTS "${Libdrm_INCLUDE_DIR}/drm")
+            set_property(TARGET Libdrm::Libdrm APPEND PROPERTY
+                INTERFACE_INCLUDE_DIRECTORIES "${Libdrm_INCLUDE_DIR}/drm"
+            )
+        endif()
+
    endif()

    mark_as_advanced(Libdrm_LIBRARY Libdrm_INCLUDE_DIR)

    # compatibility variables
    set(Libdrm_LIBRARIES ${Libdrm_LIBRARY})
-    set(Libdrm_INCLUDE_DIRS ${Libdrm_INCLUDE_DIR} "${Libdrm_INCLUDE_DIR}/libdrm")
+    set(Libdrm_INCLUDE_DIRS ${Libdrm_INCLUDE_DIR} "${Libdrm_INCLUDE_DIR}/libdrm" "${Libdrm_INCLUDE_DIR}/drm")
    set(Libdrm_VERSION_STRING ${Libdrm_VERSION})

 else()
--- a/cmake/FindWrapDBus1.cmake
+++ b/cmake/FindWrapDBus1.cmake
@ -2,6 +2,10 @@
 # Work around that:-/
 # See https://gitlab.freedesktop.org/dbus/dbus/issues/267 for more information

+if(DBus1_FOUND OR WrapDBus1_FOUND)
+    return()
+endif()
+
 if(DEFINED ENV{PKG_CONFIG_DIR})
    set(__qt_dbus_pcd "$ENV{PKG_CONFIG_DIR}")
 endif()
--- a/cmake/QtBaseGlobalTargets.cmake
+++ b/cmake/QtBaseGlobalTargets.cmake
@ -4,7 +4,7 @@ add_library(Qt::Platform ALIAS Platform)
 target_include_directories(Platform
    INTERFACE
    $<BUILD_INTERFACE:${QT_PLATFORM_DEFINITION_DIR_ABSOLUTE}>
-    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/${INSTALL_INCLUDEDIR}>
    $<INSTALL_INTERFACE:${QT_PLATFORM_DEFINITION_DIR}>
    $<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}>
    )
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@ -791,6 +791,12 @@ function(qt_ensure_sync_qt)
        qt_path_join(syncqt_install_dir ${QT_INSTALL_DIR} ${INSTALL_LIBEXECDIR})
        qt_copy_or_install(PROGRAMS "${SYNCQT_FROM_SOURCE}"
                           DESTINATION "${syncqt_install_dir}")
+    elseif(QT_HOST_PATH)
+        get_filename_component(syncqt_absolute_path
+                               "${QT_HOST_PATH}/${INSTALL_LIBEXECDIR}/syncqt.pl"
+                               ABSOLUTE)
+        set(QT_SYNCQT "${syncqt_absolute_path}" CACHE FILEPATH "syncqt script")
+        message(STATUS "Using host syncqt found at: ${QT_SYNCQT}")
    else()
        get_filename_component(syncqt_absolute_path
                               "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}/syncqt.pl"
@ -931,8 +937,8 @@ function(qt_internal_module_info result target)
    string(REPLACE "." "_" define "${define}")
    set("${result}_upper" "${upper}" PARENT_SCOPE)
    set("${result}_lower" "${lower}" PARENT_SCOPE)
-    set("${result}_repo_include_dir" "${QT_BUILD_DIR}/include" PARENT_SCOPE)
-    set("${result}_include_dir" "${QT_BUILD_DIR}/include/${module}" PARENT_SCOPE)
+    set("${result}_repo_include_dir" "${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}" PARENT_SCOPE)
+    set("${result}_include_dir" "${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}/${module}" PARENT_SCOPE)
    set("${result}_define" "${define}" PARENT_SCOPE)
 endfunction()

@ -940,7 +946,7 @@ endfunction()
 set(__default_private_args "SOURCES;LIBRARIES;INCLUDE_DIRECTORIES;DEFINES;DBUS_ADAPTOR_BASENAME;DBUS_ADAPTOR_FLAGS;DBUS_ADAPTOR_SOURCES;DBUS_INTERFACE_BASENAME;DBUS_INTERFACE_FLAGS;DBUS_INTERFACE_SOURCES;FEATURE_DEPENDENCIES;COMPILE_OPTIONS;LINK_OPTIONS;MOC_OPTIONS;DISABLE_AUTOGEN_TOOLS;ENABLE_AUTOGEN_TOOLS;PLUGIN_TYPES")

 set(__default_public_args "PUBLIC_LIBRARIES;PUBLIC_INCLUDE_DIRECTORIES;PUBLIC_DEFINES;PUBLIC_COMPILE_OPTIONS;PUBLIC_LINK_OPTIONS")
-
+set(__default_private_module_args "PRIVATE_MODULE_INTERFACE")

 option(QT_CMAKE_DEBUG_EXTEND_TARGET "Debug extend_target calls in Qt's build system" OFF)

@ -1079,7 +1085,7 @@ function(qt_extend_target target)
        message(FATAL_ERROR "Trying to extend non-existing target \"${target}\".")
    endif()
    qt_parse_all_arguments(arg "qt_extend_target" "HEADER_MODULE" "PRECOMPILED_HEADER"
-        "CONDITION;${__default_public_args};${__default_private_args};COMPILE_FLAGS;NO_PCH_SOURCES" ${ARGN})
+        "CONDITION;${__default_public_args};${__default_private_args};${__default_private_module_args};COMPILE_FLAGS;NO_PCH_SOURCES" ${ARGN})
    if ("x${arg_CONDITION}" STREQUAL x)
        set(arg_CONDITION ON)
    endif()
@ -1187,7 +1193,8 @@ function(qt_extend_target target)

        set(target_private "${target}Private")
        if(TARGET "${target_private}")
-          target_link_libraries("${target_private}" INTERFACE "${target}" "${qt_libs_private}")
+          target_link_libraries("${target_private}"
+                                INTERFACE "${target}" ${arg_PRIVATE_MODULE_INTERFACE})
        endif()
        qt_register_target_dependencies("${target}"
                                        "${arg_PUBLIC_LIBRARIES}"
@ -1527,7 +1534,7 @@ function(qt_add_module target)
    qt_parse_all_arguments(arg "qt_add_module"
        "NO_MODULE_HEADERS;STATIC;DISABLE_TOOLS_EXPORT;EXCEPTIONS;INTERNAL_MODULE;NO_SYNC_QT;NO_PRIVATE_MODULE;HEADER_MODULE;GENERATE_METATYPES"
        "CONFIG_MODULE_NAME;PRECOMPILED_HEADER"
-        "${__default_private_args};${__default_public_args};QMAKE_MODULE_CONFIG;EXTRA_CMAKE_FILES;EXTRA_CMAKE_INCLUDES;NO_PCH_SOURCES" ${ARGN})
+        "${__default_private_args};${__default_public_args};${__default_private_module_args};QMAKE_MODULE_CONFIG;EXTRA_CMAKE_FILES;EXTRA_CMAKE_INCLUDES;NO_PCH_SOURCES" ${ARGN})

    if(NOT DEFINED arg_CONFIG_MODULE_NAME)
        set(arg_CONFIG_MODULE_NAME "${module_lower}")
@ -1715,7 +1722,7 @@ function(qt_add_module target)

    if(NOT arg_NO_MODULE_HEADERS AND NOT arg_NO_SYNC_QT)
        # For the syncqt headers
-        list(APPEND ${public_headers_list} "$<INSTALL_INTERFACE:include/${module}>")
+        list(APPEND ${public_headers_list} "$<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}/${module}>")
    endif()
    list(APPEND ${public_headers_list} ${arg_PUBLIC_INCLUDE_DIRECTORIES})

@ -1745,6 +1752,7 @@ function(qt_add_module target)
            "${deprecation_define}"
        PUBLIC_LIBRARIES ${arg_PUBLIC_LIBRARIES}
        LIBRARIES ${arg_LIBRARIES} Qt::PlatformModuleInternal
+        PRIVATE_MODULE_INTERFACE ${arg_PRIVATE_MODULE_INTERFACE}
        FEATURE_DEPENDENCIES ${arg_FEATURE_DEPENDENCIES}
        DBUS_ADAPTOR_SOURCES ${arg_DBUS_ADAPTOR_SOURCES}
        DBUS_ADAPTOR_FLAGS ${arg_DBUS_ADAPTOR_FLAGS}
@ -1854,14 +1862,20 @@ set(QT_CMAKE_EXPORT_NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE})")
            set(args INSTALL_DIR "${metatypes_install_dir}")
        endif()
        qt6_generate_meta_types_json_file(${target} ${args})
-        get_target_property(QT_MODULE_META_TYPES_FILE ${target} INTERFACE_QT_META_TYPES_INSTALL_FILE)
-        get_target_property(QT_MODULE_META_TYPES_DEP_FILE ${target} INTERFACE_QT_META_TYPES_INSTALL_DEP_FILE)
    endif()
    configure_package_config_file(
        "${QT_CMAKE_DIR}/QtModuleConfig.cmake.in"
        "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}Config.cmake"
        INSTALL_DESTINATION "${config_install_dir}"
    )
+
+    if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/${INSTALL_CMAKE_NAMESPACE}${target}BuildInternals.cmake")
+        configure_file("${CMAKE_CURRENT_LIST_DIR}/${INSTALL_CMAKE_NAMESPACE}${target}BuildInternals.cmake"
+            "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}BuildInternals.cmake"
+            @ONLY)
+        list(APPEND extra_cmake_files "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}BuildInternals.cmake")
+    endif()
+
    write_basic_package_version_file(
        "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigVersion.cmake"
        VERSION ${PROJECT_VERSION}
@ -1933,12 +1947,13 @@ set(QT_CMAKE_EXPORT_NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE})")
    # Handle cases like QmlDevTools which do not have their own headers, but rather borrow them
    # from another module.
    if(NOT arg_NO_SYNC_QT)
-        list(APPEND interface_includes
-                    "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
-                    "$<BUILD_INTERFACE:${module_include_dir}/${PROJECT_VERSION}>"
-                    "$<BUILD_INTERFACE:${module_include_dir}/${PROJECT_VERSION}/${module}>")
+        list(APPEND interface_includes "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")

        if(NOT arg_NO_MODULE_HEADERS)
+            list(APPEND interface_includes
+                        "$<BUILD_INTERFACE:${module_include_dir}/${PROJECT_VERSION}>"
+                        "$<BUILD_INTERFACE:${module_include_dir}/${PROJECT_VERSION}/${module}>")
+
            if(is_framework)
                set(fw_headers_dir
                    "${INSTALL_LIBDIR}/${module}.framework/Headers/")
@ -1947,8 +1962,8 @@ set(QT_CMAKE_EXPORT_NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE})")
                            "$<INSTALL_INTERFACE:${fw_headers_dir}${PROJECT_VERSION}/${module}>")
            else()
                list(APPEND interface_includes
-                            "$<INSTALL_INTERFACE:include/${module}/${PROJECT_VERSION}>"
-                            "$<INSTALL_INTERFACE:include/${module}/${PROJECT_VERSION}/${module}>")
+                            "$<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}/${module}/${PROJECT_VERSION}>"
+                            "$<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}/${module}/${PROJECT_VERSION}/${module}>")
            endif()
        endif()
    endif()
@ -2446,167 +2461,6 @@ function(qt_add_resource target resourceName)

 endfunction()

-
-# This function creates a CMake target for qml modules. It will also make
-# sure that if no C++ source are present, that qml files show up in the project
-# in an IDE. Finally, it will also create a custom ${target}_qmltypes which
-# can be used to generate the respective plugin.qmltypes file.
-#
-#  CPP_PLUGIN: Whether this qml module has any c++ source files.
-#  URI: Module's uri.
-#  TARGET_PATH: Expected installation path for the Qml Module. Equivalent
-#  to the module's URI where '.' is replaced with '/'. Use this to override the
-#  default substitution pattern.
-#  VERSION: Version of the qml module
-#  QML_PLUGINDUMP_DEPENDENCIES: Path to a dependencies.json file to be consumed
-#  with the ${target}_qmltypes target (optional)
-#  SKIP_TYPE_REGISTRATION: All qml files are expected to be registered by the
-#  c++ plugin code.
-#
-function(qt_add_qml_module target)
-
-    set(qml_module_optional_args
-        GENERATE_QMLTYPES
-        DESIGNER_SUPPORTED
-        DO_NOT_INSTALL
-        SKIP_TYPE_REGISTRATION
-    )
-
-    set(qml_module_single_args
-        URI
-        TARGET_PATH
-        VERSION
-        QML_PLUGINDUMP_DEPENDENCIES
-        CLASSNAME
-    )
-
-    set(qml_module_multi_args
-        IMPORTS
-        TYPEINFO
-        DEPENDENCIES
-    )
-
-    qt_parse_all_arguments(arg "qt_add_qml_module"
-        "${__qt_add_plugin_optional_args};${qml_module_optional_args}"
-        "${__qt_add_plugin_single_args};${qml_module_single_args}"
-        "${__qt_add_plugin_multi_args};${qml_module_multi_args}" ${ARGN})
-
-    if (NOT arg_URI)
-        message(FATAL_ERROR "qt_add_qml_module called without specifying the module's uri. Please specify one using the URI parameter.")
-    endif()
-
-    set(target_path ${arg_TARGET_PATH})
-
-    if (NOT arg_VERSION)
-        message(FATAL_ERROR "qt_add_qml_module called without specifying the module's import version. Please specify one using the VERSION parameter.")
-    endif()
-
-    if (NOT arg_TARGET_PATH)
-        string(REPLACE "." "/" arg_TARGET_PATH ${arg_URI})
-    endif()
-
-    qt_remove_args(plugin_args
-        ARGS_TO_REMOVE
-            ${target}
-            ${qml_module_multi_args}
-            ${qml_module_single_args}
-        ALL_ARGS
-            ${__qt_add_plugin_optional_args}
-            ${__qt_add_plugin_single_args}
-            ${qml_module_single_args}
-            ${__qt_add_plugin_multi_args}
-            ${qml_module_multi_args}
-        ARGS
-            ${ARGV}
-    )
-
-    # If we have no sources, but qml files, create a custom target so the
-    # qml file will be visibile in an IDE.
-    if (arg_SOURCES)
-        qt_add_plugin(${target}
-            TYPE
-                qml_plugin
-            QML_TARGET_PATH
-                "${arg_TARGET_PATH}"
-            ${plugin_args}
-        )
-    endif()
-
-
-    if (arg_CPP_PLUGIN)
-        set(no_create_option DO_NOT_CREATE_TARGET)
-    endif()
-
-    if (arg_CLASSNAME)
-        set(classname_arg CLASSNAME ${arg_CLASSNAME})
-    endif()
-
-    if (arg_DESIGNER_SUPPORTED)
-        set(designer_supported_arg DESIGNER_SUPPORTED)
-    endif()
-
-    if (arg_SKIP_TYPE_REGISTRATION)
-        set(skip_registration_arg SKIP_TYPE_REGISTRATION)
-    endif()
-
-    if (arg_GENERATE_QMLTYPES)
-        set(generate_qmltypes_arg GENERATE_QMLTYPES)
-    endif()
-
-    qt6_add_qml_module(${target}
-        ${designer_supported_arg}
-        ${no_create_option}
-        ${skip_registration_arg}
-        ${classname_arg}
-        ${generate_qmltypes_arg}
-        RESOURCE_PREFIX "/qt-project.org/imports"
-        TARGET_PATH ${arg_TARGET_PATH}
-        URI ${arg_URI}
-        VERSION ${arg_VERSION}
-        QML_FILES ${arg_QML_FILES}
-        IMPORTS "${arg_IMPORTS}"
-        TYPEINFO "${arg_TYPEINFO}"
-        DO_NOT_INSTALL_METADATA
-        DO_NOT_CREATE_TARGET
-        INSTALL_QML_FILES
-        DEPENDENCIES ${arg_DEPENDENCIES}
-        RESOURCE_EXPORT "${INSTALL_CMAKE_NAMESPACE}${target}Targets"
-    )
-
-    get_target_property(qmldir_file ${target} QT_QML_MODULE_QMLDIR_FILE)
-    get_target_property(plugin_types ${target} QT_QML_MODULE_PLUGIN_TYPES_FILE)
-    qt_path_join(qml_module_install_dir ${QT_INSTALL_DIR} "${INSTALL_QMLDIR}/${arg_TARGET_PATH}")
-    if (EXISTS ${plugin_types})
-        qt_copy_or_install(FILES ${plugin_types}
-            DESTINATION "${qml_module_install_dir}"
-        )
-
-        if(QT_WILL_INSTALL)
-            # plugin.qmltypes when present should also be copied to the
-            # cmake binary dir when doing prefix builds
-            file(COPY ${plugin_types}
-                DESTINATION "${QT_BUILD_DIR}/${INSTALL_QMLDIR}/${arg_TARGET_PATH}"
-            )
-        endif()
-    endif()
-
-    qt_copy_or_install(
-        FILES
-            "${qmldir_file}"
-        DESTINATION
-            "${qml_module_install_dir}"
-    )
-
-    if(QT_WILL_INSTALL)
-        # qmldir should also be copied to the cmake binary dir when doing
-        # prefix builds
-        file(COPY "${qmldir_file}"
-            DESTINATION "${QT_BUILD_DIR}/${INSTALL_QMLDIR}/${arg_TARGET_PATH}"
-        )
-    endif()
-
-endfunction()
-
 # Collection of qt_add_executable arguments so they can be shared across qt_add_executable
 # and qt_add_test_helper.
 set(__qt_add_executable_optional_args
@ -2796,7 +2650,7 @@ function(qt_add_test name)
        set(private_includes
            "${CMAKE_CURRENT_SOURCE_DIR}"
            "${CMAKE_CURRENT_BINARY_DIR}"
-            "$<BUILD_INTERFACE:${QT_BUILD_DIR}/include>"
+            "$<BUILD_INTERFACE:${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}>"
             ${arg_INCLUDE_DIRECTORIES}
        )

@ -3327,8 +3181,9 @@ endfunction()
 # Complete manual moc invocation with full control.
 # Use AUTOMOC whenever possible.
 function(qt_manual_moc result)
-    cmake_parse_arguments(arg "" "" "FLAGS" ${ARGN})
+    cmake_parse_arguments(arg "" "OUTPUT_MOC_JSON_FILES" "FLAGS" ${ARGN})
    set(moc_files)
+    set(metatypes_json_list)
    foreach(infile ${arg_UNPARSED_ARGUMENTS})
        qt_make_output_file("${infile}" "moc_" ".cpp"
            "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" outfile)
@ -3336,16 +3191,30 @@ function(qt_manual_moc result)

        set(moc_parameters_file "${outfile}_parameters$<$<BOOL:$<CONFIGURATION>>:_$<CONFIGURATION>>")
        set(moc_parameters ${arg_FLAGS} -o "${outfile}" "${infile}")
+
+        set(metatypes_byproducts)
+        if (arg_OUTPUT_MOC_JSON_FILES)
+            set(moc_json_file "${outfile}.json")
+            list(APPEND moc_parameters --output-json)
+            list(APPEND metatypes_json_list "${outfile}.json")
+            set(metatypes_byproducts "${outfile}.json")
+        endif()
+
        string (REPLACE ";" "\n" moc_parameters "${moc_parameters}")

        file(GENERATE OUTPUT "${moc_parameters_file}" CONTENT "${moc_parameters}\n")

-        add_custom_command(OUTPUT "${outfile}"
+        add_custom_command(OUTPUT "${outfile}" ${metatypes_byproducts}
                           COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::moc "@${moc_parameters_file}"
                           DEPENDS "${infile}" ${moc_depends} ${QT_CMAKE_EXPORT_NAMESPACE}::moc
                           WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" VERBATIM)
    endforeach()
    set("${result}" ${moc_files} PARENT_SCOPE)
+
+    # Register generated json files
+    if (arg_OUTPUT_MOC_JSON_FILES)
+        set(${arg_OUTPUT_MOC_JSON_FILES} "${metatypes_json_list}" PARENT_SCOPE)
+    endif()
 endfunction()


@ -3398,7 +3267,7 @@ function(qt_create_qdbusxml2cpp_command target infile)
    add_custom_command(OUTPUT "${header_file}" "${source_file}"
                       COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp ${arg_FLAGS} "${option}"
                               "${header_file}:${source_file}" "${absolute_in_file_path}"
-                       DEPENDS "${absolute_in_file_path}"
+                       DEPENDS "${absolute_in_file_path}" ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp
                       WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
                       VERBATIM)

@ -3486,6 +3355,7 @@ function(qt_add_docs)

    # qtattributionsscanner
    add_custom_target(qattributionsscanner_${target}
+        DEPENDS ${qattributionsscanner_bin}
        COMMAND ${qtattributionsscanner_bin}
        ${PROJECT_SOURCE_DIR}
        --filter "QDocModule=${qdoc_target}"
@ -3518,6 +3388,7 @@ function(qt_add_docs)
    )

    add_custom_target(prepare_docs_${target}
+        DEPENDS ${qdoc_bin}
        COMMAND ${CMAKE_COMMAND} -E env ${qdoc_env_args}
        ${qdoc_bin}
        ${prepare_qdoc_args}
@ -3536,6 +3407,7 @@ function(qt_add_docs)
    )

    add_custom_target(generate_docs_${target}
+        DEPENDS ${qdoc_bin}
        COMMAND ${CMAKE_COMMAND} -E env ${qdoc_env_args}
        ${qdoc_bin}
        ${generate_qdocs_args}
@ -3553,6 +3425,7 @@ function(qt_add_docs)
    )

    add_custom_target(html_docs_${target}
+        DEPENDS ${qdoc_bin}
        COMMAND ${CMAKE_COMMAND} -E env ${qdoc_env_args}
        ${qdoc_bin}
        ${html_qdocs_args}
@ -3565,6 +3438,7 @@ function(qt_add_docs)
    set(qch_file_path ${qdoc_output_dir}/${qch_file_name})

    add_custom_target(qch_docs_${target}
+        DEPENDS ${qhelpgenerator_bin}
        COMMAND ${qhelpgenerator_bin}
           "${qdoc_output_dir}/${doc_target}.qhp"
           -o "${qch_file_path}"
@ -3885,6 +3759,7 @@ function(qt_process_qlalr consuming_target input_file_list flags)
        add_custom_command(
            OUTPUT ${cpp_file} ${private_file} ${decl_file} ${impl_file}
            COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qlalr ${flags} ${input_file}
+            DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::qlalr
            MAIN_DEPENDENCY ${input_file}
        )
        target_sources(${consuming_target} PRIVATE ${cpp_file} ${impl_file})
@ -4047,10 +3922,6 @@ function(add_qt_resource)
    qt_add_resource(${ARGV})
 endfunction()

-function(add_qml_module)
-    qt_add_qml_module(${ARGV})
-endfunction()
-
 function(add_cmake_library)
    qt_add_cmake_library(${ARGV})
 endfunction()
--- a/cmake/QtCompilerOptimization.cmake
+++ b/cmake/QtCompilerOptimization.cmake
@ -62,7 +62,7 @@ if(GCC OR CLANG)
    set(QT_CFLAGS_AVX512VBMI "-mavx512vbmi")
    set(QT_CFLAGS_AESNI      "-maes")
    set(QT_CFLAGS_SHANI      "-msha")
-    if(NOT APPLE_UIKIT)
+    if(NOT APPLE_UIKIT AND NOT QT_64BIT)
        set(QT_CFLAGS_NEON   "-mfpu=neon")
    endif()
    set(QT_CFLAGS_MIPS_DSP   "-mdsp")
--- a/cmake/QtModuleConfig.cmake.in
+++ b/cmake/QtModuleConfig.cmake.in
@ -45,24 +45,9 @@ if(NOT _qt_module_target_type STREQUAL "INTERFACE_LIBRARY")
    endif()
 endif()

-# Apply meta types properties
-if (@QT_MODULE_HAS_META_TYPES_FILE@)
-    if (NOT QT_NO_CREATE_TARGETS)
-        set_target_properties("@INSTALL_CMAKE_NAMESPACE@::@target@" PROPERTIES
-            INTERFACE_QT_MODULE_HAS_META_TYPES TRUE
-            INTERFACE_QT_META_TYPES_INSTALL_FILE "@QT_MODULE_META_TYPES_FILE@"
-            INTERFACE_QT_META_TYPES_INSTALL_DEP_FILE "@QT_MODULE_META_TYPES_DEP_FILE@"
-        )
-    endif()

-    if (NOT QT_NO_CREATE_VERSIONLESS_TARGETS)
-        get_target_property(is_alias_target "Qt::@target@" ALIASED_TARGET)
-        if (NOT is_alias_target)
-            set_target_properties("Qt::@target@" PROPERTIES
-                INTERFACE_QT_MODULE_HAS_META_TYPES TRUE
-                INTERFACE_QT_META_TYPES_INSTALL_FILE "@QT_MODULE_META_TYPES_FILE@"
-                INTERFACE_QT_META_TYPES_INSTALL_DEP_FILE "@QT_MODULE_META_TYPES_DEP_FILE@"
-            )
-        endif()
-    endif()
+# Load Module's BuildIntenals should any exist
+if (@INSTALL_CMAKE_NAMESPACE@BuildInternals_DIR AND
+        EXISTS "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@BuildInternals.cmake")
+    include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@BuildInternals.cmake")
 endif()
--- a/cmake/QtPostProcess.cmake
+++ b/cmake/QtPostProcess.cmake
@ -1,6 +1,6 @@
 function(qt_internal_write_depends_file target)
    set(module Qt${target})
-    set(outfile "${QT_BUILD_DIR}/include/${module}/${module}Depends")
+    set(outfile "${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}/${module}/${module}Depends")
    message("Generate ${outfile}...")
    set(contents "/* This file was generated by cmake with the info from ${module} target. */\n")
    string(APPEND contents "#ifdef __cplusplus /* create empty PCH in C mode */\n")
--- a/cmake/QtResource.cmake.in
+++ b/cmake/QtResource.cmake.in
@ -40,13 +40,11 @@ function(__qt_quick_compiler_process_resources target resource_name)

    set(qml_files)
    set(resource_files)
-    set(retained_files)
    # scan for qml files
    foreach(file IN LISTS arg_FILES)
        # check whether this resource should not be processed by the qt quick
        # compiler
        get_source_file_property(skip_compiler_check ${file} QT_SKIP_QUICKCOMPILER)
-        get_source_file_property(retain_compiler_check ${file} QT_RETAIN_QUICKCOMPILER)
        if (skip_compiler_check)
            list(APPEND resource_files ${file})
            continue()
@ -56,19 +54,13 @@ function(__qt_quick_compiler_process_resources target resource_name)
                OR ${file} MATCHES "\.mjs$"
                OR ${file} MATCHES "\.qml$")
            list(APPEND qml_files ${file})
-            if (retain_compiler_check)
-                list(APPEND retained_files ${file})
-                list(APPEND resource_files ${file})
-            endif()
-        else()
-            list(APPEND resource_files ${file})
        endif()
+        list(APPEND resource_files ${file})
    endforeach()
    if (NOT TARGET @QT_CMAKE_EXPORT_NAMESPACE@::qmlcachegen AND qml_files)
        message(WARNING "QT@PROJECT_VERSION_MAJOR@_PROCESS_RESOURCE: Qml files were detected but the qmlcachgen target is not defined. Consider adding QmlTools to your find_package command.")
    endif()

-    set(retained_resource_paths)
    if (TARGET @QT_CMAKE_EXPORT_NAMESPACE@::qmlcachegen AND qml_files)
        # Enable qt quick compiler support
        set(qml_resource_file "${CMAKE_CURRENT_BINARY_DIR}/.rcc/${resource_name}.qrc")
@ -86,9 +78,6 @@ function(__qt_quick_compiler_process_resources target resource_name)
            else()
                set(file_resource_path "${arg_PREFIX}/${file_resource_path}")
            endif()
-            if (file IN_LIST retained_files)
-                list(APPEND retained_resource_paths ${file_resource_path})
-            endif()
            file(TO_CMAKE_PATH ${file_resource_path} file_resource_path)
            list(APPEND file_resource_paths ${file_resource_path})
            string(REGEX REPLACE "\.js$" "_js" compiled_file ${file_relative})
@ -102,13 +91,15 @@ function(__qt_quick_compiler_process_resources target resource_name)
            endif()
            add_custom_command(
                OUTPUT ${compiled_file}
-                DEPENDS ${file_absolute}
                ${QT_TOOL_PATH_SETUP_COMMAND}
                COMMAND
                    @QT_CMAKE_EXPORT_NAMESPACE@::qmlcachegen
-                    --resource-path ${file_resource_path}
-                    -o ${compiled_file}
-                    ${file_absolute}
+                    --resource-path "${file_resource_path}"
+                    -o "${compiled_file}"
+                    "${file_absolute}"
+                DEPENDS
+                    $<TARGET_FILE:@QT_CMAKE_EXPORT_NAMESPACE@::qmlcachegen>
+                    "${file_absolute}"
            )
            target_sources(${target} PRIVATE ${compiled_file})
        endforeach()
@ -125,25 +116,17 @@ function(__qt_quick_compiler_process_resources target resource_name)
            set(resource_name_arg "${resource_name_arg}=${chained_resource_name}")
        endif()

-        if (retained_resource_paths)
-            set(retained_loader_list "${CMAKE_CURRENT_BINARY_DIR}/.rcc/qmlcache/${resource_name}/retained_file_list.rsp")
-            file(GENERATE
-                OUTPUT ${retained_loader_list}
-                CONTENT "$<JOIN:${retained_resource_paths},\n>"
-            )
-            set(retained_args "--retain" "@${retained_loader_list}")
-        endif()
-
        add_custom_command(
            OUTPUT ${qmlcache_loader_file}
-            DEPENDS ${qmlcache_loader_list}
            ${QT_TOOL_PATH_SETUP_COMMAND}
            COMMAND
                @QT_CMAKE_EXPORT_NAMESPACE@::qmlcachegen
-                ${retained_args}
                --resource-name "${resource_name_arg}"
-                -o ${qmlcache_loader_file}
+                -o "${qmlcache_loader_file}"
                "@${qmlcache_loader_list}"
+            DEPENDS
+                $<TARGET_FILE:@QT_CMAKE_EXPORT_NAMESPACE@::qmlcachegen>
+                "${qmlcache_loader_list}"
        )

        __qt_propagate_generated_resource(${target}
@ -293,7 +276,10 @@ function(QT@PROJECT_VERSION_MAJOR@_PROCESS_RESOURCE target resourceName)
    add_custom_command(OUTPUT "${generatedSourceCode}"
                       COMMAND "@QT_CMAKE_EXPORT_NAMESPACE@::rcc"
                       ARGS ${rccArgs}
-                       DEPENDS ${resource_dependencies} ${generatedResourceFile}
+                       DEPENDS
+                        ${resource_dependencies}
+                        ${generatedResourceFile}
+                        "@QT_CMAKE_EXPORT_NAMESPACE@::rcc"
                       COMMENT "RCC ${newResourceName}"
                       VERBATIM)

--- a/coin/instructions/call_host_cmake.yaml
+++ b/coin/instructions/call_host_cmake.yaml
@ -0,0 +1,24 @@
+type: Group
+instructions:
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} {{.InstallDir}}\\host\\bin\\qt-cmake {{.Env.COIN_CMAKE_ARGS}}"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to call cmake. Contact Liang then.
+    enable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
+  - type: ExecuteCommand
+    command: "{{.InstallDir}}/host/bin/qt-cmake {{.Env.COIN_CMAKE_ARGS}}"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to call cmake. Contact Liang then.
+    disable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
--- a/coin/instructions/call_target_cmake.yaml
+++ b/coin/instructions/call_target_cmake.yaml
@ -0,0 +1,24 @@
+type: Group
+instructions:
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} {{.InstallDir}}\\target\\bin\\qt-cmake {{.Env.COIN_CMAKE_ARGS}}"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to call cmake. Contact Liang then.
+    enable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
+  - type: ExecuteCommand
+    command: "{{.InstallDir}}/target/bin/qt-cmake {{.Env.COIN_CMAKE_ARGS}}"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to call cmake. Contact Liang then.
+    disable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
--- a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
+++ b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
@ -0,0 +1,81 @@
+type: Group
+instructions:
+  - type: MakeDirectory
+    directory: .git
+  - type: MakeDirectory
+    directory: build
+  - type: ChangeDirectory
+    directory: "{{.BuildDir}}/build"
+  - type: MakeDirectory
+    directory: host
+  - type: MakeDirectory
+    directory: target
+  - type: SetBuildDirectory
+    directory: "{{.SourceDir}}/build/host"
+  - type: ChangeDirectory
+    directory: "{{.BuildDir}}"
+  - type: EnvironmentVariable
+    variableName: COIN_CMAKE_ARGS
+    variableValue: "-DBUILD_TESTING=OFF {{.SourceDir}}"
+  - !include "{{qt/qtbase}}/call_host_cmake.yaml"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel"
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to build sources. In the current state bug can be everywhere. Contact Liang first.
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: "{{.InstallRoot}}"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package for archiving.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: ""
+  - type: SetBuildDirectory
+    directory: "{{.SourceDir}}/build/target"
+  - type: ChangeDirectory
+    directory: "{{.BuildDir}}"
+  - type: EnvironmentVariable
+    variableName: COIN_CMAKE_ARGS
+    variableValue: "-DBUILD_TESTING=OFF {{.SourceDir}}"
+  - !include "{{qt/qtbase}}/call_target_cmake.yaml"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel"
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to build sources. In the current state bug can be everywhere. Contact Liang first.
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: "{{.InstallRoot}}"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package for archiving.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: ""
+  - type: UploadArtifact
+    archiveDirectory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
+    transferType: UploadModuleBuildArtifact
+    maxTimeInSeconds: 1200
+    maxTimeBetweenOutput: 1200
--- a/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
+++ b/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
@ -33,6 +33,18 @@ instructions:
    maxTimeBetweenOutput: 1200
    userMessageOnFailure: >
      Failed to install package.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: "{{.InstallRoot}}"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package for archiving.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: ""
  - type: SetBuildDirectory
    directory: "{{.SourceDir}}/build/target"
  - type: ChangeDirectory
@ -56,3 +68,20 @@ instructions:
    maxTimeBetweenOutput: 1200
    userMessageOnFailure: >
      Failed to install package.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: "{{.InstallRoot}}"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package for archiving.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: ""
+  - type: UploadArtifact
+    archiveDirectory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
+    transferType: UploadModuleBuildArtifact
+    maxTimeInSeconds: 1200
+    maxTimeBetweenOutput: 1200
--- a/coin/instructions/coin_module_build_template_v2.yaml
+++ b/coin/instructions/coin_module_build_template_v2.yaml
@ -0,0 +1,18 @@
+type: Group
+instructions:
+  - !include "{{qt/qtbase}}/prepare_building_env.yaml"
+  - type: Group
+    instructions:
+      - !include "{{qt/qtbase}}/cmake_module_build_instructions.yaml"
+      - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml"
+    enable_if:
+      condition: property
+      property: host.os
+      equals_property: target.os
+  - type: Group
+    instructions:
+      - !include "{{qt/qtbase}}/cmake_cross_compilation_module_build_instructions.yaml"
+    disable_if:
+      condition: property
+      property: host.os
+      equals_property: target.os
--- a/coin/instructions/coin_module_test_template_v2.yaml
+++ b/coin/instructions/coin_module_test_template_v2.yaml
@ -0,0 +1,16 @@
+type: Group
+instructions:
+  - type: Group
+    instructions:
+      - !include "{{qt/qtbase}}/cmake_regular_test_instructions.yaml"
+    enable_if:
+      condition: property
+      property: host.os
+      equals_property: target.os
+  - type: EnvironmentVariable
+    variableName: Dummy
+    variableValue: dummy
+    disable_if:
+      condition: property
+      property: host.os
+      equals_property: target.os
--- a/coin/instructions/coin_qtbase_build_template_v2.yaml
+++ b/coin/instructions/coin_qtbase_build_template_v2.yaml
@ -0,0 +1,18 @@
+type: Group
+instructions:
+  - !include "{{qt/qtbase}}/prepare_building_env.yaml"
+  - type: Group
+    instructions:
+      - !include "{{qt/qtbase}}/cmake_qtbase_build_instructions.yaml"
+      - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml"
+    enable_if:
+      condition: property
+      property: host.os
+      equals_property: target.os
+  - type: Group
+    instructions:
+      - !include "{{qt/qtbase}}/cmake_cross_compilation_qtbase_build_instructions.yaml"
+    disable_if:
+      condition: property
+      property: host.os
+      equals_property: target.os
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@ -6,35 +6,7 @@ accept_configuration:

 instructions:
  Build:
-    - !include "{{qt/qtbase}}/prepare_building_env.yaml"
-    - type: Group
-      instructions:
-        - !include "{{qt/qtbase}}/cmake_qtbase_build_instructions.yaml"
-        - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml"
-      enable_if:
-        condition: property
-        property: host.os
-        equals_property: target.os
-    - type: Group
-      instructions:
-        - !include "{{qt/qtbase}}/cmake_cross_compilation.yaml"
-      disable_if:
-        condition: property
-        property: host.os
-        equals_property: target.os
+    - !include "{{qt/qtbase}}/coin_qtbase_build_template_v2.yaml"

  Test:
-    - type: Group
-      instructions:
-        - !include "{{qt/qtbase}}/cmake_regular_test_instructions.yaml"
-      enable_if:
-        condition: property
-        property: host.os
-        equals_property: target.os
-    - type: EnvironmentVariable
-      variableName: Dummy
-      variableValue: dummy
-      disable_if:
-        condition: property
-        property: host.os
-        equals_property: target.os
+    - !include "{{qt/qtbase}}/coin_module_test_template_v2.yaml"
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@ -1,3 +1,4 @@
+# special case skip regeneration
 #
 # Copy/Install doc configuration files to the build/install directory
 #
--- a/examples/corelib/ipc/localfortuneclient/CMakeLists.txt
+++ b/examples/corelib/ipc/localfortuneclient/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/corelib/ipc/localfortuneclient")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -19,9 +21,12 @@ add_qt_gui_executable(localfortuneclient
    main.cpp
 )
 target_link_libraries(localfortuneclient PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
+
 install(TARGETS localfortuneclient
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/corelib/ipc/localfortuneserver/CMakeLists.txt
+++ b/examples/corelib/ipc/localfortuneserver/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/corelib/ipc/localfortuneserver")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -19,9 +21,12 @@ add_qt_gui_executable(localfortuneserver
    server.cpp server.h
 )
 target_link_libraries(localfortuneserver PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
+
 install(TARGETS localfortuneserver
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/corelib/ipc/sharedmemory/CMakeLists.txt
+++ b/examples/corelib/ipc/sharedmemory/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/corelib/ipc/sharedmemory")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)

 add_qt_gui_executable(sharedmemory
@ -18,8 +20,11 @@ add_qt_gui_executable(sharedmemory
    main.cpp
 )
 target_link_libraries(sharedmemory PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Widgets
 )
+
 install(TARGETS sharedmemory
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/corelib/mimetypes/mimetypebrowser/CMakeLists.txt
+++ b/examples/corelib/mimetypes/mimetypebrowser/CMakeLists.txt
@ -9,18 +9,23 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/corelib/mimetypes/mimetypebrowser")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)

-add_qt_gui_executable(mimetypebrowser
+add_executable(mimetypebrowser
    main.cpp
    mainwindow.cpp mainwindow.h
    mimetypemodel.cpp mimetypemodel.h
 )
 target_link_libraries(mimetypebrowser PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Widgets
 )
+
 install(TARGETS mimetypebrowser
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/corelib/serialization/cbordump/CMakeLists.txt
+++ b/examples/corelib/serialization/cbordump/CMakeLists.txt
@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/corelib/serialization/cbordump")

 find_package(Qt6 COMPONENTS Core)

@ -17,9 +17,9 @@ add_executable(cbordump
    main.cpp
 )
 target_link_libraries(cbordump PUBLIC
-    # Remove: gui
    Qt::Core
 )
+
 install(TARGETS cbordump
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/corelib/serialization/convert/CMakeLists.txt
+++ b/examples/corelib/serialization/convert/CMakeLists.txt
@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/corelib/serialization/convert")

 find_package(Qt6 COMPONENTS Core)

@ -24,9 +24,9 @@ add_executable(convert
    xmlconverter.cpp xmlconverter.h
 )
 target_link_libraries(convert PUBLIC
-    # Remove: gui
    Qt::Core
 )
+
 install(TARGETS convert
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/corelib/serialization/savegame/CMakeLists.txt
+++ b/examples/corelib/serialization/savegame/CMakeLists.txt
@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/corelib/serialization/savegame")

 find_package(Qt6 COMPONENTS Core)

@ -20,9 +20,9 @@ add_executable(savegame
    main.cpp
 )
 target_link_libraries(savegame PUBLIC
-    # Remove: gui
    Qt::Core
 )
+
 install(TARGETS savegame
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/corelib/threads/mandelbrot/CMakeLists.txt
+++ b/examples/corelib/threads/mandelbrot/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/corelib/threads/mandelbrot")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)

 add_qt_gui_executable(mandelbrot
@ -19,8 +21,17 @@ add_qt_gui_executable(mandelbrot
    renderthread.cpp renderthread.h
 )
 target_link_libraries(mandelbrot PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Widgets
 )
+
+if(UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS)
+    target_link_libraries(mandelbrot PUBLIC
+        m
+    )
+endif()
+
 install(TARGETS mandelbrot
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/corelib/threads/queuedcustomtype/CMakeLists.txt
+++ b/examples/corelib/threads/queuedcustomtype/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/corelib/threads/queuedcustomtype")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)

 add_qt_gui_executable(queuedcustomtype
@ -20,8 +22,11 @@ add_qt_gui_executable(queuedcustomtype
    window.cpp window.h
 )
 target_link_libraries(queuedcustomtype PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Widgets
 )
+
 install(TARGETS queuedcustomtype
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/corelib/threads/semaphores/CMakeLists.txt
+++ b/examples/corelib/threads/semaphores/CMakeLists.txt
@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/corelib/threads/semaphores")

 find_package(Qt6 COMPONENTS Core)

@ -19,6 +19,7 @@ add_executable(semaphores
 target_link_libraries(semaphores PUBLIC
    Qt::Core
 )
+
 install(TARGETS semaphores
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/corelib/threads/waitconditions/CMakeLists.txt
+++ b/examples/corelib/threads/waitconditions/CMakeLists.txt
@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/corelib/threads/waitconditions")

 find_package(Qt6 COMPONENTS Core)

@ -19,6 +19,7 @@ add_executable(waitconditions
 target_link_libraries(waitconditions PUBLIC
    Qt::Core
 )
+
 install(TARGETS waitconditions
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/corelib/tools/contiguouscache/CMakeLists.txt
+++ b/examples/corelib/tools/contiguouscache/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/corelib/tools/contiguouscache")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)

 add_qt_gui_executable(contiguouscache
@ -18,8 +20,11 @@ add_qt_gui_executable(contiguouscache
    randomlistmodel.cpp randomlistmodel.h
 )
 target_link_libraries(contiguouscache PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Widgets
 )
+
 install(TARGETS contiguouscache
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/corelib/tools/customtype/CMakeLists.txt
+++ b/examples/corelib/tools/customtype/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/corelib/tools/customtype")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)

 add_qt_gui_executable(customtype
@ -18,8 +20,11 @@ add_qt_gui_executable(customtype
    message.cpp message.h
 )
 target_link_libraries(customtype PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Widgets
 )
+
 install(TARGETS customtype
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/corelib/tools/customtypesending/CMakeLists.txt
+++ b/examples/corelib/tools/customtypesending/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/corelib/tools/customtypesending")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)

 add_qt_gui_executable(customtypesending
@ -19,8 +21,11 @@ add_qt_gui_executable(customtypesending
    window.cpp window.h
 )
 target_link_libraries(customtypesending PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Widgets
 )
+
 install(TARGETS customtypesending
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/dbus/chat/.prev_CMakeLists.txt
+++ b/examples/dbus/chat/.prev_CMakeLists.txt
@ -0,0 +1,35 @@
+# Generated from chat.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(chat LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/dbus/chat")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS DBus)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(chat
+    chat.cpp chat.h
+    chatmainwindow.ui
+    chatsetnickname.ui
+)
+target_link_libraries(chat PUBLIC
+    Qt::Core
+    Qt::DBus
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS chat
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
--- a/examples/dbus/chat/CMakeLists.txt
+++ b/examples/dbus/chat/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/dbus/chat")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS DBus)
 find_package(Qt6 COMPONENTS Widgets)

@ -34,9 +36,12 @@ add_qt_gui_executable(chat
    ${chat_SRCS} # special case
 )
 target_link_libraries(chat PUBLIC
+    Qt::Core
    Qt::DBus
+    Qt::Gui
    Qt::Widgets
 )
+
 install(TARGETS chat
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/dbus/listnames/CMakeLists.txt
+++ b/examples/dbus/listnames/CMakeLists.txt
@ -9,17 +9,19 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/dbus/listnames")

+find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS DBus)

 add_qt_gui_executable(listnames
    listnames.cpp
 )
 target_link_libraries(listnames PUBLIC
-    # Remove: gui
+    Qt::Core
    Qt::DBus
 )
+
 install(TARGETS listnames
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/dbus/remotecontrolledcar/car/.prev_CMakeLists.txt
+++ b/examples/dbus/remotecontrolledcar/car/.prev_CMakeLists.txt
@ -0,0 +1,34 @@
+# Generated from car.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(car LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/dbus/remotecontrolledcar/car")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS DBus)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(car
+    car.cpp car.h
+    main.cpp
+)
+target_link_libraries(car PUBLIC
+    Qt::Core
+    Qt::DBus
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS car
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
--- a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt
+++ b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/dbus/remotecontrolledcar/car")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS DBus)
 find_package(Qt6 COMPONENTS Widgets)

@ -29,9 +31,12 @@ add_qt_gui_executable(car
    ${car_SRCS} # special case
 )
 target_link_libraries(car PUBLIC
+    Qt::Core
    Qt::DBus
+    Qt::Gui
    Qt::Widgets
 )
+
 install(TARGETS car
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/dbus/remotecontrolledcar/controller/.prev_CMakeLists.txt
+++ b/examples/dbus/remotecontrolledcar/controller/.prev_CMakeLists.txt
@ -0,0 +1,34 @@
+# Generated from controller.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(controller LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/dbus/remotecontrolledcar/controller")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS DBus)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(controller
+    controller.cpp controller.h controller.ui
+    main.cpp
+)
+target_link_libraries(controller PUBLIC
+    Qt::Core
+    Qt::DBus
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS controller
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
--- a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt
+++ b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/dbus/remotecontrolledcar/controller")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS DBus)
 find_package(Qt6 COMPONENTS Widgets)

@ -27,9 +29,12 @@ add_qt_gui_executable(controller
    ${controller_SRCS} # special case
 )
 target_link_libraries(controller PUBLIC
+    Qt::Core
    Qt::DBus
+    Qt::Gui
    Qt::Widgets
 )
+
 install(TARGETS controller
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/embedded/digiflip/CMakeLists.txt
+++ b/examples/embedded/digiflip/CMakeLists.txt
@ -9,16 +9,21 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/embedded/digiflip")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)

 add_qt_gui_executable(digiflip
    digiflip.cpp
 )
 target_link_libraries(digiflip PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Widgets
 )
+
 install(TARGETS digiflip
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/embedded/flickable/CMakeLists.txt
+++ b/examples/embedded/flickable/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/embedded/flickable")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)

 add_qt_gui_executable(flickable
@ -18,8 +20,11 @@ add_qt_gui_executable(flickable
    main.cpp
 )
 target_link_libraries(flickable PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Widgets
 )
+
 install(TARGETS flickable
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/embedded/flightinfo/.prev_CMakeLists.txt
+++ b/examples/embedded/flightinfo/.prev_CMakeLists.txt
@ -0,0 +1,47 @@
+# Generated from flightinfo.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(flightinfo LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/embedded/flightinfo")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(flightinfo
+    flightinfo.cpp
+    form.ui
+)
+target_link_libraries(flightinfo PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+
+# Resources:
+set(flightinfo_resource_files
+    "aircraft.png"
+)
+
+qt6_add_resources(flightinfo "flightinfo"
+    PREFIX
+        "/"
+    FILES
+        ${flightinfo_resource_files}
+)
+
+install(TARGETS flightinfo
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
--- a/examples/embedded/flightinfo/CMakeLists.txt
+++ b/examples/embedded/flightinfo/CMakeLists.txt
@ -9,20 +9,37 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/embedded/flightinfo")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

 add_qt_gui_executable(flightinfo
    flightinfo.cpp
    form.ui
-    flightinfo.qrc # special case: add
 )
 target_link_libraries(flightinfo PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
+
+
+# Resources:
+set(flightinfo_resource_files
+    "aircraft.png"
+)
+
+qt6_add_resources(flightinfo "flightinfo"
+    PREFIX
+        "/"
+    FILES
+        ${flightinfo_resource_files}
+)
+
 install(TARGETS flightinfo
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/embedded/lightmaps/CMakeLists.txt
+++ b/examples/embedded/lightmaps/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/embedded/lightmaps")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -21,9 +23,12 @@ add_qt_gui_executable(lightmaps
    slippymap.cpp slippymap.h
 )
 target_link_libraries(lightmaps PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
+
 install(TARGETS lightmaps
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/embedded/raycasting/CMakeLists.txt
+++ b/examples/embedded/raycasting/CMakeLists.txt
@ -9,17 +9,34 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/embedded/raycasting")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)

 add_qt_gui_executable(raycasting
-    raycasting.cpp raycasting.qrc
+    raycasting.cpp
 )
 target_link_libraries(raycasting PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Widgets
 )

+
+# Resources:
+set(raycasting_resource_files
+    "textures.png"
+)
+
+qt6_add_resources(raycasting "raycasting"
+    PREFIX
+        "/"
+    FILES
+        ${raycasting_resource_files}
+)
+
 install(TARGETS raycasting
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/embedded/styleexample/.prev_CMakeLists.txt
+++ b/examples/embedded/styleexample/.prev_CMakeLists.txt
@ -0,0 +1,52 @@
+# Generated from styleexample.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(styleexample LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/embedded/styleexample")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(styleexample
+    main.cpp
+    stylewidget.cpp stylewidget.h stylewidget.ui
+)
+target_link_libraries(styleexample PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(styleexample_resource_files
+    "files/add.png"
+    "files/application.qss"
+    "files/blue.qss"
+    "files/khaki.qss"
+    "files/nature_1.jpg"
+    "files/nostyle.qss"
+    "files/remove.png"
+    "files/transparent.qss"
+)
+
+qt6_add_resources(styleexample "styleexample"
+    PREFIX
+        "/"
+    FILES
+        ${styleexample_resource_files}
+)
+
+install(TARGETS styleexample
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
--- a/examples/embedded/styleexample/CMakeLists.txt
+++ b/examples/embedded/styleexample/CMakeLists.txt
@ -9,18 +9,42 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/embedded/styleexample")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)

 add_qt_gui_executable(styleexample
    main.cpp
    stylewidget.cpp stylewidget.h stylewidget.ui
-    styleexample.qrc # special case: add
 )
 target_link_libraries(styleexample PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Widgets
 )
+
+
+# Resources:
+set(styleexample_resource_files
+    "files/add.png"
+    "files/application.qss"
+    "files/blue.qss"
+    "files/khaki.qss"
+    "files/nature_1.jpg"
+    "files/nostyle.qss"
+    "files/remove.png"
+    "files/transparent.qss"
+)
+
+qt6_add_resources(styleexample "styleexample"
+    PREFIX
+        "/"
+    FILES
+        ${styleexample_resource_files}
+)
+
 install(TARGETS styleexample
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/gui/analogclock/.prev_CMakeLists.txt
+++ b/examples/gui/analogclock/.prev_CMakeLists.txt
@ -0,0 +1,34 @@
+# Generated from analogclock.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(analogclock LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/gui/analogclock")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+add_qt_gui_executable(analogclock
+    ../rasterwindow/rasterwindow.cpp ../rasterwindow/rasterwindow.h
+    main.cpp
+)
+target_include_directories(analogclock PUBLIC
+    ../rasterwindow
+)
+
+target_link_libraries(analogclock PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS analogclock
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
--- a/examples/gui/analogclock/CMakeLists.txt
+++ b/examples/gui/analogclock/CMakeLists.txt
@ -3,7 +3,6 @@
 cmake_minimum_required(VERSION 3.14)
 project(analogclock LANGUAGES CXX)

-find_package(Qt6 COMPONENTS Widgets) # special case: add

 set(CMAKE_INCLUDE_CURRENT_DIR ON)

@ -11,22 +10,31 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/gui/gui_analogclock") # special case
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets) # special case: add

 add_qt_gui_executable(gui_analogclock # special case: renamed target
    ../rasterwindow/rasterwindow.cpp ../rasterwindow/rasterwindow.h
    main.cpp
 )
-target_include_directories(gui_analogclock PUBLIC
+target_include_directories(gui_analogclock PUBLIC # special case
    ../rasterwindow
 )
 # special case begin
-target_link_libraries(gui_analogclock PUBLIC
+target_link_libraries(gui_analogclock PUBLIC # special case
    Qt::Gui
 )
 # special case end

-install(TARGETS gui_analogclock
+target_link_libraries(gui_analogclock PUBLIC # special case
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS gui_analogclock # special case
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/gui/rasterwindow/.prev_CMakeLists.txt
+++ b/examples/gui/rasterwindow/.prev_CMakeLists.txt
@ -0,0 +1,34 @@
+# Generated from rasterwindow.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(rasterwindow LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/gui/rasterwindow")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+add_qt_gui_executable(rasterwindow
+    main.cpp
+    rasterwindow.cpp rasterwindow.h
+)
+target_include_directories(rasterwindow PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_link_libraries(rasterwindow PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS rasterwindow
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
--- a/examples/gui/rasterwindow/CMakeLists.txt
+++ b/examples/gui/rasterwindow/CMakeLists.txt
@ -11,7 +11,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/gui/rasterwindow")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)

 add_qt_gui_executable(rasterwindow
    main.cpp
@ -20,11 +23,11 @@ add_qt_gui_executable(rasterwindow
 target_include_directories(rasterwindow PUBLIC
    ${CMAKE_CURRENT_SOURCE_DIR}
 )
-# special case begin
 target_link_libraries(rasterwindow PUBLIC
+    Qt::Core
    Qt::Gui
 )
-# special case end
+
 install(TARGETS rasterwindow
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/network/bearermonitor/CMakeLists.txt
+++ b/examples/network/bearermonitor/CMakeLists.txt
@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/bearermonitor")

 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@ -30,6 +30,12 @@ target_link_libraries(bearermonitor PUBLIC
    Qt::Widgets
 )

+if(WIN32)
+    target_link_libraries(bearermonitor PUBLIC
+        ws2_32
+    )
+endif()
+
 install(TARGETS bearermonitor
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/network/blockingfortuneclient/CMakeLists.txt
+++ b/examples/network/blockingfortuneclient/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/blockingfortuneclient")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -20,6 +22,8 @@ add_qt_gui_executable(blockingfortuneclient
    main.cpp
 )
 target_link_libraries(blockingfortuneclient PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
--- a/examples/network/broadcastreceiver/CMakeLists.txt
+++ b/examples/network/broadcastreceiver/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/broadcastreceiver")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -19,6 +21,8 @@ add_qt_gui_executable(broadcastreceiver
    receiver.cpp receiver.h
 )
 target_link_libraries(broadcastreceiver PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
--- a/examples/network/broadcastsender/CMakeLists.txt
+++ b/examples/network/broadcastsender/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/broadcastsender")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -19,6 +21,8 @@ add_qt_gui_executable(broadcastsender
    sender.cpp sender.h
 )
 target_link_libraries(broadcastsender PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
--- a/examples/network/dnslookup/CMakeLists.txt
+++ b/examples/network/dnslookup/CMakeLists.txt
@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/dnslookup")

 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Network)
--- a/examples/network/download/CMakeLists.txt
+++ b/examples/network/download/CMakeLists.txt
@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/download")

 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Network)
--- a/examples/network/downloadmanager/CMakeLists.txt
+++ b/examples/network/downloadmanager/CMakeLists.txt
@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/downloadmanager")

 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Network)
--- a/examples/network/fortuneclient/CMakeLists.txt
+++ b/examples/network/fortuneclient/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/fortuneclient")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -19,6 +21,8 @@ add_qt_gui_executable(fortuneclient
    main.cpp
 )
 target_link_libraries(fortuneclient PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
--- a/examples/network/fortuneserver/CMakeLists.txt
+++ b/examples/network/fortuneserver/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/fortuneserver")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -19,6 +21,8 @@ add_qt_gui_executable(fortuneserver
    server.cpp server.h
 )
 target_link_libraries(fortuneserver PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
--- a/examples/network/googlesuggest/CMakeLists.txt
+++ b/examples/network/googlesuggest/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/googlesuggest")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -20,6 +22,8 @@ add_qt_gui_executable(googlesuggest
    searchbox.cpp searchbox.h
 )
 target_link_libraries(googlesuggest PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
--- a/examples/network/http/CMakeLists.txt
+++ b/examples/network/http/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/http")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -20,6 +22,8 @@ add_qt_gui_executable(http
    main.cpp
 )
 target_link_libraries(http PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
--- a/examples/network/loopback/CMakeLists.txt
+++ b/examples/network/loopback/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/loopback")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -19,6 +21,8 @@ add_qt_gui_executable(loopback
    main.cpp
 )
 target_link_libraries(loopback PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
--- a/examples/network/multicastreceiver/CMakeLists.txt
+++ b/examples/network/multicastreceiver/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/multicastreceiver")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -19,6 +21,8 @@ add_qt_gui_executable(multicastreceiver
    receiver.cpp receiver.h
 )
 target_link_libraries(multicastreceiver PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
--- a/examples/network/multicastsender/CMakeLists.txt
+++ b/examples/network/multicastsender/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/multicastsender")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -19,6 +21,8 @@ add_qt_gui_executable(multicastsender
    sender.cpp sender.h
 )
 target_link_libraries(multicastsender PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
--- a/examples/network/multistreamclient/CMakeLists.txt
+++ b/examples/network/multistreamclient/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/multistreamclient")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -23,6 +25,8 @@ add_qt_gui_executable(multistreamclient
    timeconsumer.cpp timeconsumer.h
 )
 target_link_libraries(multistreamclient PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
--- a/examples/network/multistreamserver/CMakeLists.txt
+++ b/examples/network/multistreamserver/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/multistreamserver")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -23,6 +25,8 @@ add_qt_gui_executable(multistreamserver
    timeprovider.cpp timeprovider.h
 )
 target_link_libraries(multistreamserver PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
--- a/examples/network/network-chat/CMakeLists.txt
+++ b/examples/network/network-chat/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/network-chat")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -23,6 +25,8 @@ add_qt_gui_executable(network-chat
    server.cpp server.h
 )
 target_link_libraries(network-chat PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
--- a/examples/network/securesocketclient/CMakeLists.txt
+++ b/examples/network/securesocketclient/CMakeLists.txt
@ -9,23 +9,39 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/securesocketclient")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

 add_qt_gui_executable(securesocketclient
    certificateinfo.cpp certificateinfo.h certificateinfo.ui
    main.cpp
-    securesocketclient.qrc
    sslclient.cpp sslclient.h sslclient.ui
    sslerrors.ui
 )
 target_link_libraries(securesocketclient PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )

+
+# Resources:
+set(securesocketclient_resource_files
+    "encrypted.png"
+)
+
+qt6_add_resources(securesocketclient "securesocketclient"
+    PREFIX
+        "/"
+    FILES
+        ${securesocketclient_resource_files}
+)
+
 install(TARGETS securesocketclient
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/network/secureudpclient/CMakeLists.txt
+++ b/examples/network/secureudpclient/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/secureudpclient")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS Network)

@ -21,6 +23,8 @@ add_qt_gui_executable(secureudpclient
    mainwindow.cpp mainwindow.h mainwindow.ui
 )
 target_link_libraries(secureudpclient PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
--- a/examples/network/secureudpserver/CMakeLists.txt
+++ b/examples/network/secureudpserver/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/secureudpserver")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS Network)

@ -21,6 +23,8 @@ add_qt_gui_executable(secureudpserver
    server.cpp server.h
 )
 target_link_libraries(secureudpserver PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
--- a/examples/network/threadedfortuneserver/CMakeLists.txt
+++ b/examples/network/threadedfortuneserver/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/threadedfortuneserver")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -21,6 +23,8 @@ add_qt_gui_executable(threadedfortuneserver
    main.cpp
 )
 target_link_libraries(threadedfortuneserver PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )
--- a/examples/network/torrent/.prev_CMakeLists.txt
+++ b/examples/network/torrent/.prev_CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/torrent")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -20,7 +22,6 @@ add_qt_gui_executable(torrent
    connectionmanager.cpp connectionmanager.h
    filemanager.cpp filemanager.h
    forms/addtorrentform.ui
-    icons.qrc
    main.cpp
    mainwindow.cpp mainwindow.h
    metainfo.cpp metainfo.h
@ -31,11 +32,34 @@ add_qt_gui_executable(torrent
    trackerclient.cpp trackerclient.h
 )
 target_link_libraries(torrent PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )

+
+# Resources:
+set(icons_resource_files
+    "icons/1downarrow.png"
+    "icons/1uparrow.png"
+    "icons/bottom.png"
+    "icons/exit.png"
+    "icons/peertopeer.png"
+    "icons/player_pause.png"
+    "icons/player_play.png"
+    "icons/player_stop.png"
+)
+
+qt6_add_resources(torrent "icons"
+    PREFIX
+        "/"
+    FILES
+        ${icons_resource_files}
+)
+
 install(TARGETS torrent
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/network/torrent/CMakeLists.txt
+++ b/examples/network/torrent/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/network/torrent")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Network)
 find_package(Qt6 COMPONENTS Widgets)

@ -20,7 +22,6 @@ add_qt_gui_executable(torrent
    connectionmanager.cpp connectionmanager.h
    filemanager.cpp filemanager.h
    forms/addtorrentform.ui
-    icons.qrc
    main.cpp
    mainwindow.cpp mainwindow.h
    metainfo.cpp metainfo.h
@ -32,10 +33,32 @@ add_qt_gui_executable(torrent
 )
 target_include_directories(torrent PUBLIC forms) # special case
 target_link_libraries(torrent PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Network
    Qt::Widgets
 )

+
+# Resources:
+set(icons_resource_files
+    "icons/1downarrow.png"
+    "icons/1uparrow.png"
+    "icons/bottom.png"
+    "icons/exit.png"
+    "icons/peertopeer.png"
+    "icons/player_pause.png"
+    "icons/player_play.png"
+    "icons/player_stop.png"
+)
+
+qt6_add_resources(torrent "icons"
+    PREFIX
+        "/"
+    FILES
+        ${icons_resource_files}
+)
+
 install(TARGETS torrent
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/qpa/qrasterwindow/.prev_CMakeLists.txt
+++ b/examples/qpa/qrasterwindow/.prev_CMakeLists.txt
@ -0,0 +1,29 @@
+# Generated from qrasterwindow.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(qrasterwindow LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/qpa/qrasterwindow")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+add_qt_gui_executable(qrasterwindow
+    main.cpp
+)
+target_link_libraries(qrasterwindow PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS qrasterwindow
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
--- a/examples/qpa/qrasterwindow/CMakeLists.txt
+++ b/examples/qpa/qrasterwindow/CMakeLists.txt
@ -3,20 +3,24 @@
 cmake_minimum_required(VERSION 3.14)
 project(qrasterwindow LANGUAGES CXX)

-find_package(Qt6 COMPONENTS Gui) # special case
-
 set(CMAKE_INCLUDE_CURRENT_DIR ON)

 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/qpa/qrasterwindow")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)

 add_qt_gui_executable(qrasterwindow
    main.cpp
 )
-target_link_libraries(qrasterwindow PUBLIC Qt::Gui) # special case: add
+target_link_libraries(qrasterwindow PUBLIC
+    Qt::Core
+    Qt::Gui
+)

 install(TARGETS qrasterwindow
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/qpa/windows/CMakeLists.txt
+++ b/examples/qpa/windows/CMakeLists.txt
@ -9,10 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/qpa/windows")

-find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)

 add_executable(windows
    main.cpp
@ -22,6 +22,7 @@ target_link_libraries(windows PRIVATE
    Qt::CorePrivate
    Qt::GuiPrivate
 )
+
 target_link_libraries(windows PUBLIC
    Qt::Core
    Qt::Gui
--- a/examples/qtconcurrent/imagescaling/CMakeLists.txt
+++ b/examples/qtconcurrent/imagescaling/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/imagescaling")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Concurrent)
 find_package(Qt6 COMPONENTS Widgets)

@ -20,6 +22,8 @@ add_qt_gui_executable(imagescaling
 )
 target_link_libraries(imagescaling PUBLIC
    Qt::Concurrent
+    Qt::Core
+    Qt::Gui
    Qt::Widgets
 )

--- a/examples/qtconcurrent/map/.prev_CMakeLists.txt
+++ b/examples/qtconcurrent/map/.prev_CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/map")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Concurrent)

 add_executable(mapdemo
@ -18,9 +20,12 @@ add_executable(mapdemo
 )
 target_link_libraries(mapdemo PUBLIC
    Qt::Concurrent
+    Qt::Core
+    Qt::Gui
 )

 install(TARGETS mapdemo
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/qtconcurrent/map/CMakeLists.txt
+++ b/examples/qtconcurrent/map/CMakeLists.txt
@ -9,17 +9,19 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/map")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Concurrent)
-find_package(Qt6 COMPONENTS Gui) # special case

 add_executable(mapdemo
    main.cpp
 )
 target_link_libraries(mapdemo PUBLIC
    Qt::Concurrent
-    Qt::Gui # special case
+    Qt::Core
+    Qt::Gui
 )
 install(TARGETS mapdemo
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/qtconcurrent/progressdialog/CMakeLists.txt
+++ b/examples/qtconcurrent/progressdialog/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/progressdialog")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Concurrent)
 find_package(Qt6 COMPONENTS Widgets)

@ -19,6 +21,8 @@ add_executable(progressdialog
 )
 target_link_libraries(progressdialog PUBLIC
    Qt::Concurrent
+    Qt::Core
+    Qt::Gui
    Qt::Widgets
 )

--- a/examples/qtconcurrent/runfunction/CMakeLists.txt
+++ b/examples/qtconcurrent/runfunction/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/runfunction")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Concurrent)
 find_package(Qt6 COMPONENTS Widgets)

@ -19,6 +21,8 @@ add_executable(runfunction
 )
 target_link_libraries(runfunction PUBLIC
    Qt::Concurrent
+    Qt::Core
+    Qt::Gui
    Qt::Widgets
 )

--- a/examples/qtconcurrent/wordcount/CMakeLists.txt
+++ b/examples/qtconcurrent/wordcount/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/wordcount")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Concurrent)
 find_package(Qt6 COMPONENTS Widgets)

@ -19,6 +21,8 @@ add_executable(wordcount
 )
 target_link_libraries(wordcount PUBLIC
    Qt::Concurrent
+    Qt::Core
+    Qt::Gui
    Qt::Widgets
 )

--- a/examples/qtestlib/tutorial1/CMakeLists.txt
+++ b/examples/qtestlib/tutorial1/CMakeLists.txt
@ -9,18 +9,23 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/qtestlib/tutorial1")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS Test)

-add_qt_gui_executable(tutorial1
+add_executable(tutorial1
    testqstring.cpp
 )
 target_link_libraries(tutorial1 PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Test
    Qt::Widgets
 )
+
 install(TARGETS tutorial1
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/qtestlib/tutorial2/CMakeLists.txt
+++ b/examples/qtestlib/tutorial2/CMakeLists.txt
@ -9,18 +9,23 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/qtestlib/tutorial2")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS Test)

-add_qt_gui_executable(tutorial2
+add_executable(tutorial2
    testqstring.cpp
 )
 target_link_libraries(tutorial2 PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Test
    Qt::Widgets
 )
+
 install(TARGETS tutorial2
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/qtestlib/tutorial3/CMakeLists.txt
+++ b/examples/qtestlib/tutorial3/CMakeLists.txt
@ -9,18 +9,23 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/qtestlib/tutorial3")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS Test)

-add_qt_gui_executable(tutorial3
+add_executable(tutorial3
    testgui.cpp
 )
 target_link_libraries(tutorial3 PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Test
    Qt::Widgets
 )
+
 install(TARGETS tutorial3
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/qtestlib/tutorial4/CMakeLists.txt
+++ b/examples/qtestlib/tutorial4/CMakeLists.txt
@ -9,18 +9,23 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/qtestlib/tutorial4")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS Test)

-add_qt_gui_executable(tutorial4
+add_executable(tutorial4
    testgui.cpp
 )
 target_link_libraries(tutorial4 PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Test
    Qt::Widgets
 )
+
 install(TARGETS tutorial4
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/qtestlib/tutorial5/CMakeLists.txt
+++ b/examples/qtestlib/tutorial5/CMakeLists.txt
@ -9,18 +9,23 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/qtestlib/tutorial5")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS Test)

-add_qt_gui_executable(tutorial5
+add_executable(tutorial5
    benchmarking.cpp
 )
 target_link_libraries(tutorial5 PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Test
    Qt::Widgets
 )
+
 install(TARGETS tutorial5
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/sql/books/CMakeLists.txt
+++ b/examples/sql/books/CMakeLists.txt
@ -9,14 +9,15 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/sql/books")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Sql)
 find_package(Qt6 COMPONENTS Widgets)

 add_qt_gui_executable(books
    bookdelegate.cpp bookdelegate.h
-    books.qrc
    bookwindow.cpp bookwindow.h bookwindow.ui
    initdb.h
    main.cpp
@ -24,11 +25,27 @@ add_qt_gui_executable(books
 target_include_directories(books PUBLIC
    .
 )
+
 target_link_libraries(books PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Sql
    Qt::Widgets
 )

+
+# Resources:
+set(books_resource_files
+    "images/star.png"
+)
+
+qt6_add_resources(books "books"
+    PREFIX
+        "/"
+    FILES
+        ${books_resource_files}
+)
+
 install(TARGETS books
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/sql/cachedtable/CMakeLists.txt
+++ b/examples/sql/cachedtable/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/sql/cachedtable")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Sql)
 find_package(Qt6 COMPONENTS Widgets)

@ -20,6 +22,8 @@ add_qt_gui_executable(cachedtable
    tableeditor.cpp tableeditor.h
 )
 target_link_libraries(cachedtable PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Sql
    Qt::Widgets
 )
--- a/examples/sql/drilldown/CMakeLists.txt
+++ b/examples/sql/drilldown/CMakeLists.txt
@ -9,24 +9,43 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/sql/drilldown")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Sql)
 find_package(Qt6 COMPONENTS Widgets)

 add_qt_gui_executable(drilldown
    ../connection.h
-    drilldown.qrc
    imageitem.cpp imageitem.h
    informationwindow.cpp informationwindow.h
    main.cpp
    view.cpp view.h
 )
 target_link_libraries(drilldown PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Sql
    Qt::Widgets
 )

+
+# Resources:
+set(drilldown_resource_files
+    "images/qt-creator.png"
+    "images/qt-logo.png"
+    "images/qt-project.png"
+    "images/qt-quick.png"
+)
+
+qt6_add_resources(drilldown "drilldown"
+    PREFIX
+        "/"
+    FILES
+        ${drilldown_resource_files}
+)
+
 install(TARGETS drilldown
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/sql/masterdetail/CMakeLists.txt
+++ b/examples/sql/masterdetail/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/sql/masterdetail")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Sql)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS Xml)
@ -20,14 +22,29 @@ add_qt_gui_executable(masterdetail
    dialog.cpp dialog.h
    main.cpp
    mainwindow.cpp mainwindow.h
-    masterdetail.qrc
 )
 target_link_libraries(masterdetail PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Sql
    Qt::Widgets
    Qt::Xml
 )

+
+# Resources:
+set(masterdetail_resource_files
+    "images/icon.png"
+    "images/image.png"
+)
+
+qt6_add_resources(masterdetail "masterdetail"
+    PREFIX
+        "/"
+    FILES
+        ${masterdetail_resource_files}
+)
+
 install(TARGETS masterdetail
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/sql/querymodel/CMakeLists.txt
+++ b/examples/sql/querymodel/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/sql/querymodel")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Sql)
 find_package(Qt6 COMPONENTS Widgets)

@ -21,6 +23,8 @@ add_qt_gui_executable(querymodel
    main.cpp
 )
 target_link_libraries(querymodel PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Sql
    Qt::Widgets
 )
--- a/examples/sql/relationaltablemodel/CMakeLists.txt
+++ b/examples/sql/relationaltablemodel/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/sql/relationaltablemodel")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Sql)
 find_package(Qt6 COMPONENTS Widgets)

@ -19,6 +21,8 @@ add_qt_gui_executable(relationaltablemodel
    relationaltablemodel.cpp
 )
 target_link_libraries(relationaltablemodel PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Sql
    Qt::Widgets
 )
--- a/examples/sql/sqlbrowser/CMakeLists.txt
+++ b/examples/sql/sqlbrowser/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/sql/sqlbrowser")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Sql)
 find_package(Qt6 COMPONENTS Widgets)

@ -22,6 +24,8 @@ add_qt_gui_executable(sqlbrowser
    qsqlconnectiondialog.cpp qsqlconnectiondialog.h qsqlconnectiondialog.ui
 )
 target_link_libraries(sqlbrowser PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Sql
    Qt::Widgets
 )
--- a/examples/sql/sqlwidgetmapper/CMakeLists.txt
+++ b/examples/sql/sqlwidgetmapper/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/sql/sqlwidgetmapper")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Sql)
 find_package(Qt6 COMPONENTS Widgets)

@ -19,6 +21,8 @@ add_qt_gui_executable(sqlwidgetmapper
    window.cpp window.h
 )
 target_link_libraries(sqlwidgetmapper PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Sql
    Qt::Widgets
 )
--- a/examples/sql/tablemodel/CMakeLists.txt
+++ b/examples/sql/tablemodel/CMakeLists.txt
@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/sql/tablemodel")

+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Sql)
 find_package(Qt6 COMPONENTS Widgets)

@ -19,6 +21,8 @@ add_qt_gui_executable(tablemodel
    tablemodel.cpp
 )
 target_link_libraries(tablemodel PUBLIC
+    Qt::Core
+    Qt::Gui
    Qt::Sql
    Qt::Widgets
 )
--- a/examples/vulkan/hellovulkancubes/CMakeLists.txt
+++ b/examples/vulkan/hellovulkancubes/CMakeLists.txt
@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/vulkan/hellovulkancubes")

 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@ -32,6 +32,7 @@ target_link_libraries(hellovulkancubes PUBLIC
    Qt::Widgets
 )

+
 # Resources:
 set_source_files_properties("../shared/block.buf"
    PROPERTIES QT_RESOURCE_ALIAS "block.buf"
@ -55,7 +56,6 @@ qt6_add_resources(hellovulkancubes "hellovulkancubes"
        ${hellovulkancubes_resource_files}
 )

-
 install(TARGETS hellovulkancubes
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/examples/vulkan/hellovulkantexture/CMakeLists.txt
+++ b/examples/vulkan/hellovulkantexture/CMakeLists.txt
@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/vulkan/hellovulkantexture")

 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@ -23,6 +23,7 @@ target_link_libraries(hellovulkantexture PUBLIC
    Qt::Gui
 )

+
 # Resources:
 set(hellovulkantexture_resource_files
    "qt256.png"
@ -37,7 +38,6 @@ qt6_add_resources(hellovulkantexture "hellovulkantexture"
        ${hellovulkantexture_resource_files}
 )

-
 install(TARGETS hellovulkantexture
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
--- a/Show More
+++ b/Show More