cmake: Nearly full cmake build

Had to rename a lot of things to conform with the standard Qt module
layout that the cmake system expects:
 - all non-manual tests were moved to a sub-dir named auto/
 - the benchmark was moved to tests/
 - the 3rdparty folder was moved into src/

Other changes:
 - libyaml was updated to 2.2.5 while fixing a weird build issue that
   led to crashes on 64bit systems.
 - fixed build issues with the new 8.1 MingW compiler.
 - added support for QT_NO_OPENGL builds.

The remaining issues are:
 - examples still don't build with qmake due to a potential bug in
   module.pri generation.
 - tests do run, but the test data is not generated yet dynamically.
 - qml-only tests are not built and run yet.
 - qml-only examples are not built yet.

Fixes: AUTOSUITE-1632
Change-Id: Ic5fe0148e738b05835c73bed78e624b55861b75e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Dominik Holland <dominik.holland@qt.io>

519 files changed, 3235 insertions, 346 deletions

diff --git a/.cmake.conf b/.cmake.conf
new file mode 100644
index 00000000..4e73b3d6
--- /dev/null
+++ b/.cmake.conf
@@ -0,0 +1 @@
+set(QT_REPO_MODULE_VERSION "6.2.0")
diff --git a/3rdparty/libarchive.pri b/3rdparty/libarchive.pri
deleted file mode 100644
index ad1e0bc6..00000000
--- a/3rdparty/libarchive.pri
+++ /dev/null
@@ -1,9 +0,0 @@
-
-include(libz.pri)
-
-!config_libarchive|no-system-libarchive {
-    QMAKE_USE_PRIVATE += archive
-} else {
-    PKGCONFIG_PRIVATE += "'libarchive >= 3.1.2'"
-    CONFIG *= link_pkgconfig
-}
diff --git a/3rdparty/libbacktrace.pri b/3rdparty/libbacktrace.pri
deleted file mode 100644
index ec9d1da8..00000000
--- a/3rdparty/libbacktrace.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-
-QMAKE_USE_PRIVATE += backtrace
diff --git a/3rdparty/libyaml.pri b/3rdparty/libyaml.pri
deleted file mode 100644
index bac439f0..00000000
--- a/3rdparty/libyaml.pri
+++ /dev/null
@@ -1,7 +0,0 @@
-
-!config_libyaml|no-system-libyaml {
-    QMAKE_USE_PRIVATE += yaml
-} else {
-    PKGCONFIG_PRIVATE += "'yaml-0.1 >= 0.1.6'"
-    CONFIG *= link_pkgconfig
-}
diff --git a/3rdparty/libz.pri b/3rdparty/libz.pri
deleted file mode 100644
index 682bf410..00000000
--- a/3rdparty/libz.pri
+++ /dev/null
@@ -1,8 +0,0 @@
-# zlib dependency satisfied by bundled 3rd party zlib or system zlib
-CONFIG *= qt
-
-qtConfig(system-zlib) {
-    QMAKE_USE_PRIVATE *= zlib
-} else {
-    QT_PRIVATE *= core zlib-private
-}
diff --git a/3rdparty/stackwalker.pri b/3rdparty/stackwalker.pri
deleted file mode 100644
index c77951b2..00000000
--- a/3rdparty/stackwalker.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-
-QMAKE_USE_PRIVATE += stackwalker
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 00000000..9d84b673
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,44 @@
+# Generated from application-manager.pro.
+
+cmake_minimum_required(VERSION 3.16)
+
+include(.cmake.conf)
+project(QtApplicationManager # special case
+    VERSION "${QT_REPO_MODULE_VERSION}"
+    DESCRIPTION "QtAplicationManager Tools and Libraries" # special case
+    HOMEPAGE_URL "https://qt.io/"
+    LANGUAGES CXX C
+)
+
+set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE)
+
+# populate the platform check variables
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals)
+
+if(NOT (ANDROID OR IOS OR LINUX OR MACOS OR (WIN32 AND NOT WINRT)))
+    message(NOTICE "Skipping the build as building is only supported on Windows, macOS, Linux, Android and iOS.")
+    return()
+endif()
+
+# find the all modules (Gui isn't really optional, but we have to deal with a no-gui CI configuration)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Core Concurrent)
+find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS
+    Gui
+    Qml
+    Quick
+    QuickTest
+    DBus
+    WaylandClient
+    WaylandCompositor
+    QuickTest
+    Widgets
+    ZlibPrivate
+    GeniviExtras
+)
+
+if(NOT TARGET Qt::Gui OR NOT TARGET Qt::Quick)
+    message(NOTICE "Skipping the build as QtGui and/or QtQuick are not available.")
+    return()
+endif()
+
+qt_build_repo()
diff --git a/cmake/FindWrapLibArchive.cmake b/cmake/FindWrapLibArchive.cmake
new file mode 100644
index 00000000..67e4ce0b
--- /dev/null
+++ b/cmake/FindWrapLibArchive.cmake
@@ -0,0 +1,18 @@
+# We can't create the same interface imported target multiple times, CMake will complain if we do
+# that. This can happen if the find_package call is done in multiple different subdirectories.
+if(TARGET WrapLibArchive::WrapLibArchive)
+    set(WrapLibArchive_FOUND TRUE)
+    return()
+endif()
+
+find_package(LibArchive)
+
+if (NOT LibArchive_FOUND)
+    set(WrapLibArchive_FOUND FALSE)
+    return()
+endif()
+
+add_library(WrapLibArchive::WrapLibArchive INTERFACE IMPORTED)
+target_link_libraries(WrapLibArchive::WrapLibArchive INTERFACE ${LibArchive_LIBRARIES})
+target_include_directories(WrapLibArchive::WrapLibArchive INTERFACE ${LibArchive_INCLUDE_DIRS})
+set(WrapLibArchive_FOUND TRUE)
diff --git a/cmake/FindWrapLibYaml.cmake b/cmake/FindWrapLibYaml.cmake
new file mode 100644
index 00000000..1dab9126
--- /dev/null
+++ b/cmake/FindWrapLibYaml.cmake
@@ -0,0 +1,19 @@
+# We can't create the same interface imported target multiple times, CMake will complain if we do
+# that. This can happen if the find_package call is done in multiple different subdirectories.
+if(TARGET WrapLibYaml::WrapLibYaml)
+    set(WrapLibYaml_FOUND TRUE)
+    return()
+endif()
+
+find_package(PkgConfig)
+pkg_check_modules(pc_libyaml yaml-0.1 IMPORTED_TARGET)
+
+
+if (NOT pc_libyaml_FOUND)
+    set(WrapLibYaml_FOUND FALSE)
+    return()
+endif()
+
+add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED)
+target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE ${pc_libyaml_LIBRARIES})
+set(WrapLibYaml_FOUND TRUE)
diff --git a/cmake/QtAppManHelpers.cmake b/cmake/QtAppManHelpers.cmake
new file mode 100644
index 00000000..d19120a8
--- /dev/null
+++ b/cmake/QtAppManHelpers.cmake
@@ -0,0 +1,21 @@
+# This function is a hack to make generating DBus adaptors without custom cpp files possible
+function(qtam_internal_add_dbus_adaptor target)
+    if (NOT TARGET "${target}")
+        message(FATAL_ERROR "Trying to extend non-existing target \"${target}\".")
+    endif()
+
+    cmake_parse_arguments(arg "" "" "DBUS_ADAPTOR_SOURCES;DBUS_ADAPTOR_FLAGS" ${ARGN})
+
+    foreach(adaptor ${arg_DBUS_ADAPTOR_SOURCES})
+        qt_internal_extend_target(${target}
+            DBUS_ADAPTOR_SOURCES ${adaptor}
+            DBUS_ADAPTOR_FLAGS ${arg_DBUS_ADAPTOR_FLAGS}
+        )
+
+        # hack to remove the .cpp file, which we implement ourselves
+        get_target_property(srcs ${target} SOURCES)
+        list(REMOVE_AT srcs -1)
+        set_target_properties(${target} PROPERTIES SOURCES "${srcs}")
+
+    endforeach()
+endfunction()
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
new file mode 100644
index 00000000..47a5f070
--- /dev/null
+++ b/coin/module_config.yaml
@@ -0,0 +1,23 @@
+version: 2
+accept_configuration:
+  condition: property
+  property: features
+  not_contains_value: Disable
+
+instructions:
+  Build:
+    - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml"
+
+  Test:
+    - type: Group
+      instructions:
+        - !include "{{qt/qtbase}}/coin_module_test_template_v3.yaml"
+      disable_if:
+        condition: or
+        conditions:
+          - condition: property
+            property: host.os
+            in_values: ["Windows", "MacOS"]
+          - condition: property
+            property: target.os
+            in_values: ["IOS", "Android", "WebAssembly"]
diff --git a/config.tests/libarchive/libarchive.pro b/config.tests/libarchive/libarchive.pro
deleted file mode 100644
index 7f4224e0..00000000
--- a/config.tests/libarchive/libarchive.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TARGET = libarchive
-CONFIG -= qt
-CONFIG += console
-
-SOURCES += main.cpp
-
-PKGCONFIG += "'libarchive >= 3.1.2'"
-CONFIG += link_pkgconfig
diff --git a/config.tests/libarchive/main.cpp b/config.tests/libarchive/main.cpp
deleted file mode 100644
index 2a532461..00000000
--- a/config.tests/libarchive/main.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Copyright (C) 2019 Luxoft Sweden AB
-** Copyright (C) 2018 Pelagicore AG
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtApplicationManager module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <archive.h>
-#include <archive_entry.h>
-
-int main()
-{
-    struct archive *ar = archive_write_new();
-
-    return 0;
-}
diff --git a/config.tests/libyaml/libyaml.pro b/config.tests/libyaml/libyaml.pro
deleted file mode 100644
index eaf0665c..00000000
--- a/config.tests/libyaml/libyaml.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TARGET = libyaml
-CONFIG -= qt
-CONFIG += console
-
-SOURCES += main.cpp
-
-PKGCONFIG += "'yaml-0.1 >= 0.1.6'"
-CONFIG += link_pkgconfig
diff --git a/config.tests/libyaml/main.cpp b/config.tests/libyaml/main.cpp
deleted file mode 100644
index c1f7c70d..00000000
--- a/config.tests/libyaml/main.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Copyright (C) 2019 Luxoft Sweden AB
-** Copyright (C) 2018 Pelagicore AG
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtApplicationManager module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <yaml.h>
-
-int main()
-{
-    yaml_parser_t p;
-    yaml_parser_initialize(&p);
-
-    return 0;
-}
diff --git a/config.tests/touchemulation/main.cpp b/config.tests/touchemulation/main.cpp
deleted file mode 100644
index 41d73613..00000000
--- a/config.tests/touchemulation/main.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Copyright (C) 2019 Luxoft Sweden AB
-** Copyright (C) 2018 Pelagicore AG
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtApplicationManager module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <xcb/xcb.h>
-#include <X11/extensions/XInput2.h>
-#include <X11/extensions/XI2proto.h>
-
-int main()
-{
-    return 0;
-}
diff --git a/config.tests/touchemulation/touchemulation.pro b/config.tests/touchemulation/touchemulation.pro
deleted file mode 100644
index 6a88ef05..00000000
--- a/config.tests/touchemulation/touchemulation.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TARGET = touchemulation
-CONFIG -= qt
-CONFIG += console
-
-SOURCES += main.cpp
-
-PKGCONFIG += xcb x11 xi
-CONFIG += link_pkgconfig
diff --git a/configure.cmake b/configure.cmake
new file mode 100644
index 00000000..53e3f110
--- /dev/null
+++ b/configure.cmake
@@ -0,0 +1,21 @@
+
+
+#### Inputs
+
+
+
+#### Libraries
+
+
+
+#### Tests
+
+
+
+#### Features
+
+
+qt_extra_definition("QT_VERSION_STR" "\"${PROJECT_VERSION}\"" PUBLIC)
+qt_extra_definition("QT_VERSION_MAJOR" ${PROJECT_VERSION_MAJOR} PUBLIC)
+qt_extra_definition("QT_VERSION_MINOR" ${PROJECT_VERSION_MINOR} PUBLIC)
+qt_extra_definition("QT_VERSION_PATCH" ${PROJECT_VERSION_PATCH} PUBLIC)
diff --git a/dependencies.yaml b/dependencies.yaml
index 8b34b97e..6f104f88 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,10 +1,13 @@
 dependencies:
   ../qtbase:
-    ref: befa3729db0d1010694bd1bb4cbadd36ff5c49fb
+    ref: f380c87731472eb59495b7823b7c6243b3aa11f4
     required: true
+    shared: true
   ../qtdeclarative:
-    ref: 7e3f5f2224ba0e57a9dffa6251bb002cde564f56
+    ref: 249db12b6020cc3a8f04841b1e28cd529f4929d9
     required: true
+    shared: true
   ../qtwayland:
-    ref: 3cbd627b9fbbef36394de4cb297e88eb34d436da
+    ref: 0c93bfd8679319cc906544141287c0e973b8555d
     required: false
+    shared: true
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644
index 00000000..21a0ea14
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Generated from doc.pro.
+
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
new file mode 100644
index 00000000..90d9a2a9
--- /dev/null
+++ b/examples/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from examples.pro.
+
+qt_examples_build_begin()
+
+add_subdirectory(applicationmanager)
+
+qt_examples_build_end()
diff --git a/examples/applicationmanager/CMakeLists.txt b/examples/applicationmanager/CMakeLists.txt
new file mode 100644
index 00000000..c19b0f84
--- /dev/null
+++ b/examples/applicationmanager/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+#add_subdirectory(animated-windows)
+#add_subdirectory(frame-timer)
+#add_subdirectory(hello-world)
+#add_subdirectory(launch-intents)
+#add_subdirectory(minidesk)
+#add_subdirectory(application-features)
+#add_subdirectory(multi-views)
+#add_subdirectory(process-status)
+add_subdirectory(startup-plugin)
+#add_subdirectory(intents)
+add_subdirectory(custom-appman)
+if(LINUX)
+    add_subdirectory(softwarecontainer-plugin)
+endif()
diff --git a/examples/applicationmanager/animated-windows/CMakeLists.txt b/examples/applicationmanager/animated-windows/CMakeLists.txt
new file mode 100644
index 00000000..31a2a51e
--- /dev/null
+++ b/examples/applicationmanager/animated-windows/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from animated-windows.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(animated-windows LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/applicationmanager/animated-windows")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+
+set_target_properties(animated-windows PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+target_link_libraries(animated-windows PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS animated-windows
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/applicationmanager/application-features/CMakeLists.txt b/examples/applicationmanager/application-features/CMakeLists.txt
new file mode 100644
index 00000000..4df08997
--- /dev/null
+++ b/examples/applicationmanager/application-features/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from application-features.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(ui LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/applicationmanager/application-features")
+
+)
+set_target_properties(ui PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+
+install(TARGETS ui
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
+add_subdirectory(imports)
+add_subdirectory(native)
diff --git a/examples/applicationmanager/application-features/imports/CMakeLists.txt b/examples/applicationmanager/application-features/imports/CMakeLists.txt
new file mode 100644
index 00000000..cb913a12
--- /dev/null
+++ b/examples/applicationmanager/application-features/imports/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Generated from imports.pro.
+
+add_subdirectory(terminator2)
diff --git a/examples/applicationmanager/application-features/imports/terminator2/CMakeLists.txt b/examples/applicationmanager/application-features/imports/terminator2/CMakeLists.txt
new file mode 100644
index 00000000..945ad301
--- /dev/null
+++ b/examples/applicationmanager/application-features/imports/terminator2/CMakeLists.txt
@@ -0,0 +1,48 @@
+# Generated from terminator2.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(terminator2plugin LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/applicationmanager/application-features/apps/crash/Terminator")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Qml)
+find_package(Qt6 COMPONENTS Quick)
+
+qt6_add_qml_module(terminator2plugin
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CURRENT_BINARY_DIR}/../../apps/crash/Terminator"
+    VERSION 1.0
+    URI "Terminator"
+    INSTALL_LOCATION ${INSTALL_EXAMPLEDIR}
+)
+
+target_sources(terminator2plugin PRIVATE
+    qmlterminator2.cpp qmlterminator2.h
+)
+set_target_properties(terminator2plugin PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+target_link_libraries(terminator2plugin PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Qml
+    Qt::Quick
+)
+
+install(TARGETS terminator2plugin
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/applicationmanager/application-features/native/CMakeLists.txt b/examples/applicationmanager/application-features/native/CMakeLists.txt
new file mode 100644
index 00000000..0d1c9b10
--- /dev/null
+++ b/examples/applicationmanager/application-features/native/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from native.pro.
+
+if(TARGET Qt::WaylandClient AND TARGET Qt::Widgets)
+    add_subdirectory(widgets)
+endif()
diff --git a/examples/applicationmanager/application-features/native/widgets/CMakeLists.txt b/examples/applicationmanager/application-features/native/widgets/CMakeLists.txt
new file mode 100644
index 00000000..11f79f20
--- /dev/null
+++ b/examples/applicationmanager/application-features/native/widgets/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from widgets.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(widgets LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/applicationmanager/application-features/apps/widgets")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+qt_add_executable(widgets
+    main.cpp
+)
+set_target_properties(widgets PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+target_link_libraries(widgets PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+    appman_commonPrivate
+    appman_launcherPrivate
+)
+
+install(TARGETS widgets
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/applicationmanager/applicationmanager.pro b/examples/applicationmanager/applicationmanager.pro
index 462ef585..c3469aac 100644
--- a/examples/applicationmanager/applicationmanager.pro
+++ b/examples/applicationmanager/applicationmanager.pro
@@ -1,3 +1,5 @@
+requires(false)
+
 load(am-config)
 
 requires(!disable-installer)
diff --git a/examples/applicationmanager/custom-appman/CMakeLists.txt b/examples/applicationmanager/custom-appman/CMakeLists.txt
new file mode 100644
index 00000000..69b70411
--- /dev/null
+++ b/examples/applicationmanager/custom-appman/CMakeLists.txt
@@ -0,0 +1,40 @@
+# Generated from custom-appman.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(custom-appman LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/applicationmanager/custom-appman")
+
+find_package(Qt6 COMPONENTS AppManMainPrivate)
+
+
+qt_add_executable(custom-appman
+    custom-appman.cpp
+)
+set_target_properties(custom-appman PROPERTIES
+    WIN32_EXECUTABLE FALSE
+    MACOSX_BUNDLE FALSE
+)
+target_compile_definitions(custom-appman PUBLIC
+    QT_MESSAGELOGCONTEXT
+)
+
+target_link_libraries(custom-appman PUBLIC
+    Qt::AppManMainPrivate
+)
+
+install(TARGETS custom-appman
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/applicationmanager/frame-timer/CMakeLists.txt b/examples/applicationmanager/frame-timer/CMakeLists.txt
new file mode 100644
index 00000000..bb6e0a97
--- /dev/null
+++ b/examples/applicationmanager/frame-timer/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from frame-timer.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(frame-timer LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/applicationmanager/frame-timer")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+)
+set_target_properties(frame-timer PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+target_link_libraries(frame-timer PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS frame-timer
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/applicationmanager/hello-world/CMakeLists.txt b/examples/applicationmanager/hello-world/CMakeLists.txt
new file mode 100644
index 00000000..d58f0387
--- /dev/null
+++ b/examples/applicationmanager/hello-world/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from hello-world.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(hello-world LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/applicationmanager/hello-world")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+)
+set_target_properties(hello-world PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+target_link_libraries(hello-world PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS hello-world
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/applicationmanager/launch-intents/CMakeLists.txt b/examples/applicationmanager/launch-intents/CMakeLists.txt
new file mode 100644
index 00000000..82b069d1
--- /dev/null
+++ b/examples/applicationmanager/launch-intents/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from launch-intents.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(launch-intents LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/applicationmanager/launch-intents")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+)
+set_target_properties(launch-intents PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+target_link_libraries(launch-intents PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS launch-intents
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/applicationmanager/minidesk/CMakeLists.txt b/examples/applicationmanager/minidesk/CMakeLists.txt
new file mode 100644
index 00000000..014486e1
--- /dev/null
+++ b/examples/applicationmanager/minidesk/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from minidesk.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(minidesk LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/applicationmanager/minidesk")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+)
+set_target_properties(minidesk PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+target_link_libraries(minidesk PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS minidesk
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/applicationmanager/multi-views/CMakeLists.txt b/examples/applicationmanager/multi-views/CMakeLists.txt
new file mode 100644
index 00000000..92b681c8
--- /dev/null
+++ b/examples/applicationmanager/multi-views/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from multi-views.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(multi-views LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/applicationmanager/multi-views")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+)
+set_target_properties(multi-views PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+target_link_libraries(multi-views PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS multi-views
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/applicationmanager/process-status/CMakeLists.txt b/examples/applicationmanager/process-status/CMakeLists.txt
new file mode 100644
index 00000000..2cb18fbf
--- /dev/null
+++ b/examples/applicationmanager/process-status/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from process-status.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(process-status LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/applicationmanager/process-status")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+)
+set_target_properties(process-status PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+target_link_libraries(process-status PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS process-status
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/applicationmanager/softwarecontainer-plugin/CMakeLists.txt b/examples/applicationmanager/softwarecontainer-plugin/CMakeLists.txt
new file mode 100644
index 00000000..1e7f7e7c
--- /dev/null
+++ b/examples/applicationmanager/softwarecontainer-plugin/CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from softwarecontainer-plugin.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(softwarecontainer-plugin LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/applicationmanager/softwarecontainer-plugin")
+
+find_package(Qt6 COMPONENTS Core DBus AppManCommonPrivate AppManPluginInterfacesPrivate)
+
+qt_add_plugin(softwarecontainer-plugin)
+target_sources(softwarecontainer-plugin PRIVATE
+    softwarecontainer.cpp softwarecontainer.h
+)
+set_target_properties(softwarecontainer-plugin PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+target_link_libraries(softwarecontainer-plugin PUBLIC
+    Qt::Core
+    Qt::DBus
+    Qt::AppManCommonPrivate
+    Qt::AppManPluginInterfacesPrivate
+)
+
+install(TARGETS softwarecontainer-plugin
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/applicationmanager/startup-plugin/CMakeLists.txt b/examples/applicationmanager/startup-plugin/CMakeLists.txt
new file mode 100644
index 00000000..5cf87297
--- /dev/null
+++ b/examples/applicationmanager/startup-plugin/CMakeLists.txt
@@ -0,0 +1,37 @@
+# Generated from startup-plugin.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(startup-plugin LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/applicationmanager/startup-plugin")
+
+find_package(Qt6 COMPONENTS Core AppManPluginInterfacesPrivate)
+
+qt_add_plugin(startup-plugin)
+target_sources(startup-plugin PRIVATE
+    startup-plugin.cpp startup-plugin.h
+)
+set_target_properties(startup-plugin PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+target_link_libraries(startup-plugin PUBLIC
+    Qt::Core
+    Qt::AppManPluginInterfacesPrivate
+)
+
+install(TARGETS startup-plugin
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/qmake-features/CMakeLists.txt b/qmake-features/CMakeLists.txt
new file mode 100644
index 00000000..c58ce690
--- /dev/null
+++ b/qmake-features/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Generated from qmake-features.pro.
+
diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake
new file mode 100644
index 00000000..81d85ac2
--- /dev/null
+++ b/qt_cmdline.cmake
@@ -0,0 +1,2 @@
+qt_commandline_subconfig(src/common-lib)
+qt_commandline_subconfig(src/package-lib)
diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt
new file mode 100644
index 00000000..c9b444f5
--- /dev/null
+++ b/src/3rdparty/CMakeLists.txt
@@ -0,0 +1,15 @@
+if(NOT QT_FEATURE_system_libarchive)
+    add_subdirectory(libarchive)
+endif()
+
+if(NOT QT_FEATURE_system_libyaml)
+    add_subdirectory(libyaml)
+endif()
+
+if(QT_FEATURE_libbacktrace)
+    add_subdirectory(libbacktrace)
+endif()
+
+if(QT_FEATURE_stackwalker)
+    add_subdirectory(stackwalker)
+endif()
diff --git a/3rdparty/README.md b/src/3rdparty/README.md
index 26baa958..26baa958 100644
--- a/3rdparty/README.md
+++ b/src/3rdparty/README.md
diff --git a/src/3rdparty/libarchive/CMakeLists.txt b/src/3rdparty/libarchive/CMakeLists.txt
new file mode 100644
index 00000000..ed6a19be
--- /dev/null
+++ b/src/3rdparty/libarchive/CMakeLists.txt
@@ -0,0 +1,158 @@
+# Generated from libarchive.pro.
+
+#####################################################################
+## BundledArchive Generic Library:
+#####################################################################
+
+if (APPLE)
+    find_package(Iconv)
+endif()
+
+qt_internal_add_3rdparty_library(BundledLibArchive
+    QMAKE_LIB_NAME archive
+    STATIC
+    INSTALL
+    SOURCES
+        libarchive/archive_acl.c
+        libarchive/archive_check_magic.c
+        libarchive/archive_cmdline.c
+        libarchive/archive_entry.c
+        libarchive/archive_entry_copy_stat.c
+        libarchive/archive_entry_link_resolver.c
+        libarchive/archive_entry_sparse.c
+        libarchive/archive_entry_stat.c
+        libarchive/archive_entry_strmode.c
+        libarchive/archive_entry_xattr.c
+        libarchive/archive_getdate.c
+        libarchive/archive_match.c
+        libarchive/archive_options.c
+        libarchive/archive_pathmatch.c
+        libarchive/archive_ppmd7.c
+        libarchive/archive_random.c
+        libarchive/archive_rb.c
+        libarchive/archive_read.c
+        libarchive/archive_read_append_filter.c
+        libarchive/archive_read_data_into_fd.c
+        libarchive/archive_read_disk_entry_from_file.c
+        libarchive/archive_read_disk_set_standard_lookup.c
+        libarchive/archive_read_extract.c
+        libarchive/archive_read_open_fd.c
+        libarchive/archive_read_open_file.c
+        libarchive/archive_read_open_filename.c
+        libarchive/archive_read_open_memory.c
+        libarchive/archive_read_set_format.c
+        libarchive/archive_read_set_options.c
+        libarchive/archive_read_support_filter_bzip2.c
+        libarchive/archive_read_support_filter_gzip.c
+        libarchive/archive_read_support_filter_none.c
+        libarchive/archive_read_support_filter_program.c
+        libarchive/archive_read_support_filter_xz.c
+        libarchive/archive_read_support_format_by_code.c
+        libarchive/archive_read_support_format_empty.c
+        libarchive/archive_read_support_format_tar.c
+        libarchive/archive_string.c
+        libarchive/archive_string_sprintf.c
+        libarchive/archive_util.c
+        libarchive/archive_virtual.c
+        libarchive/archive_write.c
+        libarchive/archive_write_add_filter.c
+        libarchive/archive_write_add_filter_b64encode.c
+        libarchive/archive_write_add_filter_by_name.c
+        libarchive/archive_write_add_filter_bzip2.c
+        libarchive/archive_write_add_filter_gzip.c
+        libarchive/archive_write_add_filter_none.c
+        libarchive/archive_write_add_filter_program.c
+        libarchive/archive_write_add_filter_xz.c
+        libarchive/archive_write_disk_set_standard_lookup.c
+        libarchive/archive_write_open_fd.c
+        libarchive/archive_write_open_file.c
+        libarchive/archive_write_open_filename.c
+        libarchive/archive_write_open_memory.c
+        libarchive/archive_write_set_format.c
+        libarchive/archive_write_set_format_by_name.c
+        libarchive/archive_write_set_format_gnutar.c
+        libarchive/archive_write_set_format_ustar.c
+        libarchive/archive_write_set_options.c
+    INCLUDE_DIRECTORIES
+        libarchive
+        .
+    PUBLIC_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive>
+)
+qt_disable_warnings(BundledLibArchive)
+qt_set_symbol_visibility_hidden(BundledLibArchive)
+
+qt_internal_extend_target(BundledLibArchive CONDITION MACOS
+    DEFINES
+        PLATFORM_CONFIG_H=\\\"config-macos.h\\\"
+    PUBLIC_LIBRARIES
+        ${FWCoreServices}
+        Iconv::Iconv
+)
+
+qt_internal_extend_target(BundledLibArchive CONDITION IOS
+    PUBLIC_LIBRARIES
+        Iconv::Iconv
+)
+
+qt_internal_extend_target(BundledLibArchive CONDITION WIN32
+    SOURCES
+        libarchive/archive_entry_copy_bhfi.c
+        libarchive/archive_read_disk_windows.c
+        libarchive/archive_windows.c
+        libarchive/archive_write_disk_windows.c
+        libarchive/filter_fork_windows.c
+    DEFINES
+        PLATFORM_CONFIG_H=\\\"config-windows.h\\\"
+    PUBLIC_DEFINES
+        LIBARCHIVE_STATIC
+    PUBLIC_LIBRARIES
+        advapi32
+        crypt32
+)
+
+#### Keys ignored in scope 6:.:.:libarchive.pro:win32-msvc_x_:
+# QMAKE_CFLAGS = "/wd4146" "/wd4133" "/D_CRT_SECURE_NO_WARNINGS"
+
+#### Keys ignored in scope 7:.:.:libarchive.pro:GCC:
+# QMAKE_CFLAGS = "-Wno-unused" "-Wno-sign-compare" "-Wno-old-style-declaration"
+
+#### Keys ignored in scope 8:.:.:libarchive.pro:CLANG:
+# QMAKE_CFLAGS = "-Wall" "-W" "-Wno-unused" "-Wno-sign-compare"
+
+qt_internal_extend_target(BundledLibArchive CONDITION ANDROID
+    DEFINES
+        PLATFORM_CONFIG_H=\\\"config-android.h\\\"
+)
+
+qt_internal_extend_target(BundledLibArchive CONDITION IOS AND NOT MACOS
+    DEFINES
+        PLATFORM_CONFIG_H=\\\"config-ios.h\\\"
+)
+
+qt_internal_extend_target(BundledLibArchive CONDITION UNIX AND NOT ANDROID AND NOT IOS AND NOT MACOS
+    DEFINES
+        PLATFORM_CONFIG_H=\\\"config-unix.h\\\"
+)
+
+qt_internal_extend_target(BundledLibArchive CONDITION UNIX
+    SOURCES
+        libarchive/archive_read_disk_posix.c
+        libarchive/archive_write_disk_posix.c
+        libarchive/filter_fork_posix.c
+)
+
+if (QT_FEATURE_system_zlib)
+    find_package(ZLIB)
+
+    qt_internal_extend_target(BundledLibArchive
+        LIBRARIES
+            ZLIB::ZLIB
+    )
+else()
+    qt_internal_extend_target(BundledLibArchive
+        LIBRARIES
+            Qt::Core
+            Qt::ZlibPrivate
+    )
+endif()
diff --git a/3rdparty/libarchive/COPYING b/src/3rdparty/libarchive/COPYING
index 93952b77..93952b77 100644
--- a/3rdparty/libarchive/COPYING
+++ b/src/3rdparty/libarchive/COPYING
diff --git a/3rdparty/libarchive/INSTALL b/src/3rdparty/libarchive/INSTALL
index 2fafbd50..2fafbd50 100644
--- a/3rdparty/libarchive/INSTALL
+++ b/src/3rdparty/libarchive/INSTALL
diff --git a/3rdparty/libarchive/NEWS b/src/3rdparty/libarchive/NEWS
index 9527e662..9527e662 100644
--- a/3rdparty/libarchive/NEWS
+++ b/src/3rdparty/libarchive/NEWS
diff --git a/3rdparty/libarchive/README.md b/src/3rdparty/libarchive/README.md
index be6c13b3..be6c13b3 100644
--- a/3rdparty/libarchive/README.md
+++ b/src/3rdparty/libarchive/README.md
diff --git a/3rdparty/libarchive/config-android.h b/src/3rdparty/libarchive/config-android.h
index 037f1b60..037f1b60 100644
--- a/3rdparty/libarchive/config-android.h
+++ b/src/3rdparty/libarchive/config-android.h
diff --git a/3rdparty/libarchive/config-ios.h b/src/3rdparty/libarchive/config-ios.h
index 2664e699..2664e699 100644
--- a/3rdparty/libarchive/config-ios.h
+++ b/src/3rdparty/libarchive/config-ios.h
diff --git a/3rdparty/libarchive/config-macos.h b/src/3rdparty/libarchive/config-macos.h
index 85294b2e..85294b2e 100644
--- a/3rdparty/libarchive/config-macos.h
+++ b/src/3rdparty/libarchive/config-macos.h
diff --git a/3rdparty/libarchive/config-unix.h b/src/3rdparty/libarchive/config-unix.h
index b82ec002..b82ec002 100644
--- a/3rdparty/libarchive/config-unix.h
+++ b/src/3rdparty/libarchive/config-unix.h
diff --git a/3rdparty/libarchive/config-windows.h b/src/3rdparty/libarchive/config-windows.h
index 6019e58c..6019e58c 100644
--- a/3rdparty/libarchive/config-windows.h
+++ b/src/3rdparty/libarchive/config-windows.h
diff --git a/3rdparty/libarchive/libarchive.pro b/src/3rdparty/libarchive/libarchive.pro
index 4ec7eaaa..4ec7eaaa 100644
--- a/3rdparty/libarchive/libarchive.pro
+++ b/src/3rdparty/libarchive/libarchive.pro
diff --git a/3rdparty/libarchive/libarchive/android_lf.h b/src/3rdparty/libarchive/libarchive/android_lf.h
index 2a18f514..2a18f514 100644
--- a/3rdparty/libarchive/libarchive/android_lf.h
+++ b/src/3rdparty/libarchive/libarchive/android_lf.h
diff --git a/3rdparty/libarchive/libarchive/archive.h b/src/3rdparty/libarchive/libarchive/archive.h
index 316a68a6..316a68a6 100644
--- a/3rdparty/libarchive/libarchive/archive.h
+++ b/src/3rdparty/libarchive/libarchive/archive.h
diff --git a/3rdparty/libarchive/libarchive/archive_acl.c b/src/3rdparty/libarchive/libarchive/archive_acl.c
index b8b6b636..b8b6b636 100644
--- a/3rdparty/libarchive/libarchive/archive_acl.c
+++ b/src/3rdparty/libarchive/libarchive/archive_acl.c
diff --git a/3rdparty/libarchive/libarchive/archive_acl_private.h b/src/3rdparty/libarchive/libarchive/archive_acl_private.h
index ef0b0234..ef0b0234 100644
--- a/3rdparty/libarchive/libarchive/archive_acl_private.h
+++ b/src/3rdparty/libarchive/libarchive/archive_acl_private.h
diff --git a/3rdparty/libarchive/libarchive/archive_check_magic.c b/src/3rdparty/libarchive/libarchive/archive_check_magic.c
index 288ce233..288ce233 100644
--- a/3rdparty/libarchive/libarchive/archive_check_magic.c
+++ b/src/3rdparty/libarchive/libarchive/archive_check_magic.c
diff --git a/3rdparty/libarchive/libarchive/archive_cmdline.c b/src/3rdparty/libarchive/libarchive/archive_cmdline.c
index 7d3bac53..7d3bac53 100644
--- a/3rdparty/libarchive/libarchive/archive_cmdline.c
+++ b/src/3rdparty/libarchive/libarchive/archive_cmdline.c
diff --git a/3rdparty/libarchive/libarchive/archive_cmdline_private.h b/src/3rdparty/libarchive/libarchive/archive_cmdline_private.h
index 4e409e81..4e409e81 100644
--- a/3rdparty/libarchive/libarchive/archive_cmdline_private.h
+++ b/src/3rdparty/libarchive/libarchive/archive_cmdline_private.h
diff --git a/3rdparty/libarchive/libarchive/archive_crc32.h b/src/3rdparty/libarchive/libarchive/archive_crc32.h
index cd633af8..cd633af8 100644
--- a/3rdparty/libarchive/libarchive/archive_crc32.h
+++ b/src/3rdparty/libarchive/libarchive/archive_crc32.h
diff --git a/3rdparty/libarchive/libarchive/archive_endian.h b/src/3rdparty/libarchive/libarchive/archive_endian.h
index 1c48563b..1c48563b 100644
--- a/3rdparty/libarchive/libarchive/archive_endian.h
+++ b/src/3rdparty/libarchive/libarchive/archive_endian.h
diff --git a/3rdparty/libarchive/libarchive/archive_entry.c b/src/3rdparty/libarchive/libarchive/archive_entry.c
index 30fb4566..30fb4566 100644
--- a/3rdparty/libarchive/libarchive/archive_entry.c
+++ b/src/3rdparty/libarchive/libarchive/archive_entry.c
diff --git a/3rdparty/libarchive/libarchive/archive_entry.h b/src/3rdparty/libarchive/libarchive/archive_entry.h
index bcc2962b..bcc2962b 100644
--- a/3rdparty/libarchive/libarchive/archive_entry.h
+++ b/src/3rdparty/libarchive/libarchive/archive_entry.h
diff --git a/3rdparty/libarchive/libarchive/archive_entry_copy_bhfi.c b/src/3rdparty/libarchive/libarchive/archive_entry_copy_bhfi.c
index 77bf38e4..77bf38e4 100644
--- a/3rdparty/libarchive/libarchive/archive_entry_copy_bhfi.c
+++ b/src/3rdparty/libarchive/libarchive/archive_entry_copy_bhfi.c
diff --git a/3rdparty/libarchive/libarchive/archive_entry_copy_stat.c b/src/3rdparty/libarchive/libarchive/archive_entry_copy_stat.c
index ac83868e..ac83868e 100644
--- a/3rdparty/libarchive/libarchive/archive_entry_copy_stat.c
+++ b/src/3rdparty/libarchive/libarchive/archive_entry_copy_stat.c
diff --git a/3rdparty/libarchive/libarchive/archive_entry_link_resolver.c b/src/3rdparty/libarchive/libarchive/archive_entry_link_resolver.c
index c7d59497..c7d59497 100644
--- a/3rdparty/libarchive/libarchive/archive_entry_link_resolver.c
+++ b/src/3rdparty/libarchive/libarchive/archive_entry_link_resolver.c
diff --git a/3rdparty/libarchive/libarchive/archive_entry_locale.h b/src/3rdparty/libarchive/libarchive/archive_entry_locale.h
index 44550c51..44550c51 100644
--- a/3rdparty/libarchive/libarchive/archive_entry_locale.h
+++ b/src/3rdparty/libarchive/libarchive/archive_entry_locale.h
diff --git a/3rdparty/libarchive/libarchive/archive_entry_private.h b/src/3rdparty/libarchive/libarchive/archive_entry_private.h
index c69233e6..c69233e6 100644
--- a/3rdparty/libarchive/libarchive/archive_entry_private.h
+++ b/src/3rdparty/libarchive/libarchive/archive_entry_private.h
diff --git a/3rdparty/libarchive/libarchive/archive_entry_sparse.c b/src/3rdparty/libarchive/libarchive/archive_entry_sparse.c
index 74917b37..74917b37 100644
--- a/3rdparty/libarchive/libarchive/archive_entry_sparse.c
+++ b/src/3rdparty/libarchive/libarchive/archive_entry_sparse.c
diff --git a/3rdparty/libarchive/libarchive/archive_entry_stat.c b/src/3rdparty/libarchive/libarchive/archive_entry_stat.c
index 71a407b1..71a407b1 100644
--- a/3rdparty/libarchive/libarchive/archive_entry_stat.c
+++ b/src/3rdparty/libarchive/libarchive/archive_entry_stat.c
diff --git a/3rdparty/libarchive/libarchive/archive_entry_strmode.c b/src/3rdparty/libarchive/libarchive/archive_entry_strmode.c
index af2517a3..af2517a3 100644
--- a/3rdparty/libarchive/libarchive/archive_entry_strmode.c
+++ b/src/3rdparty/libarchive/libarchive/archive_entry_strmode.c
diff --git a/3rdparty/libarchive/libarchive/archive_entry_xattr.c b/src/3rdparty/libarchive/libarchive/archive_entry_xattr.c
index 5fe726b9..5fe726b9 100644
--- a/3rdparty/libarchive/libarchive/archive_entry_xattr.c
+++ b/src/3rdparty/libarchive/libarchive/archive_entry_xattr.c
diff --git a/3rdparty/libarchive/libarchive/archive_getdate.c b/src/3rdparty/libarchive/libarchive/archive_getdate.c
index 030c083c..030c083c 100644
--- a/3rdparty/libarchive/libarchive/archive_getdate.c
+++ b/src/3rdparty/libarchive/libarchive/archive_getdate.c
diff --git a/3rdparty/libarchive/libarchive/archive_getdate.h b/src/3rdparty/libarchive/libarchive/archive_getdate.h
index 666ff5ff..666ff5ff 100644
--- a/3rdparty/libarchive/libarchive/archive_getdate.h
+++ b/src/3rdparty/libarchive/libarchive/archive_getdate.h
diff --git a/3rdparty/libarchive/libarchive/archive_match.c b/src/3rdparty/libarchive/libarchive/archive_match.c
index be72066e..be72066e 100644
--- a/3rdparty/libarchive/libarchive/archive_match.c
+++ b/src/3rdparty/libarchive/libarchive/archive_match.c
diff --git a/3rdparty/libarchive/libarchive/archive_options.c b/src/3rdparty/libarchive/libarchive/archive_options.c
index 6496025a..6496025a 100644
--- a/3rdparty/libarchive/libarchive/archive_options.c
+++ b/src/3rdparty/libarchive/libarchive/archive_options.c
diff --git a/3rdparty/libarchive/libarchive/archive_options_private.h b/src/3rdparty/libarchive/libarchive/archive_options_private.h
index 6ef0165a..6ef0165a 100644
--- a/3rdparty/libarchive/libarchive/archive_options_private.h
+++ b/src/3rdparty/libarchive/libarchive/archive_options_private.h
diff --git a/3rdparty/libarchive/libarchive/archive_pack_dev.h b/src/3rdparty/libarchive/libarchive/archive_pack_dev.h
index 749fd3d2..749fd3d2 100644
--- a/3rdparty/libarchive/libarchive/archive_pack_dev.h
+++ b/src/3rdparty/libarchive/libarchive/archive_pack_dev.h
diff --git a/3rdparty/libarchive/libarchive/archive_pathmatch.c b/src/3rdparty/libarchive/libarchive/archive_pathmatch.c
index 619e2b62..619e2b62 100644
--- a/3rdparty/libarchive/libarchive/archive_pathmatch.c
+++ b/src/3rdparty/libarchive/libarchive/archive_pathmatch.c
diff --git a/3rdparty/libarchive/libarchive/archive_pathmatch.h b/src/3rdparty/libarchive/libarchive/archive_pathmatch.h
index e6901774..e6901774 100644
--- a/3rdparty/libarchive/libarchive/archive_pathmatch.h
+++ b/src/3rdparty/libarchive/libarchive/archive_pathmatch.h
diff --git a/3rdparty/libarchive/libarchive/archive_platform.h b/src/3rdparty/libarchive/libarchive/archive_platform.h
index 34be8eda..34be8eda 100644
--- a/3rdparty/libarchive/libarchive/archive_platform.h
+++ b/src/3rdparty/libarchive/libarchive/archive_platform.h
diff --git a/3rdparty/libarchive/libarchive/archive_platform_acl.h b/src/3rdparty/libarchive/libarchive/archive_platform_acl.h
index 3498f78b..3498f78b 100644
--- a/3rdparty/libarchive/libarchive/archive_platform_acl.h
+++ b/src/3rdparty/libarchive/libarchive/archive_platform_acl.h
diff --git a/3rdparty/libarchive/libarchive/archive_ppmd7.c b/src/3rdparty/libarchive/libarchive/archive_ppmd7.c
index 1aed922d..1aed922d 100644
--- a/3rdparty/libarchive/libarchive/archive_ppmd7.c
+++ b/src/3rdparty/libarchive/libarchive/archive_ppmd7.c
diff --git a/3rdparty/libarchive/libarchive/archive_ppmd7_private.h b/src/3rdparty/libarchive/libarchive/archive_ppmd7_private.h
index 06c99e82..06c99e82 100644
--- a/3rdparty/libarchive/libarchive/archive_ppmd7_private.h
+++ b/src/3rdparty/libarchive/libarchive/archive_ppmd7_private.h
diff --git a/3rdparty/libarchive/libarchive/archive_ppmd_private.h b/src/3rdparty/libarchive/libarchive/archive_ppmd_private.h
index e78bde59..e78bde59 100644
--- a/3rdparty/libarchive/libarchive/archive_ppmd_private.h
+++ b/src/3rdparty/libarchive/libarchive/archive_ppmd_private.h
diff --git a/3rdparty/libarchive/libarchive/archive_private.h b/src/3rdparty/libarchive/libarchive/archive_private.h
index 4b4be979..4b4be979 100644
--- a/3rdparty/libarchive/libarchive/archive_private.h
+++ b/src/3rdparty/libarchive/libarchive/archive_private.h
diff --git a/3rdparty/libarchive/libarchive/archive_random.c b/src/3rdparty/libarchive/libarchive/archive_random.c
index 65ea6915..65ea6915 100644
--- a/3rdparty/libarchive/libarchive/archive_random.c
+++ b/src/3rdparty/libarchive/libarchive/archive_random.c
diff --git a/3rdparty/libarchive/libarchive/archive_random_private.h b/src/3rdparty/libarchive/libarchive/archive_random_private.h
index c414779f..c414779f 100644
--- a/3rdparty/libarchive/libarchive/archive_random_private.h
+++ b/src/3rdparty/libarchive/libarchive/archive_random_private.h
diff --git a/3rdparty/libarchive/libarchive/archive_rb.c b/src/3rdparty/libarchive/libarchive/archive_rb.c
index cf58ac33..cf58ac33 100644
--- a/3rdparty/libarchive/libarchive/archive_rb.c
+++ b/src/3rdparty/libarchive/libarchive/archive_rb.c
diff --git a/3rdparty/libarchive/libarchive/archive_rb.h b/src/3rdparty/libarchive/libarchive/archive_rb.h
index 4562e9eb..4562e9eb 100644
--- a/3rdparty/libarchive/libarchive/archive_rb.h
+++ b/src/3rdparty/libarchive/libarchive/archive_rb.h
diff --git a/3rdparty/libarchive/libarchive/archive_read.c b/src/3rdparty/libarchive/libarchive/archive_read.c
index a642a336..a642a336 100644
--- a/3rdparty/libarchive/libarchive/archive_read.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_append_filter.c b/src/3rdparty/libarchive/libarchive/archive_read_append_filter.c
index 5e4d1630..5e4d1630 100644
--- a/3rdparty/libarchive/libarchive/archive_read_append_filter.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_append_filter.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_data_into_fd.c b/src/3rdparty/libarchive/libarchive/archive_read_data_into_fd.c
index b4398f1e..b4398f1e 100644
--- a/3rdparty/libarchive/libarchive/archive_read_data_into_fd.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_data_into_fd.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_disk_entry_from_file.c b/src/3rdparty/libarchive/libarchive/archive_read_disk_entry_from_file.c
index 548ba89e..548ba89e 100644
--- a/3rdparty/libarchive/libarchive/archive_read_disk_entry_from_file.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_disk_entry_from_file.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_disk_posix.c b/src/3rdparty/libarchive/libarchive/archive_read_disk_posix.c
index 6961ae6a..6961ae6a 100644
--- a/3rdparty/libarchive/libarchive/archive_read_disk_posix.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_disk_posix.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_disk_private.h b/src/3rdparty/libarchive/libarchive/archive_read_disk_private.h
index f03a0a9c..f03a0a9c 100644
--- a/3rdparty/libarchive/libarchive/archive_read_disk_private.h
+++ b/src/3rdparty/libarchive/libarchive/archive_read_disk_private.h
diff --git a/3rdparty/libarchive/libarchive/archive_read_disk_set_standard_lookup.c b/src/3rdparty/libarchive/libarchive/archive_read_disk_set_standard_lookup.c
index c7fd2471..c7fd2471 100644
--- a/3rdparty/libarchive/libarchive/archive_read_disk_set_standard_lookup.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_disk_set_standard_lookup.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_disk_windows.c b/src/3rdparty/libarchive/libarchive/archive_read_disk_windows.c
index 3b903304..3b903304 100644
--- a/3rdparty/libarchive/libarchive/archive_read_disk_windows.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_disk_windows.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_extract.c b/src/3rdparty/libarchive/libarchive/archive_read_extract.c
index b7973fa8..b7973fa8 100644
--- a/3rdparty/libarchive/libarchive/archive_read_extract.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_extract.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_open_fd.c b/src/3rdparty/libarchive/libarchive/archive_read_open_fd.c
index f59cd07f..f59cd07f 100644
--- a/3rdparty/libarchive/libarchive/archive_read_open_fd.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_open_fd.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_open_file.c b/src/3rdparty/libarchive/libarchive/archive_read_open_file.c
index bfe933bf..bfe933bf 100644
--- a/3rdparty/libarchive/libarchive/archive_read_open_file.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_open_file.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_open_filename.c b/src/3rdparty/libarchive/libarchive/archive_read_open_filename.c
index 86635e21..86635e21 100644
--- a/3rdparty/libarchive/libarchive/archive_read_open_filename.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_open_filename.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_open_memory.c b/src/3rdparty/libarchive/libarchive/archive_read_open_memory.c
index 311be470..311be470 100644
--- a/3rdparty/libarchive/libarchive/archive_read_open_memory.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_open_memory.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_private.h b/src/3rdparty/libarchive/libarchive/archive_read_private.h
index 78546dca..78546dca 100644
--- a/3rdparty/libarchive/libarchive/archive_read_private.h
+++ b/src/3rdparty/libarchive/libarchive/archive_read_private.h
diff --git a/3rdparty/libarchive/libarchive/archive_read_set_format.c b/src/3rdparty/libarchive/libarchive/archive_read_set_format.c
index 190f4369..190f4369 100644
--- a/3rdparty/libarchive/libarchive/archive_read_set_format.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_set_format.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_set_options.c b/src/3rdparty/libarchive/libarchive/archive_read_set_options.c
index 2e2eea69..2e2eea69 100644
--- a/3rdparty/libarchive/libarchive/archive_read_set_options.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_set_options.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_support_filter_bzip2.c b/src/3rdparty/libarchive/libarchive/archive_read_support_filter_bzip2.c
index 3885a7cf..3885a7cf 100644
--- a/3rdparty/libarchive/libarchive/archive_read_support_filter_bzip2.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_support_filter_bzip2.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_support_filter_gzip.c b/src/3rdparty/libarchive/libarchive/archive_read_support_filter_gzip.c
index fa8c675d..fa8c675d 100644
--- a/3rdparty/libarchive/libarchive/archive_read_support_filter_gzip.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_support_filter_gzip.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_support_filter_none.c b/src/3rdparty/libarchive/libarchive/archive_read_support_filter_none.c
index 95e5cfdb..95e5cfdb 100644
--- a/3rdparty/libarchive/libarchive/archive_read_support_filter_none.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_support_filter_none.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_support_filter_program.c b/src/3rdparty/libarchive/libarchive/archive_read_support_filter_program.c
index b8bf1288..b8bf1288 100644
--- a/3rdparty/libarchive/libarchive/archive_read_support_filter_program.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_support_filter_program.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_support_filter_xz.c b/src/3rdparty/libarchive/libarchive/archive_read_support_filter_xz.c
index 11807cf6..11807cf6 100644
--- a/3rdparty/libarchive/libarchive/archive_read_support_filter_xz.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_support_filter_xz.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_support_format_by_code.c b/src/3rdparty/libarchive/libarchive/archive_read_support_format_by_code.c
index 084563f4..084563f4 100644
--- a/3rdparty/libarchive/libarchive/archive_read_support_format_by_code.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_support_format_by_code.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_support_format_empty.c b/src/3rdparty/libarchive/libarchive/archive_read_support_format_empty.c
index c641eb9b..c641eb9b 100644
--- a/3rdparty/libarchive/libarchive/archive_read_support_format_empty.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_support_format_empty.c
diff --git a/3rdparty/libarchive/libarchive/archive_read_support_format_tar.c b/src/3rdparty/libarchive/libarchive/archive_read_support_format_tar.c
index 30d5bc83..30d5bc83 100644
--- a/3rdparty/libarchive/libarchive/archive_read_support_format_tar.c
+++ b/src/3rdparty/libarchive/libarchive/archive_read_support_format_tar.c
diff --git a/3rdparty/libarchive/libarchive/archive_string.c b/src/3rdparty/libarchive/libarchive/archive_string.c
index 5ae09b62..5ae09b62 100644
--- a/3rdparty/libarchive/libarchive/archive_string.c
+++ b/src/3rdparty/libarchive/libarchive/archive_string.c
diff --git a/3rdparty/libarchive/libarchive/archive_string.h b/src/3rdparty/libarchive/libarchive/archive_string.h
index 56dfbb28..56dfbb28 100644
--- a/3rdparty/libarchive/libarchive/archive_string.h
+++ b/src/3rdparty/libarchive/libarchive/archive_string.h
diff --git a/3rdparty/libarchive/libarchive/archive_string_composition.h b/src/3rdparty/libarchive/libarchive/archive_string_composition.h
index 8902ac1f..8902ac1f 100644
--- a/3rdparty/libarchive/libarchive/archive_string_composition.h
+++ b/src/3rdparty/libarchive/libarchive/archive_string_composition.h
diff --git a/3rdparty/libarchive/libarchive/archive_string_sprintf.c b/src/3rdparty/libarchive/libarchive/archive_string_sprintf.c
index 969a5603..969a5603 100644
--- a/3rdparty/libarchive/libarchive/archive_string_sprintf.c
+++ b/src/3rdparty/libarchive/libarchive/archive_string_sprintf.c
diff --git a/3rdparty/libarchive/libarchive/archive_util.c b/src/3rdparty/libarchive/libarchive/archive_util.c
index bac9ba1c..bac9ba1c 100644
--- a/3rdparty/libarchive/libarchive/archive_util.c
+++ b/src/3rdparty/libarchive/libarchive/archive_util.c
diff --git a/3rdparty/libarchive/libarchive/archive_virtual.c b/src/3rdparty/libarchive/libarchive/archive_virtual.c
index de2595a9..de2595a9 100644
--- a/3rdparty/libarchive/libarchive/archive_virtual.c
+++ b/src/3rdparty/libarchive/libarchive/archive_virtual.c
diff --git a/3rdparty/libarchive/libarchive/archive_windows.c b/src/3rdparty/libarchive/libarchive/archive_windows.c
index 6ff8749a..6ff8749a 100644
--- a/3rdparty/libarchive/libarchive/archive_windows.c
+++ b/src/3rdparty/libarchive/libarchive/archive_windows.c
diff --git a/3rdparty/libarchive/libarchive/archive_windows.h b/src/3rdparty/libarchive/libarchive/archive_windows.h
index e77cd08f..e77cd08f 100644
--- a/3rdparty/libarchive/libarchive/archive_windows.h
+++ b/src/3rdparty/libarchive/libarchive/archive_windows.h
diff --git a/3rdparty/libarchive/libarchive/archive_write.c b/src/3rdparty/libarchive/libarchive/archive_write.c
index 0634a229..0634a229 100644
--- a/3rdparty/libarchive/libarchive/archive_write.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_add_filter.c b/src/3rdparty/libarchive/libarchive/archive_write_add_filter.c
index 08f518ad..08f518ad 100644
--- a/3rdparty/libarchive/libarchive/archive_write_add_filter.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_add_filter.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_add_filter_b64encode.c b/src/3rdparty/libarchive/libarchive/archive_write_add_filter_b64encode.c
index 85eb087b..85eb087b 100644
--- a/3rdparty/libarchive/libarchive/archive_write_add_filter_b64encode.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_add_filter_b64encode.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_add_filter_by_name.c b/src/3rdparty/libarchive/libarchive/archive_write_add_filter_by_name.c
index 85a8d475..85a8d475 100644
--- a/3rdparty/libarchive/libarchive/archive_write_add_filter_by_name.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_add_filter_by_name.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_add_filter_bzip2.c b/src/3rdparty/libarchive/libarchive/archive_write_add_filter_bzip2.c
index 68ed9579..68ed9579 100644
--- a/3rdparty/libarchive/libarchive/archive_write_add_filter_bzip2.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_add_filter_bzip2.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_add_filter_gzip.c b/src/3rdparty/libarchive/libarchive/archive_write_add_filter_gzip.c
index 04eb06c1..04eb06c1 100644
--- a/3rdparty/libarchive/libarchive/archive_write_add_filter_gzip.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_add_filter_gzip.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_add_filter_none.c b/src/3rdparty/libarchive/libarchive/archive_write_add_filter_none.c
index 3c06c642..3c06c642 100644
--- a/3rdparty/libarchive/libarchive/archive_write_add_filter_none.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_add_filter_none.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_add_filter_program.c b/src/3rdparty/libarchive/libarchive/archive_write_add_filter_program.c
index 660f693f..660f693f 100644
--- a/3rdparty/libarchive/libarchive/archive_write_add_filter_program.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_add_filter_program.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_add_filter_xz.c b/src/3rdparty/libarchive/libarchive/archive_write_add_filter_xz.c
index b0f25a6e..b0f25a6e 100644
--- a/3rdparty/libarchive/libarchive/archive_write_add_filter_xz.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_add_filter_xz.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_disk_posix.c b/src/3rdparty/libarchive/libarchive/archive_write_disk_posix.c
index 6ad53992..6ad53992 100644
--- a/3rdparty/libarchive/libarchive/archive_write_disk_posix.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_disk_posix.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_disk_private.h b/src/3rdparty/libarchive/libarchive/archive_write_disk_private.h
index b655dea2..b655dea2 100644
--- a/3rdparty/libarchive/libarchive/archive_write_disk_private.h
+++ b/src/3rdparty/libarchive/libarchive/archive_write_disk_private.h
diff --git a/3rdparty/libarchive/libarchive/archive_write_disk_set_standard_lookup.c b/src/3rdparty/libarchive/libarchive/archive_write_disk_set_standard_lookup.c
index 5c766d75..5c766d75 100644
--- a/3rdparty/libarchive/libarchive/archive_write_disk_set_standard_lookup.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_disk_set_standard_lookup.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_disk_windows.c b/src/3rdparty/libarchive/libarchive/archive_write_disk_windows.c
index 94b016ed..94b016ed 100644
--- a/3rdparty/libarchive/libarchive/archive_write_disk_windows.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_disk_windows.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_open_fd.c b/src/3rdparty/libarchive/libarchive/archive_write_open_fd.c
index d5c426cf..d5c426cf 100644
--- a/3rdparty/libarchive/libarchive/archive_write_open_fd.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_open_fd.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_open_file.c b/src/3rdparty/libarchive/libarchive/archive_write_open_file.c
index f6b14123..f6b14123 100644
--- a/3rdparty/libarchive/libarchive/archive_write_open_file.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_open_file.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_open_filename.c b/src/3rdparty/libarchive/libarchive/archive_write_open_filename.c
index 66e0dfee..66e0dfee 100644
--- a/3rdparty/libarchive/libarchive/archive_write_open_filename.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_open_filename.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_open_memory.c b/src/3rdparty/libarchive/libarchive/archive_write_open_memory.c
index ea6ae0ac..ea6ae0ac 100644
--- a/3rdparty/libarchive/libarchive/archive_write_open_memory.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_open_memory.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_private.h b/src/3rdparty/libarchive/libarchive/archive_write_private.h
index 0dfd1b1b..0dfd1b1b 100644
--- a/3rdparty/libarchive/libarchive/archive_write_private.h
+++ b/src/3rdparty/libarchive/libarchive/archive_write_private.h
diff --git a/3rdparty/libarchive/libarchive/archive_write_set_format.c b/src/3rdparty/libarchive/libarchive/archive_write_set_format.c
index 0f706231..0f706231 100644
--- a/3rdparty/libarchive/libarchive/archive_write_set_format.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_set_format.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_set_format_by_name.c b/src/3rdparty/libarchive/libarchive/archive_write_set_format_by_name.c
index 86e8621e..86e8621e 100644
--- a/3rdparty/libarchive/libarchive/archive_write_set_format_by_name.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_set_format_by_name.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_set_format_gnutar.c b/src/3rdparty/libarchive/libarchive/archive_write_set_format_gnutar.c
index 2d858c9f..2d858c9f 100644
--- a/3rdparty/libarchive/libarchive/archive_write_set_format_gnutar.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_set_format_gnutar.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_set_format_ustar.c b/src/3rdparty/libarchive/libarchive/archive_write_set_format_ustar.c
index c54aeabd..c54aeabd 100644
--- a/3rdparty/libarchive/libarchive/archive_write_set_format_ustar.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_set_format_ustar.c
diff --git a/3rdparty/libarchive/libarchive/archive_write_set_options.c b/src/3rdparty/libarchive/libarchive/archive_write_set_options.c
index 962309ad..962309ad 100644
--- a/3rdparty/libarchive/libarchive/archive_write_set_options.c
+++ b/src/3rdparty/libarchive/libarchive/archive_write_set_options.c
diff --git a/3rdparty/libarchive/libarchive/config_freebsd.h b/src/3rdparty/libarchive/libarchive/config_freebsd.h
index be25258f..be25258f 100644
--- a/3rdparty/libarchive/libarchive/config_freebsd.h
+++ b/src/3rdparty/libarchive/libarchive/config_freebsd.h
diff --git a/3rdparty/libarchive/libarchive/filter_fork.h b/src/3rdparty/libarchive/libarchive/filter_fork.h
index a28272be..a28272be 100644
--- a/3rdparty/libarchive/libarchive/filter_fork.h
+++ b/src/3rdparty/libarchive/libarchive/filter_fork.h
diff --git a/3rdparty/libarchive/libarchive/filter_fork_posix.c b/src/3rdparty/libarchive/libarchive/filter_fork_posix.c
index 02dbd4bb..02dbd4bb 100644
--- a/3rdparty/libarchive/libarchive/filter_fork_posix.c
+++ b/src/3rdparty/libarchive/libarchive/filter_fork_posix.c
diff --git a/3rdparty/libarchive/libarchive/filter_fork_windows.c b/src/3rdparty/libarchive/libarchive/filter_fork_windows.c
index ad271fe6..ad271fe6 100644
--- a/3rdparty/libarchive/libarchive/filter_fork_windows.c
+++ b/src/3rdparty/libarchive/libarchive/filter_fork_windows.c
diff --git a/3rdparty/libarchive/qt_attribution.json b/src/3rdparty/libarchive/qt_attribution.json
index 3abf2fcb..3abf2fcb 100644
--- a/3rdparty/libarchive/qt_attribution.json
+++ b/src/3rdparty/libarchive/qt_attribution.json
diff --git a/src/3rdparty/libbacktrace/CMakeLists.txt b/src/3rdparty/libbacktrace/CMakeLists.txt
new file mode 100644
index 00000000..1102b117
--- /dev/null
+++ b/src/3rdparty/libbacktrace/CMakeLists.txt
@@ -0,0 +1,53 @@
+# Generated from libbacktrace.pro.
+
+#####################################################################
+## BundledBacktrace Generic Library:
+#####################################################################
+
+qt_internal_add_3rdparty_library(BundledBacktrace
+    QMAKE_LIB_NAME backtrace
+    STATIC
+    INSTALL
+    SOURCES
+        libbacktrace/atomic.c
+        libbacktrace/backtrace.c
+        libbacktrace/dwarf.c
+        libbacktrace/fileline.c
+        libbacktrace/mmap.c
+        libbacktrace/mmapio.c
+        libbacktrace/posix.c
+        libbacktrace/print.c
+        libbacktrace/simple.c
+        libbacktrace/sort.c
+        libbacktrace/state.c
+    DEFINES
+        _GNU_SOURCE
+    INCLUDE_DIRECTORIES
+        auxincl
+        libbacktrace
+    PUBLIC_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
+qt_disable_warnings(BundledBacktrace)
+qt_set_symbol_visibility_hidden(BundledBacktrace)
+
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:libbacktrace.pro:win32-msvc_x_:
+# QMAKE_CFLAGS = "/D_CRT_SECURE_NO_WARNINGS"
+
+#### Keys ignored in scope 3:.:.:libbacktrace.pro:GCC:
+# QMAKE_CFLAGS = "-Wno-unused" "-funwind-tables" "-Wno-switch" "-Wno-enum-compare"
+
+#### Keys ignored in scope 4:.:.:libbacktrace.pro:CLANG:
+# QMAKE_CFLAGS = "-Wall" "-W" "-Wno-unused"
+
+qt_internal_extend_target(BundledBacktrace CONDITION LINUX
+    SOURCES
+        libbacktrace/elf.c
+)
+
+qt_internal_extend_target(BundledBacktrace CONDITION MACOS
+    SOURCES
+        libbacktrace/macho.c
+)
diff --git a/3rdparty/libbacktrace/LICENSE b/src/3rdparty/libbacktrace/LICENSE
index 74b5ddb5..74b5ddb5 100644
--- a/3rdparty/libbacktrace/LICENSE
+++ b/src/3rdparty/libbacktrace/LICENSE
diff --git a/3rdparty/libbacktrace/README.md b/src/3rdparty/libbacktrace/README.md
index 14a2da2d..14a2da2d 100644
--- a/3rdparty/libbacktrace/README.md
+++ b/src/3rdparty/libbacktrace/README.md
diff --git a/3rdparty/libbacktrace/auxincl/dwarf2.h b/src/3rdparty/libbacktrace/auxincl/dwarf2.h
index 205df8d2..205df8d2 100644
--- a/3rdparty/libbacktrace/auxincl/dwarf2.h
+++ b/src/3rdparty/libbacktrace/auxincl/dwarf2.h
diff --git a/3rdparty/libbacktrace/auxincl/filenames.h b/src/3rdparty/libbacktrace/auxincl/filenames.h
index 90f95cd8..90f95cd8 100644
--- a/3rdparty/libbacktrace/auxincl/filenames.h
+++ b/src/3rdparty/libbacktrace/auxincl/filenames.h
diff --git a/3rdparty/libbacktrace/libbacktrace.pro b/src/3rdparty/libbacktrace/libbacktrace.pro
index ff3da892..ff3da892 100644
--- a/3rdparty/libbacktrace/libbacktrace.pro
+++ b/src/3rdparty/libbacktrace/libbacktrace.pro
diff --git a/3rdparty/libbacktrace/libbacktrace/ChangeLog b/src/3rdparty/libbacktrace/libbacktrace/ChangeLog
index acc07047..acc07047 100644
--- a/3rdparty/libbacktrace/libbacktrace/ChangeLog
+++ b/src/3rdparty/libbacktrace/libbacktrace/ChangeLog
diff --git a/3rdparty/libbacktrace/libbacktrace/README b/src/3rdparty/libbacktrace/libbacktrace/README
index e8b22574..e8b22574 100644
--- a/3rdparty/libbacktrace/libbacktrace/README
+++ b/src/3rdparty/libbacktrace/libbacktrace/README
diff --git a/3rdparty/libbacktrace/libbacktrace/atomic.c b/src/3rdparty/libbacktrace/libbacktrace/atomic.c
index 502ad358..502ad358 100644
--- a/3rdparty/libbacktrace/libbacktrace/atomic.c
+++ b/src/3rdparty/libbacktrace/libbacktrace/atomic.c
diff --git a/3rdparty/libbacktrace/libbacktrace/backtrace-supported.h b/src/3rdparty/libbacktrace/libbacktrace/backtrace-supported.h
index d89221c7..d89221c7 100644
--- a/3rdparty/libbacktrace/libbacktrace/backtrace-supported.h
+++ b/src/3rdparty/libbacktrace/libbacktrace/backtrace-supported.h
diff --git a/3rdparty/libbacktrace/libbacktrace/backtrace.c b/src/3rdparty/libbacktrace/libbacktrace/backtrace.c
index c579e803..c579e803 100644
--- a/3rdparty/libbacktrace/libbacktrace/backtrace.c
+++ b/src/3rdparty/libbacktrace/libbacktrace/backtrace.c
diff --git a/3rdparty/libbacktrace/libbacktrace/backtrace.h b/src/3rdparty/libbacktrace/libbacktrace/backtrace.h
index 0631f265..0631f265 100644
--- a/3rdparty/libbacktrace/libbacktrace/backtrace.h
+++ b/src/3rdparty/libbacktrace/libbacktrace/backtrace.h
diff --git a/3rdparty/libbacktrace/libbacktrace/config.h b/src/3rdparty/libbacktrace/libbacktrace/config.h
index c7a9e18c..c7a9e18c 100644
--- a/3rdparty/libbacktrace/libbacktrace/config.h
+++ b/src/3rdparty/libbacktrace/libbacktrace/config.h
diff --git a/3rdparty/libbacktrace/libbacktrace/dwarf.c b/src/3rdparty/libbacktrace/libbacktrace/dwarf.c
index af79dfe5..af79dfe5 100644
--- a/3rdparty/libbacktrace/libbacktrace/dwarf.c
+++ b/src/3rdparty/libbacktrace/libbacktrace/dwarf.c
diff --git a/3rdparty/libbacktrace/libbacktrace/elf.c b/src/3rdparty/libbacktrace/libbacktrace/elf.c
index d1d257b1..d1d257b1 100644
--- a/3rdparty/libbacktrace/libbacktrace/elf.c
+++ b/src/3rdparty/libbacktrace/libbacktrace/elf.c
diff --git a/3rdparty/libbacktrace/libbacktrace/fileline.c b/src/3rdparty/libbacktrace/libbacktrace/fileline.c
index 369c9dee..369c9dee 100644
--- a/3rdparty/libbacktrace/libbacktrace/fileline.c
+++ b/src/3rdparty/libbacktrace/libbacktrace/fileline.c
diff --git a/3rdparty/libbacktrace/libbacktrace/internal.h b/src/3rdparty/libbacktrace/libbacktrace/internal.h
index a9c66882..a9c66882 100644
--- a/3rdparty/libbacktrace/libbacktrace/internal.h
+++ b/src/3rdparty/libbacktrace/libbacktrace/internal.h
diff --git a/3rdparty/libbacktrace/libbacktrace/macho.c b/src/3rdparty/libbacktrace/libbacktrace/macho.c
index b16b7710..b16b7710 100644
--- a/3rdparty/libbacktrace/libbacktrace/macho.c
+++ b/src/3rdparty/libbacktrace/libbacktrace/macho.c
diff --git a/3rdparty/libbacktrace/libbacktrace/mmap.c b/src/3rdparty/libbacktrace/libbacktrace/mmap.c
index 1b636649..1b636649 100644
--- a/3rdparty/libbacktrace/libbacktrace/mmap.c
+++ b/src/3rdparty/libbacktrace/libbacktrace/mmap.c
diff --git a/3rdparty/libbacktrace/libbacktrace/mmapio.c b/src/3rdparty/libbacktrace/libbacktrace/mmapio.c
index b188a43a..b188a43a 100644
--- a/3rdparty/libbacktrace/libbacktrace/mmapio.c
+++ b/src/3rdparty/libbacktrace/libbacktrace/mmapio.c
diff --git a/3rdparty/libbacktrace/libbacktrace/posix.c b/src/3rdparty/libbacktrace/libbacktrace/posix.c
index baffb85b..baffb85b 100644
--- a/3rdparty/libbacktrace/libbacktrace/posix.c
+++ b/src/3rdparty/libbacktrace/libbacktrace/posix.c
diff --git a/3rdparty/libbacktrace/libbacktrace/print.c b/src/3rdparty/libbacktrace/libbacktrace/print.c
index 0767face..0767face 100644
--- a/3rdparty/libbacktrace/libbacktrace/print.c
+++ b/src/3rdparty/libbacktrace/libbacktrace/print.c
diff --git a/3rdparty/libbacktrace/libbacktrace/simple.c b/src/3rdparty/libbacktrace/libbacktrace/simple.c
index 11893639..11893639 100644
--- a/3rdparty/libbacktrace/libbacktrace/simple.c
+++ b/src/3rdparty/libbacktrace/libbacktrace/simple.c
diff --git a/3rdparty/libbacktrace/libbacktrace/sort.c b/src/3rdparty/libbacktrace/libbacktrace/sort.c
index 6fe5ba24..6fe5ba24 100644
--- a/3rdparty/libbacktrace/libbacktrace/sort.c
+++ b/src/3rdparty/libbacktrace/libbacktrace/sort.c
diff --git a/3rdparty/libbacktrace/libbacktrace/state.c b/src/3rdparty/libbacktrace/libbacktrace/state.c
index 6196c267..6196c267 100644
--- a/3rdparty/libbacktrace/libbacktrace/state.c
+++ b/src/3rdparty/libbacktrace/libbacktrace/state.c
diff --git a/3rdparty/libbacktrace/qt_attribution.json b/src/3rdparty/libbacktrace/qt_attribution.json
index e8c7bf6f..e8c7bf6f 100644
--- a/3rdparty/libbacktrace/qt_attribution.json
+++ b/src/3rdparty/libbacktrace/qt_attribution.json
diff --git a/src/3rdparty/libyaml/CMakeLists.txt b/src/3rdparty/libyaml/CMakeLists.txt
new file mode 100644
index 00000000..1c189116
--- /dev/null
+++ b/src/3rdparty/libyaml/CMakeLists.txt
@@ -0,0 +1,43 @@
+# Generated from libyaml.pro.
+
+#####################################################################
+## BundledLibYaml Generic Library:
+#####################################################################
+
+qt_internal_add_3rdparty_library(BundledLibYaml
+    QMAKE_LIB_NAME yaml
+    STATIC
+    INSTALL
+    SOURCES
+        src/api.c
+        src/dumper.c
+        src/emitter.c
+        src/loader.c
+        src/parser.c
+        src/reader.c
+        src/scanner.c
+        src/writer.c
+    DEFINES
+        HAVE_CONFIG_H
+        YAML_DECLARE_STATIC
+        YAML_DECLARE_EXPORT
+    PUBLIC_DEFINES
+        YAML_DECLARE_STATIC
+    INCLUDE_DIRECTORIES
+        include
+        win32
+    PUBLIC_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
+
+qt_disable_warnings(BundledLibYaml)
+qt_set_symbol_visibility_hidden(BundledLibYaml)
+
+#### Keys ignored in scope 2:.:.:libyaml.pro:win32-msvc_x_:
+# QMAKE_CFLAGS = "/D_CRT_SECURE_NO_WARNINGS"
+
+#### Keys ignored in scope 3:.:.:libyaml.pro:GCC:
+# QMAKE_CFLAGS = "-Wno-unused"
+
+#### Keys ignored in scope 4:.:.:libyaml.pro:CLANG:
+# QMAKE_CFLAGS = "-Wall" "-W" "-Wno-unused"
diff --git a/3rdparty/libyaml/LICENSE b/src/3rdparty/libyaml/LICENSE
index 21cdd1d6..21cdd1d6 100644
--- a/3rdparty/libyaml/LICENSE
+++ b/src/3rdparty/libyaml/LICENSE
diff --git a/3rdparty/libyaml/README b/src/3rdparty/libyaml/README
index 373727e0..373727e0 100644
--- a/3rdparty/libyaml/README
+++ b/src/3rdparty/libyaml/README
diff --git a/3rdparty/libyaml/include/yaml.h b/src/3rdparty/libyaml/include/yaml.h
index c225908d..89050e4f 100644
--- a/3rdparty/libyaml/include/yaml.h
+++ b/src/3rdparty/libyaml/include/yaml.h
@@ -28,7 +28,7 @@ extern "C" {
 
 #if defined(__MINGW32__)
 #   define  YAML_DECLARE(type)  type
-#elif defined(WIN32)
+#elif defined(_WIN32)
 #   if defined(YAML_DECLARE_STATIC)
 #       define  YAML_DECLARE(type)  type
 #   elif defined(YAML_DECLARE_EXPORT)
@@ -552,7 +552,7 @@ yaml_document_end_event_initialize(yaml_event_t *event, int implicit);
  */
 
 YAML_DECLARE(int)
-yaml_alias_event_initialize(yaml_event_t *event, yaml_char_t *anchor);
+yaml_alias_event_initialize(yaml_event_t *event, const yaml_char_t *anchor);
 
 /**
  * Create a SCALAR event.
@@ -578,8 +578,8 @@ yaml_alias_event_initialize(yaml_event_t *event, yaml_char_t *anchor);
 
 YAML_DECLARE(int)
 yaml_scalar_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag,
-        yaml_char_t *value, int length,
+        const yaml_char_t *anchor, const yaml_char_t *tag,
+        const yaml_char_t *value, int length,
         int plain_implicit, int quoted_implicit,
         yaml_scalar_style_t style);
 
@@ -601,7 +601,7 @@ yaml_scalar_event_initialize(yaml_event_t *event,
 
 YAML_DECLARE(int)
 yaml_sequence_start_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag, int implicit,
+        const yaml_char_t *anchor, const yaml_char_t *tag, int implicit,
         yaml_sequence_style_t style);
 
 /**
@@ -633,7 +633,7 @@ yaml_sequence_end_event_initialize(yaml_event_t *event);
 
 YAML_DECLARE(int)
 yaml_mapping_start_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag, int implicit,
+        const yaml_char_t *anchor, const yaml_char_t *tag, int implicit,
         yaml_mapping_style_t style);
 
 /**
@@ -896,7 +896,7 @@ yaml_document_get_root_node(yaml_document_t *document);
 
 YAML_DECLARE(int)
 yaml_document_add_scalar(yaml_document_t *document,
-        yaml_char_t *tag, yaml_char_t *value, int length,
+        const yaml_char_t *tag, const yaml_char_t *value, int length,
         yaml_scalar_style_t style);
 
 /**
@@ -913,7 +913,7 @@ yaml_document_add_scalar(yaml_document_t *document,
 
 YAML_DECLARE(int)
 yaml_document_add_sequence(yaml_document_t *document,
-        yaml_char_t *tag, yaml_sequence_style_t style);
+        const yaml_char_t *tag, yaml_sequence_style_t style);
 
 /**
  * Create a MAPPING node and attach it to the document.
@@ -929,7 +929,7 @@ yaml_document_add_sequence(yaml_document_t *document,
 
 YAML_DECLARE(int)
 yaml_document_add_mapping(yaml_document_t *document,
-        yaml_char_t *tag, yaml_mapping_style_t style);
+        const yaml_char_t *tag, yaml_mapping_style_t style);
 
 /**
  * Add an item to a SEQUENCE node.
@@ -937,7 +937,7 @@ yaml_document_add_mapping(yaml_document_t *document,
  * @param[in,out]   document    A document object.
  * @param[in]       sequence    The sequence node id.
  * @param[in]       item        The item node id.
-*
+ *
  * @returns @c 1 if the function succeeded, @c 0 on error.
  */
 
@@ -952,7 +952,7 @@ yaml_document_append_sequence_item(yaml_document_t *document,
  * @param[in]       mapping     The mapping node id.
  * @param[in]       key         The key node id.
  * @param[in]       value       The value node id.
-*
+ *
  * @returns @c 1 if the function succeeded, @c 0 on error.
  */
 
@@ -1020,6 +1020,7 @@ typedef enum yaml_parser_state_e {
     YAML_PARSE_DOCUMENT_CONTENT_STATE,
     /** Expect DOCUMENT-END. */
     YAML_PARSE_DOCUMENT_END_STATE,
+
     /** Expect a block node. */
     YAML_PARSE_BLOCK_NODE_STATE,
     /** Expect a block node or indentless sequence. */
@@ -1030,6 +1031,7 @@ typedef enum yaml_parser_state_e {
     YAML_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE,
     /** Expect an entry of a block sequence. */
     YAML_PARSE_BLOCK_SEQUENCE_ENTRY_STATE,
+
     /** Expect an entry of an indentless sequence. */
     YAML_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE,
     /** Expect the first key of a block mapping. */
@@ -1040,6 +1042,7 @@ typedef enum yaml_parser_state_e {
     YAML_PARSE_BLOCK_MAPPING_VALUE_STATE,
     /** Expect the first entry of a flow sequence. */
     YAML_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE,
+
     /** Expect an entry of a flow sequence. */
     YAML_PARSE_FLOW_SEQUENCE_ENTRY_STATE,
     /** Expect a key of an ordered mapping. */
@@ -1051,6 +1054,7 @@ typedef enum yaml_parser_state_e {
     /** Expect the first key of a flow mapping. */
     YAML_PARSE_FLOW_MAPPING_FIRST_KEY_STATE,
     /** Expect a key of a flow mapping. */
+
     YAML_PARSE_FLOW_MAPPING_KEY_STATE,
     /** Expect a value of a flow mapping. */
     YAML_PARSE_FLOW_MAPPING_VALUE_STATE,
@@ -1205,7 +1209,7 @@ typedef struct yaml_parser_s {
     /** The number of tokens fetched from the queue. */
     size_t tokens_parsed;
 
-    /* Does the tokens queue contain a token ready for dequeueing. */
+    /** Does the tokens queue contain a token ready for dequeueing. */
     int token_available;
 
     /** The indentation levels stack. */
@@ -1446,7 +1450,7 @@ yaml_parser_parse(yaml_parser_t *parser, yaml_event_t *event);
  * @param[in,out]   parser      A parser object.
  * @param[out]      document    An empty document object.
  *
- * @return @c 1 if the function succeeded, @c 0 on error.
+ * @returns @c 1 if the function succeeded, @c 0 on error.
  */
 
 YAML_DECLARE(int)
@@ -1489,6 +1493,7 @@ typedef enum yaml_emitter_state_e {
     YAML_EMIT_DOCUMENT_CONTENT_STATE,
     /** Expect DOCUMENT-END. */
     YAML_EMIT_DOCUMENT_END_STATE,
+
     /** Expect the first item of a flow sequence. */
     YAML_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE,
     /** Expect an item of a flow sequence. */
@@ -1499,6 +1504,7 @@ typedef enum yaml_emitter_state_e {
     YAML_EMIT_FLOW_MAPPING_KEY_STATE,
     /** Expect a value for a simple key of a flow mapping. */
     YAML_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE,
+
     /** Expect a value of a flow mapping. */
     YAML_EMIT_FLOW_MAPPING_VALUE_STATE,
     /** Expect the first item of a block sequence. */
@@ -1509,6 +1515,7 @@ typedef enum yaml_emitter_state_e {
     YAML_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE,
     /** Expect the key of a block mapping. */
     YAML_EMIT_BLOCK_MAPPING_KEY_STATE,
+
     /** Expect a value for a simple key of a block mapping. */
     YAML_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE,
     /** Expect a value of a block mapping. */
@@ -1560,7 +1567,7 @@ typedef struct yaml_emitter_s {
     /** Write handler. */
     yaml_write_handler_t *write_handler;
 
-    /** A pointer for passing to the white handler. */
+    /** A pointer for passing to the write handler. */
     void *write_handler_data;
 
     /** Standard (string or file) output data. */
@@ -1858,7 +1865,7 @@ YAML_DECLARE(void)
 yaml_emitter_set_canonical(yaml_emitter_t *emitter, int canonical);
 
 /**
- * Set the intendation increment.
+ * Set the indentation increment.
  *
  * @param[in,out]   emitter     An emitter object.
  * @param[in]       indent      The indentation increment (1 < . < 10).
diff --git a/3rdparty/libyaml/libyaml.pro b/src/3rdparty/libyaml/libyaml.pro
index c1cabd71..c1cabd71 100644
--- a/3rdparty/libyaml/libyaml.pro
+++ b/src/3rdparty/libyaml/libyaml.pro
diff --git a/3rdparty/libyaml/qt_attribution.json b/src/3rdparty/libyaml/qt_attribution.json
index f6cf786e..f6cf786e 100644
--- a/3rdparty/libyaml/qt_attribution.json
+++ b/src/3rdparty/libyaml/qt_attribution.json
diff --git a/3rdparty/libyaml/src/api.c b/src/3rdparty/libyaml/src/api.c
index e793b085..0c86bf8f 100644
--- a/3rdparty/libyaml/src/api.c
+++ b/src/3rdparty/libyaml/src/api.c
@@ -1,3 +1,11 @@
+// vv AM added vv
+// without these, we have no declaration for strdup and since this is C,
+// we default to the return value being a 32bit int, effectively destroying
+// the actual 64bit pointer.
+#define _GNU_SOURCE
+#include <string.h>
+#include <stdlib.h>
+// ^^ AM added ^^
 
 #include "yaml_private.h"
 
@@ -623,10 +631,10 @@ yaml_token_delete(yaml_token_t *token)
  */
 
 static int
-yaml_check_utf8(yaml_char_t *start, size_t length)
+yaml_check_utf8(const yaml_char_t *start, size_t length)
 {
-    yaml_char_t *end = start+length;
-    yaml_char_t *pointer = start;
+    const yaml_char_t *end = start+length;
+    const yaml_char_t *pointer = start;
 
     while (pointer < end) {
         unsigned char octet;
@@ -794,7 +802,7 @@ yaml_document_end_event_initialize(yaml_event_t *event, int implicit)
  */
 
 YAML_DECLARE(int)
-yaml_alias_event_initialize(yaml_event_t *event, yaml_char_t *anchor)
+yaml_alias_event_initialize(yaml_event_t *event, const yaml_char_t *anchor)
 {
     yaml_mark_t mark = { 0, 0, 0 };
     yaml_char_t *anchor_copy = NULL;
@@ -819,8 +827,8 @@ yaml_alias_event_initialize(yaml_event_t *event, yaml_char_t *anchor)
 
 YAML_DECLARE(int)
 yaml_scalar_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag,
-        yaml_char_t *value, int length,
+        const yaml_char_t *anchor, const yaml_char_t *tag,
+        const yaml_char_t *value, int length,
         int plain_implicit, int quoted_implicit,
         yaml_scalar_style_t style)
 {
@@ -873,7 +881,7 @@ error:
 
 YAML_DECLARE(int)
 yaml_sequence_start_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag, int implicit,
+        const yaml_char_t *anchor, const yaml_char_t *tag, int implicit,
         yaml_sequence_style_t style)
 {
     yaml_mark_t mark = { 0, 0, 0 };
@@ -928,7 +936,7 @@ yaml_sequence_end_event_initialize(yaml_event_t *event)
 
 YAML_DECLARE(int)
 yaml_mapping_start_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag, int implicit,
+        const yaml_char_t *anchor, const yaml_char_t *tag, int implicit,
         yaml_mapping_style_t style)
 {
     yaml_mark_t mark = { 0, 0, 0 };
@@ -1193,7 +1201,7 @@ yaml_document_get_root_node(yaml_document_t *document)
 
 YAML_DECLARE(int)
 yaml_document_add_scalar(yaml_document_t *document,
-        yaml_char_t *tag, yaml_char_t *value, int length,
+        const yaml_char_t *tag, const yaml_char_t *value, int length,
         yaml_scalar_style_t style)
 {
     struct {
@@ -1243,7 +1251,7 @@ error:
 
 YAML_DECLARE(int)
 yaml_document_add_sequence(yaml_document_t *document,
-        yaml_char_t *tag, yaml_sequence_style_t style)
+        const yaml_char_t *tag, yaml_sequence_style_t style)
 {
     struct {
         yaml_error_type_t error;
@@ -1288,7 +1296,7 @@ error:
 
 YAML_DECLARE(int)
 yaml_document_add_mapping(yaml_document_t *document,
-        yaml_char_t *tag, yaml_mapping_style_t style)
+        const yaml_char_t *tag, yaml_mapping_style_t style)
 {
     struct {
         yaml_error_type_t error;
diff --git a/3rdparty/libyaml/src/dumper.c b/src/3rdparty/libyaml/src/dumper.c
index 1fe940b6..1fe940b6 100644
--- a/3rdparty/libyaml/src/dumper.c
+++ b/src/3rdparty/libyaml/src/dumper.c
diff --git a/3rdparty/libyaml/src/emitter.c b/src/3rdparty/libyaml/src/emitter.c
index b9392e40..609b28a4 100644
--- a/3rdparty/libyaml/src/emitter.c
+++ b/src/3rdparty/libyaml/src/emitter.c
@@ -495,6 +495,7 @@ static int
 yaml_emitter_emit_stream_start(yaml_emitter_t *emitter,
         yaml_event_t *event)
 {
+    emitter->open_ended = 0;
     if (event->type == YAML_STREAM_START_EVENT)
     {
         if (!emitter->encoding) {
@@ -597,13 +598,20 @@ yaml_emitter_emit_document_start(yaml_emitter_t *emitter,
             if (!yaml_emitter_write_indent(emitter))
                 return 0;
         }
+        emitter->open_ended = 0;
 
         if (event->data.document_start.version_directive) {
             implicit = 0;
             if (!yaml_emitter_write_indicator(emitter, "%YAML", 1, 0, 0))
                 return 0;
-            if (!yaml_emitter_write_indicator(emitter, "1.1", 1, 0, 0))
-                return 0;
+            if (event->data.document_start.version_directive->minor == 1) {
+                if (!yaml_emitter_write_indicator(emitter, "1.1", 1, 0, 0))
+                    return 0;
+            }
+            else {
+                if (!yaml_emitter_write_indicator(emitter, "1.2", 1, 0, 0))
+                    return 0;
+            }
             if (!yaml_emitter_write_indent(emitter))
                 return 0;
         }
@@ -644,12 +652,25 @@ yaml_emitter_emit_document_start(yaml_emitter_t *emitter,
 
         emitter->state = YAML_EMIT_DOCUMENT_CONTENT_STATE;
 
+        emitter->open_ended = 0;
         return 1;
     }
 
     else if (event->type == YAML_STREAM_END_EVENT)
     {
 
+        /**
+         * This can happen if a block scalar with trailing empty lines
+         * is at the end of the stream
+         */
+        if (emitter->open_ended == 2)
+        {
+            if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0))
+                return 0;
+            emitter->open_ended = 0;
+            if (!yaml_emitter_write_indent(emitter))
+                return 0;
+        }
         if (!yaml_emitter_flush(emitter))
             return 0;
 
@@ -691,9 +712,12 @@ yaml_emitter_emit_document_end(yaml_emitter_t *emitter,
         if (!event->data.document_end.implicit) {
             if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0))
                 return 0;
+            emitter->open_ended = 0;
             if (!yaml_emitter_write_indent(emitter))
                 return 0;
         }
+        else if (!emitter->open_ended)
+            emitter->open_ended = 1;
         if (!yaml_emitter_flush(emitter))
             return 0;
 
@@ -999,6 +1023,8 @@ yaml_emitter_emit_alias(yaml_emitter_t *emitter, SHIM(yaml_event_t *event))
 {
     if (!yaml_emitter_process_anchor(emitter))
         return 0;
+    if (emitter->simple_key_context)
+        if (!PUT(emitter, ' ')) return 0;
     emitter->state = POP(emitter, emitter->states);
 
     return 1;
@@ -1227,7 +1253,7 @@ yaml_emitter_select_scalar_style(yaml_emitter_t *emitter, yaml_event_t *event)
 }
 
 /*
- * Write an achor.
+ * Write an anchor.
  */
 
 static int
@@ -1326,7 +1352,10 @@ static int
 yaml_emitter_analyze_version_directive(yaml_emitter_t *emitter,
         yaml_version_directive_t version_directive)
 {
-    if (version_directive.major != 1 || version_directive.minor != 1) {
+    if (version_directive.major != 1 || (
+        version_directive.minor != 1
+        && version_directive.minor != 2
+        )) {
         return yaml_emitter_set_emitter_error(emitter,
                 "incompatible %YAML directive");
     }
@@ -1796,7 +1825,6 @@ yaml_emitter_write_indicator(yaml_emitter_t *emitter,
 
     emitter->whitespace = is_whitespace;
     emitter->indention = (emitter->indention && is_indention);
-    emitter->open_ended = 0;
 
     return 1;
 }
@@ -1897,7 +1925,17 @@ yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter,
 
     STRING_ASSIGN(string, value, length);
 
-    if (!emitter->whitespace) {
+    /**
+     * Avoid trailing spaces for empty values in block mode.
+     * In flow mode, we still want the space to prevent ambiguous things
+     * like {a:}.
+     * Currently, the emitter forbids any plain empty scalar in flow mode
+     * (e.g. it outputs {a: ''} instead), so emitter->flow_level will
+     * never be true here.
+     * But if the emitter is ever changed to allow emitting empty values,
+     * the check for flow_level is already here.
+     */
+    if (!emitter->whitespace && (length || emitter->flow_level)) {
         if (!PUT(emitter, ' ')) return 0;
     }
 
@@ -1939,10 +1977,6 @@ yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter,
 
     emitter->whitespace = 0;
     emitter->indention = 0;
-    if (emitter->root_context)
-    {
-        emitter->open_ended = 1;
-    }
 
     return 1;
 }
@@ -2203,7 +2237,7 @@ yaml_emitter_write_block_scalar_hints(yaml_emitter_t *emitter,
         else if (string.start == string.pointer)
         {
             chomp_hint = "+";
-            emitter->open_ended = 1;
+            emitter->open_ended = 2;
         }
         else
         {
@@ -2213,7 +2247,7 @@ yaml_emitter_write_block_scalar_hints(yaml_emitter_t *emitter,
             if (IS_BREAK(string))
             {
                 chomp_hint = "+";
-                emitter->open_ended = 1;
+                emitter->open_ended = 2;
             }
         }
     }
diff --git a/3rdparty/libyaml/src/loader.c b/src/3rdparty/libyaml/src/loader.c
index db8501ac..dea8ac42 100644
--- a/3rdparty/libyaml/src/loader.c
+++ b/src/3rdparty/libyaml/src/loader.c
@@ -38,26 +38,46 @@ static void
 yaml_parser_delete_aliases(yaml_parser_t *parser);
 
 /*
+ * Document loading context.
+ */
+struct loader_ctx {
+    int *start;
+    int *end;
+    int *top;
+};
+
+/*
  * Composer functions.
  */
+static int
+yaml_parser_load_nodes(yaml_parser_t *parser, struct loader_ctx *ctx);
+
+static int
+yaml_parser_load_document(yaml_parser_t *parser, yaml_event_t *event);
 
 static int
-yaml_parser_load_document(yaml_parser_t *parser, yaml_event_t *first_event);
+yaml_parser_load_alias(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx);
 
 static int
-yaml_parser_load_node(yaml_parser_t *parser, yaml_event_t *first_event);
+yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx);
 
 static int
-yaml_parser_load_alias(yaml_parser_t *parser, yaml_event_t *first_event);
+yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx);
 
 static int
-yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event);
+yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx);
 
 static int
-yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event);
+yaml_parser_load_sequence_end(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx);
 
 static int
-yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event);
+yaml_parser_load_mapping_end(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx);
 
 /*
  * Load the next document of the stream.
@@ -162,59 +182,78 @@ yaml_parser_delete_aliases(yaml_parser_t *parser)
  */
 
 static int
-yaml_parser_load_document(yaml_parser_t *parser, yaml_event_t *first_event)
+yaml_parser_load_document(yaml_parser_t *parser, yaml_event_t *event)
 {
-    yaml_event_t event;
+    struct loader_ctx ctx = { NULL, NULL, NULL };
 
-    assert(first_event->type == YAML_DOCUMENT_START_EVENT);
+    assert(event->type == YAML_DOCUMENT_START_EVENT);
                         /* DOCUMENT-START is expected. */
 
     parser->document->version_directive
-        = first_event->data.document_start.version_directive;
+        = event->data.document_start.version_directive;
     parser->document->tag_directives.start
-        = first_event->data.document_start.tag_directives.start;
+        = event->data.document_start.tag_directives.start;
     parser->document->tag_directives.end
-        = first_event->data.document_start.tag_directives.end;
+        = event->data.document_start.tag_directives.end;
     parser->document->start_implicit
-        = first_event->data.document_start.implicit;
-    parser->document->start_mark = first_event->start_mark;
-
-    if (!yaml_parser_parse(parser, &event)) return 0;
-
-    if (!yaml_parser_load_node(parser, &event)) return 0;
-
-    if (!yaml_parser_parse(parser, &event)) return 0;
-    assert(event.type == YAML_DOCUMENT_END_EVENT);
-                        /* DOCUMENT-END is expected. */
+        = event->data.document_start.implicit;
+    parser->document->start_mark = event->start_mark;
 
-    parser->document->end_implicit = event.data.document_end.implicit;
-    parser->document->end_mark = event.end_mark;
+    if (!STACK_INIT(parser, ctx, int*)) return 0;
+    if (!yaml_parser_load_nodes(parser, &ctx)) {
+        STACK_DEL(parser, ctx);
+        return 0;
+    }
+    STACK_DEL(parser, ctx);
 
     return 1;
 }
 
 /*
- * Compose a node.
+ * Compose a node tree.
  */
 
 static int
-yaml_parser_load_node(yaml_parser_t *parser, yaml_event_t *first_event)
+yaml_parser_load_nodes(yaml_parser_t *parser, struct loader_ctx *ctx)
 {
-    switch (first_event->type) {
-        case YAML_ALIAS_EVENT:
-            return yaml_parser_load_alias(parser, first_event);
-        case YAML_SCALAR_EVENT:
-            return yaml_parser_load_scalar(parser, first_event);
-        case YAML_SEQUENCE_START_EVENT:
-            return yaml_parser_load_sequence(parser, first_event);
-        case YAML_MAPPING_START_EVENT:
-            return yaml_parser_load_mapping(parser, first_event);
-        default:
-            assert(0);  /* Could not happen. */
-            return 0;
-    }
+    yaml_event_t event;
 
-    return 0;
+    do {
+        if (!yaml_parser_parse(parser, &event)) return 0;
+
+        switch (event.type) {
+            case YAML_ALIAS_EVENT:
+                if (!yaml_parser_load_alias(parser, &event, ctx)) return 0;
+                break;
+            case YAML_SCALAR_EVENT:
+                if (!yaml_parser_load_scalar(parser, &event, ctx)) return 0;
+                break;
+            case YAML_SEQUENCE_START_EVENT:
+                if (!yaml_parser_load_sequence(parser, &event, ctx)) return 0;
+                break;
+            case YAML_SEQUENCE_END_EVENT:
+                if (!yaml_parser_load_sequence_end(parser, &event, ctx))
+                    return 0;
+                break;
+            case YAML_MAPPING_START_EVENT:
+                if (!yaml_parser_load_mapping(parser, &event, ctx)) return 0;
+                break;
+            case YAML_MAPPING_END_EVENT:
+                if (!yaml_parser_load_mapping_end(parser, &event, ctx))
+                    return 0;
+                break;
+            default:
+                assert(0);  /* Could not happen. */
+                return 0;
+            case YAML_DOCUMENT_END_EVENT:
+                break;
+        }
+    } while (event.type != YAML_DOCUMENT_END_EVENT);
+
+    parser->document->end_implicit = event.data.document_end.implicit;
+    parser->document->end_mark = event.end_mark;
+
+    return 1;
 }
 
 /*
@@ -253,26 +292,79 @@ yaml_parser_register_anchor(yaml_parser_t *parser,
 }
 
 /*
+ * Compose node into its parent in the stree.
+ */
+
+static int
+yaml_parser_load_node_add(yaml_parser_t *parser, struct loader_ctx *ctx,
+        int index)
+{
+    struct yaml_node_s *parent;
+    int parent_index;
+
+    if (STACK_EMPTY(parser, *ctx)) {
+        /* This is the root node, there's no tree to add it to. */
+        return 1;
+    }
+
+    parent_index = *((*ctx).top - 1);
+    parent = &parser->document->nodes.start[parent_index-1];
+
+    switch (parent->type) {
+        case YAML_SEQUENCE_NODE:
+            if (!STACK_LIMIT(parser, parent->data.sequence.items, INT_MAX-1))
+                return 0;
+            if (!PUSH(parser, parent->data.sequence.items, index))
+                return 0;
+            break;
+        case YAML_MAPPING_NODE: {
+            yaml_node_pair_t pair;
+            if (!STACK_EMPTY(parser, parent->data.mapping.pairs)) {
+                yaml_node_pair_t *p = parent->data.mapping.pairs.top - 1;
+                if (p->key != 0 && p->value == 0) {
+                    p->value = index;
+                    break;
+                }
+            }
+
+            pair.key = index;
+            pair.value = 0;
+            if (!STACK_LIMIT(parser, parent->data.mapping.pairs, INT_MAX-1))
+                return 0;
+            if (!PUSH(parser, parent->data.mapping.pairs, pair))
+                return 0;
+
+            break;
+        }
+        default:
+            assert(0); /* Could not happen. */
+            return 0;
+    }
+    return 1;
+}
+
+/*
  * Compose a node corresponding to an alias.
  */
 
 static int
-yaml_parser_load_alias(yaml_parser_t *parser, yaml_event_t *first_event)
+yaml_parser_load_alias(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx)
 {
-    yaml_char_t *anchor = first_event->data.alias.anchor;
+    yaml_char_t *anchor = event->data.alias.anchor;
     yaml_alias_data_t *alias_data;
 
     for (alias_data = parser->aliases.start;
             alias_data != parser->aliases.top; alias_data ++) {
         if (strcmp((char *)alias_data->anchor, (char *)anchor) == 0) {
             yaml_free(anchor);
-            return alias_data->index;
+            return yaml_parser_load_node_add(parser, ctx, alias_data->index);
         }
     }
 
     yaml_free(anchor);
     return yaml_parser_set_composer_error(parser, "found undefined alias",
-            first_event->start_mark);
+            event->start_mark);
 }
 
 /*
@@ -280,11 +372,12 @@ yaml_parser_load_alias(yaml_parser_t *parser, yaml_event_t *first_event)
  */
 
 static int
-yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event)
+yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx)
 {
     yaml_node_t node;
     int index;
-    yaml_char_t *tag = first_event->data.scalar.tag;
+    yaml_char_t *tag = event->data.scalar.tag;
 
     if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error;
 
@@ -294,23 +387,23 @@ yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event)
         if (!tag) goto error;
     }
 
-    SCALAR_NODE_INIT(node, tag, first_event->data.scalar.value,
-            first_event->data.scalar.length, first_event->data.scalar.style,
-            first_event->start_mark, first_event->end_mark);
+    SCALAR_NODE_INIT(node, tag, event->data.scalar.value,
+            event->data.scalar.length, event->data.scalar.style,
+            event->start_mark, event->end_mark);
 
     if (!PUSH(parser, parser->document->nodes, node)) goto error;
 
     index = parser->document->nodes.top - parser->document->nodes.start;
 
     if (!yaml_parser_register_anchor(parser, index,
-                first_event->data.scalar.anchor)) return 0;
+                event->data.scalar.anchor)) return 0;
 
-    return index;
+    return yaml_parser_load_node_add(parser, ctx, index);
 
 error:
     yaml_free(tag);
-    yaml_free(first_event->data.scalar.anchor);
-    yaml_free(first_event->data.scalar.value);
+    yaml_free(event->data.scalar.anchor);
+    yaml_free(event->data.scalar.value);
     return 0;
 }
 
@@ -319,17 +412,17 @@ error:
  */
 
 static int
-yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event)
+yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx)
 {
-    yaml_event_t event;
     yaml_node_t node;
     struct {
         yaml_node_item_t *start;
         yaml_node_item_t *end;
         yaml_node_item_t *top;
     } items = { NULL, NULL, NULL };
-    int index, item_index;
-    yaml_char_t *tag = first_event->data.sequence_start.tag;
+    int index;
+    yaml_char_t *tag = event->data.sequence_start.tag;
 
     if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error;
 
@@ -342,48 +435,54 @@ yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event)
     if (!STACK_INIT(parser, items, yaml_node_item_t*)) goto error;
 
     SEQUENCE_NODE_INIT(node, tag, items.start, items.end,
-            first_event->data.sequence_start.style,
-            first_event->start_mark, first_event->end_mark);
+            event->data.sequence_start.style,
+            event->start_mark, event->end_mark);
 
     if (!PUSH(parser, parser->document->nodes, node)) goto error;
 
     index = parser->document->nodes.top - parser->document->nodes.start;
 
     if (!yaml_parser_register_anchor(parser, index,
-                first_event->data.sequence_start.anchor)) return 0;
-
-    if (!yaml_parser_parse(parser, &event)) return 0;
-
-    while (event.type != YAML_SEQUENCE_END_EVENT) {
-        if (!STACK_LIMIT(parser,
-                    parser->document->nodes.start[index-1].data.sequence.items,
-                    INT_MAX-1)) return 0;
-        item_index = yaml_parser_load_node(parser, &event);
-        if (!item_index) return 0;
-        if (!PUSH(parser,
-                    parser->document->nodes.start[index-1].data.sequence.items,
-                    item_index)) return 0;
-        if (!yaml_parser_parse(parser, &event)) return 0;
-    }
+                event->data.sequence_start.anchor)) return 0;
+
+    if (!yaml_parser_load_node_add(parser, ctx, index)) return 0;
 
-    parser->document->nodes.start[index-1].end_mark = event.end_mark;
+    if (!STACK_LIMIT(parser, *ctx, INT_MAX-1)) return 0;
+    if (!PUSH(parser, *ctx, index)) return 0;
 
-    return index;
+    return 1;
 
 error:
     yaml_free(tag);
-    yaml_free(first_event->data.sequence_start.anchor);
+    yaml_free(event->data.sequence_start.anchor);
     return 0;
 }
 
+static int
+yaml_parser_load_sequence_end(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx)
+{
+    int index;
+
+    assert(((*ctx).top - (*ctx).start) > 0);
+
+    index = *((*ctx).top - 1);
+    assert(parser->document->nodes.start[index-1].type == YAML_SEQUENCE_NODE);
+    parser->document->nodes.start[index-1].end_mark = event->end_mark;
+
+    (void)POP(parser, *ctx);
+
+    return 1;
+}
+
 /*
  * Compose a mapping node.
  */
 
 static int
-yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event)
+yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx)
 {
-    yaml_event_t event;
     yaml_node_t node;
     struct {
         yaml_node_pair_t *start;
@@ -391,8 +490,7 @@ yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event)
         yaml_node_pair_t *top;
     } pairs = { NULL, NULL, NULL };
     int index;
-    yaml_node_pair_t pair;
-    yaml_char_t *tag = first_event->data.mapping_start.tag;
+    yaml_char_t *tag = event->data.mapping_start.tag;
 
     if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error;
 
@@ -405,40 +503,42 @@ yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event)
     if (!STACK_INIT(parser, pairs, yaml_node_pair_t*)) goto error;
 
     MAPPING_NODE_INIT(node, tag, pairs.start, pairs.end,
-            first_event->data.mapping_start.style,
-            first_event->start_mark, first_event->end_mark);
+            event->data.mapping_start.style,
+            event->start_mark, event->end_mark);
 
     if (!PUSH(parser, parser->document->nodes, node)) goto error;
 
     index = parser->document->nodes.top - parser->document->nodes.start;
 
     if (!yaml_parser_register_anchor(parser, index,
-                first_event->data.mapping_start.anchor)) return 0;
+                event->data.mapping_start.anchor)) return 0;
 
-    if (!yaml_parser_parse(parser, &event)) return 0;
-
-    while (event.type != YAML_MAPPING_END_EVENT) {
-        if (!STACK_LIMIT(parser,
-                    parser->document->nodes.start[index-1].data.mapping.pairs,
-                    INT_MAX-1)) return 0;
-        pair.key = yaml_parser_load_node(parser, &event);
-        if (!pair.key) return 0;
-        if (!yaml_parser_parse(parser, &event)) return 0;
-        pair.value = yaml_parser_load_node(parser, &event);
-        if (!pair.value) return 0;
-        if (!PUSH(parser,
-                    parser->document->nodes.start[index-1].data.mapping.pairs,
-                    pair)) return 0;
-        if (!yaml_parser_parse(parser, &event)) return 0;
-    }
+    if (!yaml_parser_load_node_add(parser, ctx, index)) return 0;
 
-    parser->document->nodes.start[index-1].end_mark = event.end_mark;
+    if (!STACK_LIMIT(parser, *ctx, INT_MAX-1)) return 0;
+    if (!PUSH(parser, *ctx, index)) return 0;
 
-    return index;
+    return 1;
 
 error:
     yaml_free(tag);
-    yaml_free(first_event->data.mapping_start.anchor);
+    yaml_free(event->data.mapping_start.anchor);
     return 0;
 }
 
+static int
+yaml_parser_load_mapping_end(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx)
+{
+    int index;
+
+    assert(((*ctx).top - (*ctx).start) > 0);
+
+    index = *((*ctx).top - 1);
+    assert(parser->document->nodes.start[index-1].type == YAML_MAPPING_NODE);
+    parser->document->nodes.start[index-1].end_mark = event->end_mark;
+
+    (void)POP(parser, *ctx);
+
+    return 1;
+}
\ No newline at end of file
diff --git a/3rdparty/libyaml/src/parser.c b/src/3rdparty/libyaml/src/parser.c
index 1198c737..ec2f8d3e 100644
--- a/3rdparty/libyaml/src/parser.c
+++ b/src/3rdparty/libyaml/src/parser.c
@@ -1261,7 +1261,10 @@ yaml_parser_process_directives(yaml_parser_t *parser,
                 goto error;
             }
             if (token->data.version_directive.major != 1
-                    || token->data.version_directive.minor != 1) {
+                    || (
+                        token->data.version_directive.minor != 1
+                        && token->data.version_directive.minor != 2
+                    )) {
                 yaml_parser_set_parser_error(parser,
                         "found incompatible YAML document", token->start_mark);
                 goto error;
diff --git a/3rdparty/libyaml/src/reader.c b/src/3rdparty/libyaml/src/reader.c
index f3ac54c2..f3ac54c2 100644
--- a/3rdparty/libyaml/src/reader.c
+++ b/src/3rdparty/libyaml/src/reader.c
diff --git a/3rdparty/libyaml/src/scanner.c b/src/3rdparty/libyaml/src/scanner.c
index ceee7496..c6b49876 100644
--- a/3rdparty/libyaml/src/scanner.c
+++ b/src/3rdparty/libyaml/src/scanner.c
@@ -348,6 +348,7 @@
  *          SCALAR("another value",plain)
  *          KEY
  *          SCALAR("a mapping",plain)
+ *          VALUE
  *          BLOCK-MAPPING-START
  *          KEY
  *          SCALAR("key 1",plain)
@@ -711,7 +712,7 @@ yaml_parser_scan_tag_handle(yaml_parser_t *parser, int directive,
         yaml_mark_t start_mark, yaml_char_t **handle);
 
 static int
-yaml_parser_scan_tag_uri(yaml_parser_t *parser, int directive,
+yaml_parser_scan_tag_uri(yaml_parser_t *parser, int uri_char, int directive,
         yaml_char_t *head, yaml_mark_t start_mark, yaml_char_t **uri);
 
 static int
@@ -2292,7 +2293,7 @@ yaml_parser_scan_tag_directive_value(yaml_parser_t *parser,
 
     /* Scan a prefix. */
 
-    if (!yaml_parser_scan_tag_uri(parser, 1, NULL, start_mark, &prefix_value))
+    if (!yaml_parser_scan_tag_uri(parser, 1, 1, NULL, start_mark, &prefix_value))
         goto error;
 
     /* Expect a whitespace or line break. */
@@ -2410,7 +2411,7 @@ yaml_parser_scan_tag(yaml_parser_t *parser, yaml_token_t *token)
 
         /* Consume the tag value. */
 
-        if (!yaml_parser_scan_tag_uri(parser, 0, NULL, start_mark, &suffix))
+        if (!yaml_parser_scan_tag_uri(parser, 1, 0, NULL, start_mark, &suffix))
             goto error;
 
         /* Check for '>' and eat it. */
@@ -2438,14 +2439,14 @@ yaml_parser_scan_tag(yaml_parser_t *parser, yaml_token_t *token)
         {
             /* Scan the suffix now. */
 
-            if (!yaml_parser_scan_tag_uri(parser, 0, NULL, start_mark, &suffix))
+            if (!yaml_parser_scan_tag_uri(parser, 0, 0, NULL, start_mark, &suffix))
                 goto error;
         }
         else
         {
             /* It wasn't a handle after all.  Scan the rest of the tag. */
 
-            if (!yaml_parser_scan_tag_uri(parser, 0, handle, start_mark, &suffix))
+            if (!yaml_parser_scan_tag_uri(parser, 0, 0, handle, start_mark, &suffix))
                 goto error;
 
             /* Set the handle to '!'. */
@@ -2474,9 +2475,11 @@ yaml_parser_scan_tag(yaml_parser_t *parser, yaml_token_t *token)
     if (!CACHE(parser, 1)) goto error;
 
     if (!IS_BLANKZ(parser->buffer)) {
-        yaml_parser_set_scanner_error(parser, "while scanning a tag",
-                start_mark, "did not find expected whitespace or line break");
-        goto error;
+        if (!parser->flow_level || !CHECK(parser->buffer, ',') ) {
+            yaml_parser_set_scanner_error(parser, "while scanning a tag",
+                    start_mark, "did not find expected whitespace or line break");
+            goto error;
+        }
     }
 
     end_mark = parser->mark;
@@ -2565,7 +2568,7 @@ error:
  */
 
 static int
-yaml_parser_scan_tag_uri(yaml_parser_t *parser, int directive,
+yaml_parser_scan_tag_uri(yaml_parser_t *parser, int uri_char, int directive,
         yaml_char_t *head, yaml_mark_t start_mark, yaml_char_t **uri)
 {
     size_t length = head ? strlen((char *)head) : 0;
@@ -2601,8 +2604,11 @@ yaml_parser_scan_tag_uri(yaml_parser_t *parser, int directive,
      * The set of characters that may appear in URI is as follows:
      *
      *      '0'-'9', 'A'-'Z', 'a'-'z', '_', '-', ';', '/', '?', ':', '@', '&',
-     *      '=', '+', '$', ',', '.', '!', '~', '*', '\'', '(', ')', '[', ']',
-     *      '%'.
+     *      '=', '+', '$', '.', '!', '~', '*', '\'', '(', ')', '%'.
+     *
+     * If we are inside a verbatim tag <...> (parameter uri_char is true)
+     * then also the following flow indicators are allowed:
+     *      ',', '[', ']'
      */
 
     while (IS_ALPHA(parser->buffer) || CHECK(parser->buffer, ';')
@@ -2610,12 +2616,15 @@ yaml_parser_scan_tag_uri(yaml_parser_t *parser, int directive,
             || CHECK(parser->buffer, ':') || CHECK(parser->buffer, '@')
             || CHECK(parser->buffer, '&') || CHECK(parser->buffer, '=')
             || CHECK(parser->buffer, '+') || CHECK(parser->buffer, '$')
-            || CHECK(parser->buffer, ',') || CHECK(parser->buffer, '.')
+            || CHECK(parser->buffer, '.') || CHECK(parser->buffer, '%')
             || CHECK(parser->buffer, '!') || CHECK(parser->buffer, '~')
             || CHECK(parser->buffer, '*') || CHECK(parser->buffer, '\'')
             || CHECK(parser->buffer, '(') || CHECK(parser->buffer, ')')
-            || CHECK(parser->buffer, '[') || CHECK(parser->buffer, ']')
-            || CHECK(parser->buffer, '%'))
+            || (uri_char && (
+                CHECK(parser->buffer, ',')
+                || CHECK(parser->buffer, '[') || CHECK(parser->buffer, ']')
+                )
+            ))
     {
         /* Check if it is a URI-escape sequence. */
 
@@ -3456,7 +3465,7 @@ yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token)
             if ((CHECK(parser->buffer, ':') && IS_BLANKZ_AT(parser->buffer, 1))
                     || (parser->flow_level &&
                         (CHECK(parser->buffer, ',')
-                         || CHECK(parser->buffer, '?') || CHECK(parser->buffer, '[')
+                         || CHECK(parser->buffer, '[')
                          || CHECK(parser->buffer, ']') || CHECK(parser->buffer, '{')
                          || CHECK(parser->buffer, '}'))))
                 break;
@@ -3518,12 +3527,12 @@ yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token)
         {
             if (IS_BLANK(parser->buffer))
             {
-                /* Check for tab character that abuse indentation. */
+                /* Check for tab characters that abuse indentation. */
 
                 if (leading_blanks && (int)parser->mark.column < indent
                         && IS_TAB(parser->buffer)) {
                     yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
-                            start_mark, "found a tab character that violate indentation");
+                            start_mark, "found a tab character that violates indentation");
                     goto error;
                 }
 
diff --git a/3rdparty/libyaml/src/writer.c b/src/3rdparty/libyaml/src/writer.c
index 5d57f392..5d57f392 100644
--- a/3rdparty/libyaml/src/writer.c
+++ b/src/3rdparty/libyaml/src/writer.c
diff --git a/3rdparty/libyaml/src/yaml_private.h b/src/3rdparty/libyaml/src/yaml_private.h
index b3351c41..b3351c41 100644
--- a/3rdparty/libyaml/src/yaml_private.h
+++ b/src/3rdparty/libyaml/src/yaml_private.h
diff --git a/3rdparty/libyaml/win32/config.h b/src/3rdparty/libyaml/win32/config.h
index 405d3e75..405d3e75 100644
--- a/3rdparty/libyaml/win32/config.h
+++ b/src/3rdparty/libyaml/win32/config.h
diff --git a/src/3rdparty/stackwalker/CMakeLists.txt b/src/3rdparty/stackwalker/CMakeLists.txt
new file mode 100644
index 00000000..3d29945c
--- /dev/null
+++ b/src/3rdparty/stackwalker/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from stackwalker.pro.
+
+#####################################################################
+## BundledStackwalker Generic Library:
+#####################################################################
+
+qt_internal_add_3rdparty_library(BundledStackwalker
+    QMAKE_LIB_NAME stackwalker
+    STATIC
+    INSTALL
+    SOURCES
+        stackwalker.cpp stackwalker.h
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+    PUBLIC_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
+qt_disable_warnings(BundledStackwalker)
+qt_set_symbol_visibility_hidden(BundledStackwalker)
+
+#### Keys ignored in scope 1:.:.:stackwalker.pro:<TRUE>:
+# QMAKE_CFLAGS = "/D_CRT_SECURE_NO_WARNINGS"
+# TEMPLATE = "lib"
+# _REQUIREMENTS = "windows && msvc"
diff --git a/3rdparty/stackwalker/LICENSE b/src/3rdparty/stackwalker/LICENSE
index 43fd8dba..43fd8dba 100644
--- a/3rdparty/stackwalker/LICENSE
+++ b/src/3rdparty/stackwalker/LICENSE
diff --git a/3rdparty/stackwalker/qt_attribution.json b/src/3rdparty/stackwalker/qt_attribution.json
index 8a4adba4..8a4adba4 100644
--- a/3rdparty/stackwalker/qt_attribution.json
+++ b/src/3rdparty/stackwalker/qt_attribution.json
diff --git a/3rdparty/stackwalker/stackwalker.cpp b/src/3rdparty/stackwalker/stackwalker.cpp
index 7008ac67..7008ac67 100644
--- a/3rdparty/stackwalker/stackwalker.cpp
+++ b/src/3rdparty/stackwalker/stackwalker.cpp
diff --git a/3rdparty/stackwalker/stackwalker.h b/src/3rdparty/stackwalker/stackwalker.h
index 0a004d96..0a004d96 100644
--- a/3rdparty/stackwalker/stackwalker.h
+++ b/src/3rdparty/stackwalker/stackwalker.h
diff --git a/3rdparty/stackwalker/stackwalker.pro b/src/3rdparty/stackwalker/stackwalker.pro
index 19e68949..19e68949 100644
--- a/3rdparty/stackwalker/stackwalker.pro
+++ b/src/3rdparty/stackwalker/stackwalker.pro
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 00000000..da54e2f1
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,57 @@
+
+qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/common-lib/configure.cmake")
+qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/package-lib/configure.cmake")
+qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/window-lib/configure.cmake")
+
+add_subdirectory(3rdparty)
+add_subdirectory(common-lib)
+add_subdirectory(application-lib)
+add_subdirectory(package-lib)
+
+if(QT_FEATURE_installer)
+    add_subdirectory(crypto-lib)
+endif()
+
+# if(NOT QT_FEATURE_tools_only)
+    add_subdirectory(plugin-interfaces)
+    add_subdirectory(notification-lib)
+    add_subdirectory(monitor-lib)
+    add_subdirectory(shared-main-lib)
+    add_subdirectory(intent-server-lib)
+    add_subdirectory(intent-client-lib)
+    add_subdirectory(manager-lib)
+    add_subdirectory(window-lib)
+
+    if(TARGET Qt::DBus AND QT_FEATURE_external_dbus_interfaces)
+        add_subdirectory(dbus-lib)
+    endif()
+
+    add_subdirectory(main-lib)
+    add_subdirectory(tools/appman)
+    add_subdirectory(tools/testrunner)
+
+    if(TARGET Qt::DBus)
+        add_subdirectory(launcher-lib)
+    endif()
+
+    # This tool links against everything to extract the Qml type information
+    if (QT_FEATURE_installer AND TARGET Qt::DBus)
+        add_subdirectory(tools/dumpqmltypes)
+    endif()
+
+    if (TARGET Qt::DBus AND QT_FEATURE_multi_process)
+        add_subdirectory(tools/launcher-qml)
+    endif()
+# endif()
+
+if(NOT CMAKE_CROSSCOMPILING OR QT_FEATURE_tools_only)
+    if (QT_FEATURE_installer)
+        add_subdirectory(tools/packager)
+    endif()
+
+    add_subdirectory(tools/uploader)
+endif()
+
+if(TARGET Qt::DBus)
+    add_subdirectory(tools/controller)
+endif()
diff --git a/src/application-lib/CMakeLists.txt b/src/application-lib/CMakeLists.txt
new file mode 100644
index 00000000..d1a648e1
--- /dev/null
+++ b/src/application-lib/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from application-lib.pro.
+
+#####################################################################
+## AppManApplication Module:
+#####################################################################
+
+# temporary hack to get around the "#pragma once not allowed in cpp" error
+set(QT_FEATURE_headersclean FALSE)
+
+qt_internal_add_module(AppManApplicationPrivate
+    CONFIG_MODULE_NAME appman_application
+    STATIC
+    EXCEPTIONS
+    INTERNAL_MODULE
+    SOURCES
+        applicationinfo.cpp applicationinfo.h
+        applicationinterface.cpp applicationinterface.h
+        installationreport.cpp installationreport.h
+        intentinfo.cpp intentinfo.h
+        packagedatabase.cpp packagedatabase.h
+        packageinfo.cpp packageinfo.h
+        packagescanner.h
+        yamlpackagescanner.cpp yamlpackagescanner.h
+    LIBRARIES
+        Qt::AppManCommonPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Network
+)
diff --git a/src/common-lib/CMakeLists.txt b/src/common-lib/CMakeLists.txt
new file mode 100644
index 00000000..75d795d5
--- /dev/null
+++ b/src/common-lib/CMakeLists.txt
@@ -0,0 +1,77 @@
+# Generated from common-lib.pro.
+
+#####################################################################
+## AppManCommon Module:
+#####################################################################
+
+qt_find_package(WrapLibYaml PROVIDED_TARGETS WrapLibYaml::WrapLibYaml)
+
+# temporary hack to get around the "#pragma once not allowed in cpp" error
+set(QT_FEATURE_headersclean FALSE)
+
+qt_internal_add_module(AppManCommonPrivate
+    CONFIG_MODULE_NAME appman_common
+    STATIC
+    EXCEPTIONS
+    INTERNAL_MODULE
+    SOURCES
+        configcache.cpp configcache.h configcache_p.h
+        crashhandler.cpp crashhandler.h
+        dbus-utilities.cpp
+        error.h
+        exception.cpp exception.h
+        global.h
+        logging.cpp logging.h
+        processtitle.cpp processtitle.h
+        qml-utilities.cpp qml-utilities.h
+        qtyaml.cpp qtyaml.h
+        startuptimer.cpp startuptimer.h
+        unixsignalhandler.cpp unixsignalhandler.h
+        utilities.cpp utilities.h
+    PUBLIC_LIBRARIES
+        Qt::Concurrent
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Network
+        Qt::Qml
+        Qt::QmlPrivate
+)
+
+qt_internal_extend_target(AppManCommonPrivate CONDITION TARGET Qt::GeniviExtras
+    DEFINES
+        AM_GENIVIEXTRAS_LAZY_INIT
+    PUBLIC_LIBRARIES
+        Qt::GeniviExtras
+)
+
+qt_internal_extend_target(AppManCommonPrivate CONDITION TARGET Qt::DBus
+    SOURCES
+        dbus-utilities.h
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
+
+qt_internal_extend_target(AppManCommonPrivate CONDITION LINUX
+    PUBLIC_LIBRARIES
+        dl
+)
+
+qt_internal_extend_target(AppManCommonPrivate CONDITION QT_FEATURE_libbacktrace
+    LIBRARIES
+        Qt::BundledBacktrace
+)
+
+qt_internal_extend_target(AppManCommonPrivate CONDITION QT_FEATURE_stackwalker
+    LIBRARIES
+        Qt::BundledStackwalker
+)
+
+qt_internal_extend_target(AppManCommonPrivate CONDITION QT_FEATURE_system_libyaml
+    LIBRARIES
+        WrapLibYaml::WrapLibYaml
+)
+
+qt_internal_extend_target(AppManCommonPrivate CONDITION NOT QT_FEATURE_system_libyaml
+    LIBRARIES
+        Qt::BundledLibYaml
+)
diff --git a/src/common-lib/common-lib.pro b/src/common-lib/common-lib.pro
index 4b1ffda6..d9efdd85 100644
--- a/src/common-lib/common-lib.pro
+++ b/src/common-lib/common-lib.pro
@@ -11,14 +11,12 @@ qtHaveModule(qml):QT *= qml qml-private
 
 linux:LIBS += -ldl
 
-versionAtLeast(QT.geniviextras.VERSION, 1.1.0) {
-    DEFINES += AM_GENIVIEXTRAS_LAZY_INIT
-}
+qtHaveModule(geniviextras):DEFINES *= AM_GENIVIEXTRAS_LAZY_INIT
 
 CONFIG *= static internal_module
 CONFIG -= create_cmake
 
-include($$SOURCE_DIR/3rdparty/libyaml.pri)
+include($$PWD/../../3rdparty/libyaml.pri)
 contains(DEFINES, "AM_USE_LIBBACKTRACE"):include($$SOURCE_DIR/3rdparty/libbacktrace.pri)
 contains(DEFINES, "AM_USE_STACKWALKER"):include($$SOURCE_DIR/3rdparty/stackwalker.pri)
 
diff --git a/src/common-lib/configure.cmake b/src/common-lib/configure.cmake
new file mode 100644
index 00000000..e20cf5f0
--- /dev/null
+++ b/src/common-lib/configure.cmake
@@ -0,0 +1,74 @@
+#### Inputs
+
+set(INPUT_libyaml "undefined" CACHE STRING "")
+set_property(CACHE INPUT_libyaml PROPERTY STRINGS undefined qt system)
+
+
+#### Libraries
+
+qt_find_package(WrapLibYaml PROVIDED_TARGETS WrapLibYaml::WrapLibYaml MODULE_NAME appman_common QMAKE_LIB yaml)
+
+
+#### Tests
+
+
+#### Features
+
+qt_feature("system-libyaml" PRIVATE
+    LABEL "Using system libyaml"
+    CONDITION WrapLibYaml_FOUND
+    ENABLE INPUT_libyaml STREQUAL 'system'
+    DISABLE INPUT_libyaml STREQUAL 'qt'
+)
+
+qt_feature("multi-process" PUBLIC
+    LABEL "Multi-process mode"
+    CONDITION TARGET Qt::DBus AND TARGET Qt::WaylandCompositor AND LINUX
+    ENABLE INPUT_force_mode STREQUAL 'multi'
+    DISABLE INPUT_force_mode STREQUAL 'single'
+)
+qt_feature_definition("multi-process" "AM_MULTI_PROCESS")
+
+qt_feature("installer" PRIVATE
+    LABEL "Enable the installer component"
+    CONDITION QT_FEATURE_ssl
+    DISABLE INPUT_installer STREQUAL 'no'
+)
+qt_feature_definition("installer" "AM_DISABLE_INSTALLER" NEGATE)
+
+qt_feature("external-dbus-interfaces" PRIVATE
+    LABEL "Enable external DBus interfaces"
+    CONDITION NOT INPUT_external_dbus_interfaces STREQUAL 'no' AND TARGET Qt::DBus
+)
+qt_feature_definition("external-dbus-interfaces" "AM_DISABLE_EXTERNAL_DBUS_INTERFACES" NEGATE)
+
+qt_feature("tools-only" PRIVATE
+    LABEL "Tools only build"
+    CONDITION INPUT_tools_only STREQUAL 'yes'
+)
+
+qt_feature("libbacktrace" PRIVATE
+    LABEL "Enable support for libbacktrace"
+    CONDITION LINUX AND ( ( INPUT_libbacktrace STREQUAL 'yes' ) OR ( ( CMAKE_BUILD_TYPE STREQUAL "Debug" ) AND ( NOT INPUT_libbacktrace STREQUAL 'no' ) ) )
+    EMIT_IF LINUX
+)
+qt_feature_definition("libbacktrace" "AM_USE_LIBBACKTRACE")
+
+qt_feature("stackwalker" PRIVATE
+    LABEL "Enable support for StackWalker"
+    CONDITION WIN32 AND ( ( INPUT_stackwalker STREQUAL 'yes' ) OR ( ( CMAKE_BUILD_TYPE STREQUAL "Debug") AND (NOT INPUT_stackwalker STREQUAL 'no' ) ) )
+    EMIT_IF WIN32
+)
+qt_feature_definition("stackwalker" "AM_USE_STACKWALKER")
+
+qt_configure_add_summary_section(NAME "Qt Application Manager")
+qt_configure_add_summary_entry(ARGS "system-libyaml")
+qt_configure_add_summary_entry(ARGS "multi-process")
+qt_configure_add_summary_entry(ARGS "installer")
+qt_configure_add_summary_entry(ARGS "external-dbus-interfaces")
+qt_configure_add_summary_entry(ARGS "tools-only")
+qt_configure_add_summary_entry(ARGS "libbacktrace")
+qt_configure_add_summary_entry(ARGS "stackwalker")
+qt_configure_end_summary_section() # end of "Qt ApplicationManger" section
+
+qt_extra_definition("AM_VERSION" "\"${PROJECT_VERSION}\"" PUBLIC)
diff --git a/src/common-lib/crashhandler.cpp b/src/common-lib/crashhandler.cpp
index 128616c8..bde599fb 100644
--- a/src/common-lib/crashhandler.cpp
+++ b/src/common-lib/crashhandler.cpp
@@ -30,6 +30,7 @@
 ****************************************************************************/
 
 #include <inttypes.h>
+#include <typeinfo>
 
 #if defined(QT_QML_LIB)
 #  include <QPointer>
@@ -57,6 +58,9 @@
 #    define STDERR_FILENO _fileno(stderr)
 #  endif
 #  define write(a, b, c) _write(a, b, static_cast<unsigned int>(c))
+#  if defined(Q_CC_MINGW)
+#    include <cxxabi.h>
+#  endif
 #endif
 
 QT_BEGIN_NAMESPACE_AM
@@ -117,7 +121,6 @@ static struct InitBacktrace
 #    pragma warning(pop)
 
 #  elif defined(Q_OS_WINDOWS) && defined(Q_CC_MINGW)
-#    include <cxxabi.h>
 // this will make it run before all other static constructor functions
 static void initBacktrace() __attribute__((constructor(101)));
 
@@ -656,7 +659,9 @@ static void logCrashInfo(LogToDestination logTo, const char *why, int stackFrame
         // SDK used to compile this code
         typedef HRESULT(WINAPI* GetThreadDescriptionType)(HANDLE hThread, PWSTR *description);
         if (auto GetThreadDescriptionFunc = reinterpret_cast<GetThreadDescriptionType>(
-                    GetProcAddress(::GetModuleHandle(L"kernel32.dll"), "GetThreadDescription"))) {
+                    reinterpret_cast<QFunctionPointer>(
+                        GetProcAddress(::GetModuleHandle(L"kernel32.dll"),
+                                       "GetThreadDescription")))) {
             WCHAR *desc = nullptr;
             if (SUCCEEDED(GetThreadDescriptionFunc(GetCurrentThread(), &desc)))
                 wcscpy_s(threadName, sizeof(threadName) / sizeof(*threadName), desc);
diff --git a/src/common-lib/global.h b/src/common-lib/global.h
index 62ff6989..8b5afe29 100644
--- a/src/common-lib/global.h
+++ b/src/common-lib/global.h
@@ -30,7 +30,8 @@
 ****************************************************************************/
 
 #pragma once
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
+#include <QtAppManCommon/qtappman_common-config.h>
 
 #define QT_BEGIN_NAMESPACE_AM  namespace QtAM {
 #define QT_END_NAMESPACE_AM    }
diff --git a/src/common-lib/qt_cmdline.cmake b/src/common-lib/qt_cmdline.cmake
new file mode 100644
index 00000000..f3641516
--- /dev/null
+++ b/src/common-lib/qt_cmdline.cmake
@@ -0,0 +1,8 @@
+qt_commandline_option(force-single-process TYPE enum NAME force_mode VALUE single)
+qt_commandline_option(force-multi-process TYPE enum NAME force_mode VALUE multi)
+qt_commandline_option(installer TYPE boolean)
+qt_commandline_option(external-dbus-interfaces TYPE boolean)
+qt_commandline_option(tools-only TYPE boolean)
+qt_commandline_option(libbacktrace TYPE boolean)
+qt_commandline_option(stackwalker TYPE boolean)
+qt_commandline_option(libyaml TYPE enum VALUES qt system)
diff --git a/src/crypto-lib/CMakeLists.txt b/src/crypto-lib/CMakeLists.txt
new file mode 100644
index 00000000..ac4c8a4e
--- /dev/null
+++ b/src/crypto-lib/CMakeLists.txt
@@ -0,0 +1,50 @@
+# Generated from crypto-lib.pro.
+
+#####################################################################
+## AppManCrypto Module:
+#####################################################################
+
+# temporary hack to get around the "#pragma once not allowed in cpp" error
+set(QT_FEATURE_headersclean FALSE)
+
+qt_internal_add_module(AppManCryptoPrivate
+    CONFIG_MODULE_NAME appman_crypto
+    STATIC
+    EXCEPTIONS
+    INTERNAL_MODULE
+    SOURCES
+        cryptography.cpp cryptography.h
+        signature.cpp signature.h signature_p.h
+    LIBRARIES
+        Qt::AppManCommonPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+
+qt_internal_extend_target(AppManCryptoPrivate CONDITION WIN32
+    SOURCES
+        signature_win.cpp
+    PUBLIC_LIBRARIES
+        advapi32
+        crypt32
+)
+
+qt_internal_extend_target(AppManCryptoPrivate CONDITION MACOS
+    SOURCES
+        signature_macos.cpp
+    PUBLIC_LIBRARIES
+        ${FWCoreFoundation}
+        ${FWSecurity}
+        Qt::CorePrivate
+)
+
+qt_internal_extend_target(AppManCryptoPrivate CONDITION (UNIX AND NOT MACOS)
+    SOURCES
+        libcryptofunction.cpp libcryptofunction.h
+        signature_openssl.cpp
+    DEFINES
+        AM_USE_LIBCRYPTO
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/src/dbus-lib/CMakeLists.txt b/src/dbus-lib/CMakeLists.txt
new file mode 100644
index 00000000..8c371423
--- /dev/null
+++ b/src/dbus-lib/CMakeLists.txt
@@ -0,0 +1,66 @@
+# Generated from dbus-lib.pro.
+
+#####################################################################
+## AppManDBus Module:
+#####################################################################
+
+# temporary hack to get around the "#pragma once not allowed in cpp" error
+set(QT_FEATURE_headersclean FALSE)
+
+qt_internal_add_module(AppManDBusPrivate
+    CONFIG_MODULE_NAME appman_dbus
+    STATIC
+    EXCEPTIONS
+    INTERNAL_MODULE
+    SOURCES
+        abstractdbuscontextadaptor.cpp abstractdbuscontextadaptor.h
+        applicationmanagerdbuscontextadaptor.cpp applicationmanagerdbuscontextadaptor.h
+        dbusdaemon.cpp dbusdaemon.h
+        dbuspolicy.cpp dbuspolicy.h
+        notificationmanagerdbuscontextadaptor.cpp notificationmanagerdbuscontextadaptor.h
+        windowmanagerdbuscontextadaptor.cpp windowmanagerdbuscontextadaptor.h
+    LIBRARIES
+        Qt::AppManCommonPrivate
+        Qt::AppManManagerPrivate
+        Qt::AppManWindowPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::DBus
+)
+
+#### Keys ignored in scope 1:.:.:dbus-lib.pro:<TRUE>:
+# ADAPTORS_XML = "io.qt.applicationmanager.xml" "io.qt.windowmanager.xml" "org.freedesktop.notifications.xml"
+# MODULE = "appman_dbus"
+# OTHER_FILES = "io.qt.packagemanager.xml" "io.qt.applicationmanager.applicationinterface.xml" "io.qt.applicationmanager.runtimeinterface.xml" "io.qt.applicationmanager.intentinterface.xml" "io.qt.applicationmanager.xml" "io.qt.windowmanager.xml" "org.freedesktop.notifications.xml"
+# QMAKE_EXTRA_TARGETS = "recreate-dbus-xml" "recreate-applicationmanager-dbus-xml" "recreate-packagemanager-dbus-xml" "recreate-windowmanager-dbus-xml"
+# TEMPLATE = "lib"
+# recreate-applicationmanager-dbus-xml.CONFIG = "phony"
+# recreate-applicationmanager-dbus-xml.commands = "$$QDBUSCPP2XML" "-a" "$$PWD/../manager-lib/applicationmanager.h" "-o" "$$PWD/io.qt.applicationmanager.xml"
+# recreate-dbus-xml.depends = "recreate-applicationmanager-dbus-xml" "recreate-applicationinstaller-dbus-xml" "recreate-windowmanager-dbus-xml"
+# recreate-packagemanager-dbus-xml.CONFIG = "phony"
+# recreate-packagemanager-dbus-xml.commands = "$$QDBUSCPP2XML" "-a" "$$PWD/../manager-lib/packagemanager.h" "-o" "$$PWD/io.qt.packagemanager.xml"
+# recreate-windowmanager-dbus-xml.CONFIG = "phony"
+# recreate-windowmanager-dbus-xml.commands = "$$QDBUSCPP2XML" "-a" "$$PWD/../manager/windowmanager.h" "-o" "$$PWD/io.qt.windowmanager.xml"
+
+
+qtam_internal_add_dbus_adaptor(AppManDBusPrivate
+    DBUS_ADAPTOR_SOURCES
+        io.qt.applicationmanager.xml
+        io.qt.windowmanager.xml
+        org.freedesktop.notifications.xml
+    DBUS_ADAPTOR_FLAGS
+        -i dbus-utilities.h
+)
+
+if (QT_FEATURE_installer)
+    qtam_internal_add_dbus_adaptor(AppManDBusPrivate
+        DBUS_ADAPTOR_SOURCES
+            io.qt.packagemanager.xml
+        DBUS_ADAPTOR_FLAGS
+            -i dbus-utilities.h
+    )
+    qt_internal_extend_target(AppManDBusPrivate
+        SOURCES
+            packagemanagerdbuscontextadaptor.cpp packagemanagerdbuscontextadaptor.h
+    )
+endif()
diff --git a/src/intent-client-lib/CMakeLists.txt b/src/intent-client-lib/CMakeLists.txt
new file mode 100644
index 00000000..fc932c17
--- /dev/null
+++ b/src/intent-client-lib/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from intent-client-lib.pro.
+
+#####################################################################
+## AppManIntentClient Module:
+#####################################################################
+
+# temporary hack to get around the "#pragma once not allowed in cpp" error
+set(QT_FEATURE_headersclean FALSE)
+
+qt_internal_add_module(AppManIntentClientPrivate
+    CONFIG_MODULE_NAME appman_intent_client
+    STATIC
+    EXCEPTIONS
+    INTERNAL_MODULE
+    SOURCES
+        intentclient.cpp intentclient.h
+        intentclientrequest.cpp intentclientrequest.h
+        intentclientsysteminterface.cpp intentclientsysteminterface.h
+        intenthandler.cpp intenthandler.h
+    LIBRARIES
+        Qt::AppManCommonPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Network
+        Qt::Qml
+)
diff --git a/src/intent-server-lib/CMakeLists.txt b/src/intent-server-lib/CMakeLists.txt
new file mode 100644
index 00000000..30a6b020
--- /dev/null
+++ b/src/intent-server-lib/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from intent-server-lib.pro.
+
+#####################################################################
+## AppManIntentServer Module:
+#####################################################################
+
+# temporary hack to get around the "#pragma once not allowed in cpp" error
+set(QT_FEATURE_headersclean FALSE)
+
+qt_internal_add_module(AppManIntentServerPrivate
+    CONFIG_MODULE_NAME appman_intent_server
+    STATIC
+    EXCEPTIONS
+    INTERNAL_MODULE
+    SOURCES
+        intent.cpp intent.h
+        intentmodel.cpp intentmodel.h
+        intentserver.cpp intentserver.h
+        intentserverrequest.cpp intentserverrequest.h
+        intentserversysteminterface.cpp intentserversysteminterface.h
+    LIBRARIES
+        Qt::AppManCommonPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Network
+        Qt::Qml
+)
diff --git a/src/launcher-lib/CMakeLists.txt b/src/launcher-lib/CMakeLists.txt
new file mode 100644
index 00000000..12e77a68
--- /dev/null
+++ b/src/launcher-lib/CMakeLists.txt
@@ -0,0 +1,60 @@
+# Generated from launcher-lib.pro.
+
+#####################################################################
+## AppManLauncher Module:
+#####################################################################
+
+# temporary hack to get around the "#pragma once not allowed in cpp" error
+set(QT_FEATURE_headersclean FALSE)
+
+qt_internal_add_module(AppManLauncherPrivate
+    CONFIG_MODULE_NAME appman_launcher
+    STATIC
+    EXCEPTIONS
+    INTERNAL_MODULE
+    SOURCES
+        applicationmanagerwindow.cpp applicationmanagerwindow_p.h
+        dbusapplicationinterface.cpp dbusapplicationinterface.h
+        dbusapplicationinterfaceextension.cpp dbusapplicationinterfaceextension.h
+        dbusnotification.cpp dbusnotification.h
+        intentclientdbusimplementation.cpp intentclientdbusimplementation.h
+        ipcwrapperobject.cpp ipcwrapperobject.h ipcwrapperobject_p.h
+        launchermain.cpp launchermain.h
+    DBUS_INTERFACE_SOURCES
+        ../dbus-lib/io.qt.applicationmanager.intentinterface.xml
+    LIBRARIES
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManIntentClientPrivate
+        Qt::AppManNotificationPrivate
+        Qt::AppManSharedMainPrivate
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::DBus
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Qml
+        Qt::Quick
+        Qt::QuickPrivate
+)
+
+qt_internal_extend_target(AppManLauncherPrivate CONDITION QT_FEATURE_widgets_support AND TARGET Qt::Widgets
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
+
+if(TARGET Qt::WaylandClient)
+
+    qt6_generate_wayland_protocol_client_sources(AppManLauncherPrivate
+        FILES
+            ${CMAKE_CURRENT_SOURCE_DIR}/../wayland-extensions/qtam-extension.xml
+    )
+endif()
+
+qt_internal_extend_target(AppManLauncherPrivate CONDITION TARGET Qt::WaylandClient
+    SOURCES
+        waylandqtamclientextension.cpp waylandqtamclientextension_p.h
+    PUBLIC_LIBRARIES
+        Qt::WaylandClient
+        Qt::WaylandClientPrivate
+)
diff --git a/src/main-lib/CMakeLists.txt b/src/main-lib/CMakeLists.txt
new file mode 100644
index 00000000..7aafc9e3
--- /dev/null
+++ b/src/main-lib/CMakeLists.txt
@@ -0,0 +1,55 @@
+# Generated from main-lib.pro.
+
+#####################################################################
+## AppManMain Module:
+#####################################################################
+
+# temporary hack to get around the "#pragma once not allowed in cpp" error
+set(QT_FEATURE_headersclean FALSE)
+
+qt_internal_add_module(AppManMainPrivate
+    CONFIG_MODULE_NAME appman_main
+    STATIC
+    EXCEPTIONS
+    INTERNAL_MODULE
+    SOURCES
+        applicationinstaller.cpp applicationinstaller.h
+        configuration.cpp configuration.h configuration_p.h
+        defaultconfiguration.cpp defaultconfiguration.h
+        main.cpp main.h
+        windowframetimer.cpp windowframetimer.h
+    DEFINES
+        AM_BUILD_DIR=\\\"\\\"
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::Network
+        Qt::Qml
+        Qt::Quick
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManIntentServerPrivate
+        Qt::AppManManagerPrivate
+        Qt::AppManMonitorPrivate
+        Qt::AppManNotificationPrivate
+        Qt::AppManPackagePrivate
+        Qt::AppManSharedMainPrivate
+        Qt::AppManWindowPrivate
+)
+
+qt_internal_extend_target(AppManMainPrivate CONDITION QT_FEATURE_widgets_support AND TARGET Qt::Widgets
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
+
+qt_internal_extend_target(AppManMainPrivate CONDITION TARGET Qt::DBus AND QT_FEATURE_external_dbus_interfaces
+    PUBLIC_LIBRARIES
+        Qt::DBus
+        Qt::AppManDBusPrivate
+)
+
+qt_internal_extend_target(AppManMainPrivate CONDITION WIN32
+    PUBLIC_LIBRARIES
+        user32
+)
diff --git a/src/main-lib/main.h b/src/main-lib/main.h
index e7ddb5f2..d6d7e31a 100644
--- a/src/main-lib/main.h
+++ b/src/main-lib/main.h
@@ -33,9 +33,10 @@
 
 #include <QUrl>
 #include <QtAppManCommon/global.h>
+#include <QtAppManWindow/qtappman_window-config.h>
 #include <functional>
 
-#if defined(AM_ENABLE_WIDGETS)
+#if defined(AM_WIDGETS_SUPPORT)
 #  include <QApplication>
 #  include <QSurfaceFormat>
 typedef QApplication MainBase;
diff --git a/src/manager-lib/CMakeLists.txt b/src/manager-lib/CMakeLists.txt
new file mode 100644
index 00000000..45852406
--- /dev/null
+++ b/src/manager-lib/CMakeLists.txt
@@ -0,0 +1,90 @@
+# Generated from manager-lib.pro.
+
+#####################################################################
+## AppManManager Module:
+#####################################################################
+
+include(QtAppManHelpers)
+
+# temporary hack to get around the "#pragma once not allowed in cpp" error
+set(QT_FEATURE_headersclean FALSE)
+
+qt_internal_add_module(AppManManagerPrivate
+    CONFIG_MODULE_NAME appman_manager
+    STATIC
+    EXCEPTIONS
+    INTERNAL_MODULE
+    SOURCES
+        ../plugin-interfaces/containerinterface.h
+        abstractcontainer.cpp abstractcontainer.h
+        abstractruntime.cpp abstractruntime.h
+        amnamespace.h
+        application.cpp application.h
+        applicationipcinterface.cpp applicationipcinterface.h applicationipcinterface_p.h
+        applicationipcmanager.cpp applicationipcmanager.h
+        applicationmanager.cpp applicationmanager.h applicationmanager_p.h
+        applicationmodel.cpp applicationmodel.h
+        asynchronoustask.cpp asynchronoustask.h
+        containerfactory.cpp containerfactory.h
+        debugwrapper.cpp debugwrapper.h
+        inprocesssurfaceitem.cpp inprocesssurfaceitem.h
+        intentaminterface.cpp intentaminterface.h
+        notificationmanager.cpp notificationmanager.h
+        package.cpp package.h
+        packagemanager.cpp packagemanager.h packagemanager_p.h
+        plugincontainer.cpp plugincontainer.h
+        processstatus.cpp processstatus.h
+        qmlinprocessapplicationmanagerwindow.cpp qmlinprocessapplicationmanagerwindow.h
+        qmlinprocessapplicationinterface.cpp qmlinprocessapplicationinterface.h
+        qmlinprocessruntime.cpp qmlinprocessruntime.h
+        quicklauncher.cpp quicklauncher.h
+        runtimefactory.cpp runtimefactory.h
+    LIBRARIES
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManIntentClientPrivate
+        Qt::AppManIntentServerPrivate
+        Qt::AppManMonitorPrivate
+        Qt::AppManNotificationPrivate
+        Qt::AppManPluginInterfacesPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Network
+        Qt::Qml
+        Qt::QmlPrivate
+        Qt::Quick
+        Qt::QuickPrivate
+)
+
+qt_internal_extend_target(AppManManagerPrivate CONDITION QT_FEATURE_multi_process
+    SOURCES
+        nativeruntime.cpp nativeruntime.h nativeruntime_p.h
+        processcontainer.cpp processcontainer.h
+    PUBLIC_LIBRARIES
+        Qt::DBus
+        dl
+)
+
+if (QT_FEATURE_multi_process)
+    qtam_internal_add_dbus_adaptor(AppManManagerPrivate
+        DBUS_ADAPTOR_SOURCES
+            ../dbus-lib/io.qt.applicationmanager.intentinterface.xml
+    )
+endif()
+
+qt_internal_extend_target(AppManManagerPrivate CONDITION (TARGET Qt::WaylandCompositor OR QT_FEATURE_installer)
+    SOURCES
+        sudo.cpp sudo.h
+)
+
+qt_internal_extend_target(AppManManagerPrivate CONDITION QT_FEATURE_installer
+    SOURCES
+        deinstallationtask.cpp deinstallationtask.h
+        installationtask.cpp installationtask.h
+        scopeutilities.cpp scopeutilities.h
+    LIBRARIES
+        Qt::AppManCryptoPrivate
+        Qt::AppManPackagePrivate
+)
diff --git a/src/manager-lib/applicationipcinterface.cpp b/src/manager-lib/applicationipcinterface.cpp
index 88cb1797..e8f3f98c 100644
--- a/src/manager-lib/applicationipcinterface.cpp
+++ b/src/manager-lib/applicationipcinterface.cpp
@@ -51,6 +51,10 @@
 #include "applicationipcinterface.h"
 #include "applicationipcinterface_p.h"
 
+#if defined(interface)
+#  undef interface
+#endif
+
 /*!
     \qmltype ApplicationIPCInterface
     \ingroup system-ui-instantiable
diff --git a/src/manager-lib/scopeutilities.h b/src/manager-lib/scopeutilities.h
index a9019eb2..994e30cc 100644
--- a/src/manager-lib/scopeutilities.h
+++ b/src/manager-lib/scopeutilities.h
@@ -89,6 +89,7 @@ private:
     bool m_taken = false;
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(ScopedRenamer::Modes)
+
 QT_END_NAMESPACE_AM
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(QT_PREPEND_NAMESPACE_AM(ScopedRenamer::Modes))
diff --git a/src/monitor-lib/CMakeLists.txt b/src/monitor-lib/CMakeLists.txt
new file mode 100644
index 00000000..77746240
--- /dev/null
+++ b/src/monitor-lib/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from monitor-lib.pro.
+
+#####################################################################
+## AppManMonitor Module:
+#####################################################################
+
+# temporary hack to get around the "#pragma once not allowed in cpp" error
+set(QT_FEATURE_headersclean FALSE)
+
+qt_internal_add_module(AppManMonitorPrivate
+    CONFIG_MODULE_NAME appman_monitor
+    STATIC
+    EXCEPTIONS
+    INTERNAL_MODULE
+    SOURCES
+        processreader.cpp processreader.h
+        systemreader.cpp systemreader.h
+    LIBRARIES
+        Qt::AppManCommonPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+)
+
+qt_internal_extend_target(AppManMonitorPrivate CONDITION LINUX
+    SOURCES
+        sysfsreader.cpp sysfsreader.h
+)
diff --git a/src/monitor-lib/systemreader.cpp b/src/monitor-lib/systemreader.cpp
index c02d9b0d..e89c1ad0 100644
--- a/src/monitor-lib/systemreader.cpp
+++ b/src/monitor-lib/systemreader.cpp
@@ -154,6 +154,7 @@ GpuVendor::Vendor GpuVendor::get()
 void GpuVendor::fetch()
 {
     QByteArray vendor;
+#if !defined(QT_NO_OPENGL)
     auto readVendor = [&vendor](QOpenGLContext *c) {
         const GLubyte *p = c->functions()->glGetString(GL_VENDOR);
         if (p)
@@ -173,6 +174,7 @@ void GpuVendor::fetch()
             context.doneCurrent();
         }
     }
+#endif
     if (vendor.contains("intel"))
         s_vendor = Intel;
     else if (vendor.contains("nvidia"))
diff --git a/src/notification-lib/CMakeLists.txt b/src/notification-lib/CMakeLists.txt
new file mode 100644
index 00000000..b60ffac0
--- /dev/null
+++ b/src/notification-lib/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from notification-lib.pro.
+
+#####################################################################
+## AppManNotification Module:
+#####################################################################
+
+# temporary hack to get around the "#pragma once not allowed in cpp" error
+set(QT_FEATURE_headersclean FALSE)
+
+qt_internal_add_module(AppManNotificationPrivate
+    CONFIG_MODULE_NAME appman_notification
+    STATIC
+    EXCEPTIONS
+    INTERNAL_MODULE
+    SOURCES
+        notification.cpp notification.h
+    LIBRARIES
+        Qt::AppManCommonPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Qml
+)
diff --git a/src/package-lib/CMakeLists.txt b/src/package-lib/CMakeLists.txt
new file mode 100644
index 00000000..6f6fbab3
--- /dev/null
+++ b/src/package-lib/CMakeLists.txt
@@ -0,0 +1,37 @@
+# Generated from package-lib.pro.
+
+#####################################################################
+## AppManPackage Module:
+#####################################################################
+
+qt_find_package(WrapLibArchive PROVIDED_TARGETS WrapLibArchive::WrapLibArchive)
+
+# temporary hack to get around the "#pragma once not allowed in cpp" error
+set(QT_FEATURE_headersclean FALSE)
+
+qt_internal_add_module(AppManPackagePrivate
+    CONFIG_MODULE_NAME appman_package
+    STATIC
+    EXCEPTIONS
+    INTERNAL_MODULE
+    SOURCES
+        packagecreator.cpp packagecreator.h packagecreator_p.h
+        packageextractor.cpp packageextractor.h packageextractor_p.h
+        packageutilities.cpp packageutilities.h packageutilities_p.h
+    LIBRARIES
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Network
+)
+
+qt_internal_extend_target(AppManPackagePrivate CONDITION QT_FEATURE_system_libarchive
+    LIBRARIES
+        WrapLibArchive::WrapLibArchive
+)
+
+qt_internal_extend_target(AppManPackagePrivate CONDITION NOT QT_FEATURE_system_libarchive
+    LIBRARIES
+        Qt::BundledLibArchive
+)
diff --git a/src/package-lib/configure.cmake b/src/package-lib/configure.cmake
new file mode 100644
index 00000000..e4b58d81
--- /dev/null
+++ b/src/package-lib/configure.cmake
@@ -0,0 +1,23 @@
+#### Inputs
+
+set(INPUT_libarchive "undefined" CACHE STRING "")
+set_property(CACHE INPUT_libarchive PROPERTY STRINGS undefined qt system)
+
+#### Libraries
+
+qt_find_package(WrapLibArchive PROVIDED_TARGETS WrapLibArchive::WrapLibArchive MODULE_NAME appman_package QMAKE_LIB archive)
+
+#### Tests
+
+#### Features
+
+qt_feature("system-libarchive" PRIVATE
+    LABEL "Using system libarchive"
+    CONDITION WrapLibArchive_FOUND
+    ENABLE INPUT_libarchive STREQUAL 'system'
+    DISABLE INPUT_libarchive STREQUAL 'qt'
+)
+
+qt_configure_add_summary_section(NAME "Qt Application Manager [Packaging module]")
+qt_configure_add_summary_entry(ARGS "system-libarchive")
+qt_configure_end_summary_section() # end of "Qt ApplicationManger" section
diff --git a/src/package-lib/qt_cmdline.cmake b/src/package-lib/qt_cmdline.cmake
new file mode 100644
index 00000000..01007197
--- /dev/null
+++ b/src/package-lib/qt_cmdline.cmake
@@ -0,0 +1 @@
+qt_commandline_option(libarchive TYPE enum VALUES qt system)
diff --git a/src/plugin-interfaces/CMakeLists.txt b/src/plugin-interfaces/CMakeLists.txt
new file mode 100644
index 00000000..21584521
--- /dev/null
+++ b/src/plugin-interfaces/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from plugin-interfaces.pro.
+
+#####################################################################
+## AppManPluginInterfaces Module:
+#####################################################################
+
+# temporary hack to get around the "#pragma once not allowed in cpp" error
+set(QT_FEATURE_headersclean FALSE)
+
+qt_internal_add_module(AppManPluginInterfacesPrivate
+    CONFIG_MODULE_NAME appman_plugininterfaces
+    STATIC
+    EXCEPTIONS
+    INTERNAL_MODULE
+    SOURCES
+        containerinterface.cpp containerinterface.h
+        startupinterface.cpp startupinterface.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
diff --git a/src/shared-main-lib/CMakeLists.txt b/src/shared-main-lib/CMakeLists.txt
new file mode 100644
index 00000000..16ad324a
--- /dev/null
+++ b/src/shared-main-lib/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from shared-main-lib.pro.
+
+#####################################################################
+## AppManSharedMain Module:
+#####################################################################
+
+# temporary hack to get around the "#pragma once not allowed in cpp" error
+set(QT_FEATURE_headersclean FALSE)
+
+qt_internal_add_module(AppManSharedMainPrivate
+    CONFIG_MODULE_NAME appman_shared_main
+    STATIC
+    EXCEPTIONS
+    INTERNAL_MODULE
+    SOURCES
+        cpustatus.cpp cpustatus.h
+        frametimer.cpp frametimer.h
+        gpustatus.cpp gpustatus.h
+        iostatus.cpp iostatus.h
+        memorystatus.cpp memorystatus.h
+        monitormodel.cpp monitormodel.h
+        qmllogger.cpp qmllogger.h
+        sharedmain.cpp sharedmain.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Network
+        Qt::Qml
+        Qt::Quick
+        Qt::AppManCommonPrivate
+        Qt::AppManMonitorPrivate
+)
diff --git a/src/shared-main-lib/sharedmain.cpp b/src/shared-main-lib/sharedmain.cpp
index 051d25db..c24fe4b1 100644
--- a/src/shared-main-lib/sharedmain.cpp
+++ b/src/shared-main-lib/sharedmain.cpp
@@ -93,6 +93,7 @@ void SharedMain::initialize()
 
     s_initialized = true;
 
+#if !defined(QT_NO_OPENGL)
     // this is needed for both WebEngine and Wayland Multi-screen rendering
     QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
 
@@ -101,6 +102,7 @@ void SharedMain::initialize()
     // to parse the requested format from the config files - the creation is completed later
     // in setupOpenGL().
     qt_gl_set_global_share_context(new QOpenGLContext());
+#endif
 
 #if defined(Q_OS_UNIX) && defined(AM_MULTI_PROCESS)
     // set a reasonable default for OSes/distros that do not set this by default
@@ -158,6 +160,7 @@ void SharedMain::setupLogging(bool verbose, const QStringList &loggingRules,
 
 void SharedMain::setupOpenGL(const QVariantMap &openGLConfiguration)
 {
+#if !defined(QT_NO_OPENGL)
     QString profileName = openGLConfiguration.value(qSL("desktopProfile")).toString();
     int majorVersion = openGLConfiguration.value(qSL("esMajorVersion"), -1).toInt();
     int minorVersion = openGLConfiguration.value(qSL("esMinorVersion"), -1).toInt();
@@ -230,10 +233,14 @@ void SharedMain::setupOpenGL(const QVariantMap &openGLConfiguration)
 
     // check if we got what we requested on the OpenGL side
     checkOpenGLFormat("global shared context", globalContext->format());
+#else
+    Q_UNUSED(openGLConfiguration)
+#endif
 }
 
 void SharedMain::checkOpenGLFormat(const char *what, const QSurfaceFormat &format) const
 {
+#if !defined(QT_NO_OPENGL)
     if ((m_requestedOpenGLProfile != QSurfaceFormat::NoProfile)
             && (format.profile() != m_requestedOpenGLProfile)) {
         qCWarning(LogGraphics) << "Failed to get the requested OpenGL profile"
@@ -252,6 +259,10 @@ void SharedMain::checkOpenGLFormat(const char *what, const QSurfaceFormat &forma
                                              << format.minorVersion() << " instead";
         }
     }
+#else
+    Q_UNUSED(what)
+    Q_UNUSED(format)
+#endif
 }
 
 QT_END_NAMESPACE_AM
diff --git a/src/tools/appman/CMakeLists.txt b/src/tools/appman/CMakeLists.txt
new file mode 100644
index 00000000..515dd098
--- /dev/null
+++ b/src/tools/appman/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from appman.pro.
+
+#####################################################################
+## appman Tool:
+#####################################################################
+
+qt_get_tool_target_name(target_name appman)
+qt_internal_add_tool(${target_name}
+    USER_FACING
+    EXCEPTIONS
+    TOOLS_TARGET AppManMainPrivate
+    SOURCES
+        appman.cpp
+    PUBLIC_LIBRARIES
+        Qt::AppManMainPrivate
+)
+
+#### Keys ignored in scope 1:.:.:appman.pro:<TRUE>:
+# GIT_VERSION = "$$cat($$SOURCE_DIR/.tag, lines)"
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 4:.:.:appman.pro:UNIX AND EXISTS _ss_SOURCE_DIR/.git:
+# GIT_VERSION = "$$system(cd "$$SOURCE_DIR" && git describe --tags --always --dirty 2>/dev/null)"
+
+#### Keys ignored in scope 5:.:.:appman.pro:else:
+# GIT_VERSION = "unknown"
+
+#### Keys ignored in scope 6:.:.:appman.pro:ANDROID:
+# INSTALLS = <EMPTY>
diff --git a/src/tools/controller/CMakeLists.txt b/src/tools/controller/CMakeLists.txt
new file mode 100644
index 00000000..a31b5ce4
--- /dev/null
+++ b/src/tools/controller/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from controller.pro.
+
+#####################################################################
+## appman-controller Tool:
+#####################################################################
+
+qt_get_tool_target_name(target_name appman-controller)
+qt_internal_add_tool(${target_name}
+    USER_FACING
+    EXCEPTIONS
+    TOOLS_TARGET AppManMainPrivate
+    SOURCES
+        controller.cpp
+        interrupthandler.cpp interrupthandler.h
+    PUBLIC_LIBRARIES
+        Qt::DBus
+        Qt::Network
+        Qt::AppManCommonPrivate
+)
+qt_internal_extend_target(${target_name}
+    DBUS_INTERFACE_SOURCES
+        ../../dbus-lib/io.qt.packagemanager.xml
+)
+qt_internal_extend_target(${target_name}
+    DBUS_INTERFACE_SOURCES
+        ../../dbus-lib/io.qt.applicationmanager.xml
+    DBUS_INTERFACE_FLAGS
+        -i dbus-utilities.h
+)
diff --git a/src/tools/dumpqmltypes/CMakeLists.txt b/src/tools/dumpqmltypes/CMakeLists.txt
new file mode 100644
index 00000000..1f48b9f7
--- /dev/null
+++ b/src/tools/dumpqmltypes/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from dumpqmltypes.pro.
+
+#####################################################################
+## appman-dumpqmltypes Tool:
+#####################################################################
+
+qt_get_tool_target_name(target_name appman-dumpqmltypes)
+qt_internal_add_tool(${target_name}
+    EXCEPTIONS
+    TOOLS_TARGET AppManMainPrivate
+    SOURCES
+        dumpqmltypes.cpp
+    PUBLIC_LIBRARIES
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManIntentClientPrivate
+        Qt::AppManIntentServerPrivate
+        Qt::AppManLauncherPrivate
+        Qt::AppManMainPrivate
+        Qt::AppManManagerPrivate
+        Qt::AppManMonitorPrivate
+        Qt::AppManNotificationPrivate
+        Qt::AppManSharedMainPrivate
+        Qt::AppManWindowPrivate
+)
+
+#### Keys ignored in scope 1:.:.:dumpqmltypes.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:dumpqmltypes.pro:NOT CMAKE_CROSSCOMPILING:
+# QT_TOOL_ENV = <EMPTY>
+
+#### Keys ignored in scope 3:.:.:dumpqmltypes.pro:build_pass OR NOT debug_and_release:
+# INSTALLS = "qmltypes_file"
+# QMAKE_POST_LINK = "$$QMLPLUGINDUMP" "$$SOURCE_DIR/qmltypes"
+# qmltypes_file.CONFIG = "no_check_exist" "directory"
+# qmltypes_file.files = "$$SOURCE_DIR/qmltypes/QtApplicationManager"
+# qmltypes_file.path = "$$[QT_INSTALL_QML]"
diff --git a/src/tools/launcher-qml/CMakeLists.txt b/src/tools/launcher-qml/CMakeLists.txt
new file mode 100644
index 00000000..60da4b95
--- /dev/null
+++ b/src/tools/launcher-qml/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from launcher-qml.pro.
+
+#####################################################################
+## appman-launcher-qml Tool:
+#####################################################################
+
+qt_get_tool_target_name(target_name appman-launcher-qml)
+qt_internal_add_tool(${target_name}
+    EXCEPTIONS
+    TOOLS_TARGET AppManMainPrivate
+    SOURCES
+        launcher-qml.cpp launcher-qml_p.h
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::DBus
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Qml
+        Qt::Quick
+        Qt::QuickPrivate
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManLauncherPrivate
+        Qt::AppManMonitorPrivate
+        Qt::AppManNotificationPrivate
+        Qt::AppManPluginInterfacesPrivate
+        Qt::AppManSharedMainPrivate
+)
+
+#### Keys ignored in scope 1:.:.:launcher-qml.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/src/tools/launcher-qml/launcher-qml.cpp b/src/tools/launcher-qml/launcher-qml.cpp
index f63cfa5c..7a7e1046 100644
--- a/src/tools/launcher-qml/launcher-qml.cpp
+++ b/src/tools/launcher-qml/launcher-qml.cpp
@@ -50,6 +50,7 @@
 #include <qplatformdefs.h>
 
 #include <QtAppManLauncher/launchermain.h>
+#include <QtAppManWindow/qtappman_window-config.h>
 
 #include <QGuiApplication>
 #include <QQuickItem>
@@ -85,7 +86,7 @@
 #include "memorystatus.h"
 #include "monitormodel.h"
 
-#if defined(AM_ENABLE_WIDGETS)
+#if defined(AM_WIDGETS_SUPPORT)
 #  include <QApplication>
 using Application = QApplication;
 #else
diff --git a/src/tools/packager/CMakeLists.txt b/src/tools/packager/CMakeLists.txt
new file mode 100644
index 00000000..02c6d3b7
--- /dev/null
+++ b/src/tools/packager/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from packager.pro.
+
+#####################################################################
+## appman-packager Tool:
+#####################################################################
+
+qt_get_tool_target_name(target_name appman-packager)
+qt_internal_add_tool(${target_name}
+    USER_FACING
+    EXCEPTIONS
+    TOOLS_TARGET AppManMainPrivate
+    SOURCES
+        packager.cpp
+        packagingjob.cpp packagingjob.h
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManCryptoPrivate
+        Qt::AppManPackagePrivate
+)
diff --git a/src/tools/testrunner/CMakeLists.txt b/src/tools/testrunner/CMakeLists.txt
new file mode 100644
index 00000000..c66c5d9f
--- /dev/null
+++ b/src/tools/testrunner/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from testrunner.pro.
+
+#####################################################################
+## appman-qmltestrunner Tool:
+#####################################################################
+
+qt_get_tool_target_name(target_name appman-qmltestrunner)
+qt_internal_add_tool(${target_name}
+    EXCEPTIONS
+    TOOLS_TARGET AppManMainPrivate
+    SOURCES
+        ../appman/appman.cpp
+        amtest.cpp amtest.h
+        testrunner.cpp testrunner.h testrunner_p.h
+    DEFINES
+        AM_TESTRUNNER
+    PUBLIC_LIBRARIES
+        Qt::QuickTest
+        Qt::QuickTestPrivate
+        Qt::TestPrivate
+        Qt::AppManMainPrivate
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:testrunner.pro:ANDROID:
+# INSTALLS = <EMPTY>
+
+#### Keys ignored in scope 6:.:../appman:../appman/appman.pro:UNIX AND EXISTS _ss_SOURCE_DIR/.git:
+# GIT_VERSION = "$$system(cd "$$SOURCE_DIR" && git describe --tags --always --dirty 2>/dev/null)"
+
+#### Keys ignored in scope 7:.:../appman:../appman/appman.pro:else:
+# GIT_VERSION = "unknown"
diff --git a/src/tools/uploader/CMakeLists.txt b/src/tools/uploader/CMakeLists.txt
new file mode 100644
index 00000000..bb6555ac
--- /dev/null
+++ b/src/tools/uploader/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from uploader.pro.
+
+#####################################################################
+## package-uploader Tool:
+#####################################################################
+
+qt_get_tool_target_name(target_name package-uploader)
+qt_internal_add_tool(${target_name}
+    USER_FACING
+    EXCEPTIONS
+    TOOLS_TARGET AppManMainPrivate
+    SOURCES
+        uploader.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManCommonPrivate
+)
+
+#### Keys ignored in scope 1:.:.:uploader.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/src/window-lib/CMakeLists.txt b/src/window-lib/CMakeLists.txt
new file mode 100644
index 00000000..3b0b647d
--- /dev/null
+++ b/src/window-lib/CMakeLists.txt
@@ -0,0 +1,59 @@
+# Generated from window-lib.pro.
+
+#####################################################################
+## AppManWindow Module:
+#####################################################################
+
+# temporary hack to get around the "#pragma once not allowed in cpp" error
+set(QT_FEATURE_headersclean FALSE)
+
+qt_internal_add_module(AppManWindowPrivate
+    CONFIG_MODULE_NAME appman_window
+    STATIC
+    EXCEPTIONS
+    INTERNAL_MODULE
+    SOURCES
+        inprocesswindow.cpp inprocesswindow.h
+        touchemulation.cpp touchemulation.h
+        window.cpp window.h
+        windowitem.cpp windowitem.h
+        windowmanager.cpp windowmanager.h windowmanager_p.h
+    LIBRARIES
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManManagerPrivate
+        Qt::AppManMonitorPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::Network
+        Qt::Qml
+        Qt::Quick
+)
+
+if(QT_FEATURE_multi_process)
+
+    qt6_generate_wayland_protocol_server_sources(AppManWindowPrivate
+        FILES
+            ${CMAKE_CURRENT_SOURCE_DIR}/../wayland-extensions/qtam-extension.xml
+    )
+
+    qt_internal_extend_target(AppManWindowPrivate
+        SOURCES
+            waylandcompositor.cpp waylandcompositor.h
+            waylandqtamserverextension.cpp waylandqtamserverextension_p.h
+            waylandwindow.cpp waylandwindow.h
+        PUBLIC_LIBRARIES
+            Qt::WaylandCompositor
+    )
+endif()
+
+qt_internal_extend_target(AppManWindowPrivate CONDITION QT_FEATURE_touch_emulation
+    SOURCES
+        touchemulation_x11.cpp touchemulation_x11_p.h
+    LIBRARIES
+        Qt::GuiPrivate
+        Qt::Test
+        X11::Xi
+)
diff --git a/src/window-lib/configure.cmake b/src/window-lib/configure.cmake
new file mode 100644
index 00000000..76822c57
--- /dev/null
+++ b/src/window-lib/configure.cmake
@@ -0,0 +1,29 @@
+#### Inputs
+
+#### Libraries
+
+find_package(X11)
+
+#### Tests
+
+#### Features
+
+qt_feature("touch-emulation" PRIVATE
+    LABEL "Touch emulation support on X11"
+    CONDITION X11_Xi_FOUND AND LINUX
+    EMIT_IF LINUX
+)
+qt_feature_definition("touch-emulation" "AM_ENABLE_TOUCH_EMULATION")
+
+qt_feature("widgets-support" PRIVATE PUBLIC
+    LABEL "Enable support for Qt widgets"
+    CONDITION INPUT_widgets_support STREQUAL 'yes' AND TARGET Qt::Widgets
+)
+qt_feature_definition("widgets-support" "AM_WIDGETS_SUPPORT")
+
+qt_configure_add_summary_section(NAME "Qt Application Manager [Window module]")
+qt_configure_add_summary_entry(ARGS "touch-emulation")
+qt_configure_add_summary_entry(ARGS "widgets-support")
+qt_configure_end_summary_section() # end of "Qt ApplicationManger" section
+
+qt_extra_definition("AM_VERSION" "\"${PROJECT_VERSION}\"" PUBLIC)
diff --git a/src/window-lib/qt_cmdline.cmake b/src/window-lib/qt_cmdline.cmake
new file mode 100644
index 00000000..99183336
--- /dev/null
+++ b/src/window-lib/qt_cmdline.cmake
@@ -0,0 +1 @@
+qt_commandline_option(widgets-support TYPE boolean)
diff --git a/src/window-lib/touchemulation_x11_p.h b/src/window-lib/touchemulation_x11_p.h
index 1f2f1390..3d6385dd 100644
--- a/src/window-lib/touchemulation_x11_p.h
+++ b/src/window-lib/touchemulation_x11_p.h
@@ -32,6 +32,7 @@
 #pragma once
 
 #include <QtAppManCommon/global.h>
+#include <QtAppManWindow/qtappman_window-config.h>
 #include "touchemulation.h"
 
 #if defined(AM_ENABLE_TOUCH_EMULATION)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 00000000..c36223a4
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from tests.pro.
+
+if(QT_BUILD_STANDALONE_TESTS)
+    # Add qt_find_package calls for extra dependencies that need to be found when building
+    # the standalone tests here.
+    find_package(X11)
+    find_package(ZLIB)
+    find_package(Iconv)
+endif()
+qt_build_tests()
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
new file mode 100644
index 00000000..1f6dcca8
--- /dev/null
+++ b/tests/auto/CMakeLists.txt
@@ -0,0 +1,23 @@
+
+add_subdirectory(application)
+add_subdirectory(applicationinfo)
+add_subdirectory(applicationinstaller)
+add_subdirectory(configuration)
+add_subdirectory(cryptography)
+add_subdirectory(debugwrapper)
+add_subdirectory(installationreport)
+add_subdirectory(main)
+add_subdirectory(packagecreator)
+add_subdirectory(packageextractor)
+add_subdirectory(packager-tool)
+#add_subdirectory(qml)
+add_subdirectory(runtime)
+add_subdirectory(signature)
+add_subdirectory(utilities)
+add_subdirectory(yaml)
+
+if(LINUX)
+    add_subdirectory(systemreader)
+    add_subdirectory(processreader)
+    add_subdirectory(sudo)
+endif()
diff --git a/tests/auto/application/CMakeLists.txt b/tests/auto/application/CMakeLists.txt
new file mode 100644
index 00000000..942bc0c3
--- /dev/null
+++ b/tests/auto/application/CMakeLists.txt
@@ -0,0 +1,30 @@
+
+qt_internal_add_test(tst_application
+    SOURCES
+        ../error-checking.h
+        tst_application.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../data/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManManagerPrivate
+)
+
+# Resources:
+set(tst_application_resource_files
+    "info.yaml"
+)
+
+qt_internal_add_resource(tst_application "tst_application"
+    PREFIX
+        "/"
+    FILES
+        ${tst_application_resource_files}
+)
+
+qt_internal_extend_target(tst_application CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/application/application.pro b/tests/auto/application/application.pro
index 2bdaf9c5..2bdaf9c5 100644
--- a/tests/application/application.pro
+++ b/tests/auto/application/application.pro
diff --git a/tests/application/icon.png b/tests/auto/application/icon.png
index 909c66db..909c66db 100644
--- a/tests/application/icon.png
+++ b/tests/auto/application/icon.png
diff --git a/tests/application/info.yaml b/tests/auto/application/info.yaml
index 08329bb8..08329bb8 100644
--- a/tests/application/info.yaml
+++ b/tests/auto/application/info.yaml
diff --git a/tests/application/tst_application.cpp b/tests/auto/application/tst_application.cpp
index 05b155c5..05b155c5 100644
--- a/tests/application/tst_application.cpp
+++ b/tests/auto/application/tst_application.cpp
diff --git a/tests/application/tst_application.qrc b/tests/auto/application/tst_application.qrc
index a24bcd9a..a24bcd9a 100644
--- a/tests/application/tst_application.qrc
+++ b/tests/auto/application/tst_application.qrc
diff --git a/tests/auto/applicationinfo/CMakeLists.txt b/tests/auto/applicationinfo/CMakeLists.txt
new file mode 100644
index 00000000..5cc7ca36
--- /dev/null
+++ b/tests/auto/applicationinfo/CMakeLists.txt
@@ -0,0 +1,21 @@
+
+qt_internal_add_test(tst_applicationinfo
+    SOURCES
+        ../error-checking.h
+        tst_applicationinfo.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../data/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManManagerPrivate
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_applicationinfo CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/applicationinfo/applicationinfo.pro b/tests/auto/applicationinfo/applicationinfo.pro
index 9fcc7ffe..9fcc7ffe 100644
--- a/tests/applicationinfo/applicationinfo.pro
+++ b/tests/auto/applicationinfo/applicationinfo.pro
diff --git a/tests/applicationinfo/tst_applicationinfo.cpp b/tests/auto/applicationinfo/tst_applicationinfo.cpp
index 56ba2294..9dc93292 100644
--- a/tests/applicationinfo/tst_applicationinfo.cpp
+++ b/tests/auto/applicationinfo/tst_applicationinfo.cpp
@@ -67,6 +67,9 @@ tst_ApplicationInfo::tst_ApplicationInfo()
 
 void tst_ApplicationInfo::initTestCase()
 {
+    if (!QDir(qL1S(AM_TESTDATA_DIR "/packages")).exists())
+        QSKIP("No test packages available in the data/ directory");
+
     YamlPackageScanner scanner;
     QDir baseDir(qL1S(AM_TESTDATA_DIR "manifests"));
     const QStringList pkgDirNames = baseDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks);
diff --git a/tests/auto/applicationinstaller/CMakeLists.txt b/tests/auto/applicationinstaller/CMakeLists.txt
new file mode 100644
index 00000000..3da4d358
--- /dev/null
+++ b/tests/auto/applicationinstaller/CMakeLists.txt
@@ -0,0 +1,25 @@
+
+qt_internal_add_test(tst_applicationinstaller
+    SOURCES
+        ../error-checking.h
+        tst_applicationinstaller.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../data/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManManagerPrivate
+        Qt::AppManPackagePrivate
+)
+
+#### Keys ignored in scope 1:.:.:applicationinstaller.pro:<TRUE>:
+# COVERAGE_RUNTIME = "sudo"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_applicationinstaller CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/applicationinstaller/applicationinstaller.pro b/tests/auto/applicationinstaller/applicationinstaller.pro
index b84ffac4..b84ffac4 100644
--- a/tests/applicationinstaller/applicationinstaller.pro
+++ b/tests/auto/applicationinstaller/applicationinstaller.pro
diff --git a/tests/applicationinstaller/tst_applicationinstaller.cpp b/tests/auto/applicationinstaller/tst_applicationinstaller.cpp
index 15be7898..15be7898 100644
--- a/tests/applicationinstaller/tst_applicationinstaller.cpp
+++ b/tests/auto/applicationinstaller/tst_applicationinstaller.cpp
diff --git a/tests/auto/configuration/CMakeLists.txt b/tests/auto/configuration/CMakeLists.txt
new file mode 100644
index 00000000..58eeed5f
--- /dev/null
+++ b/tests/auto/configuration/CMakeLists.txt
@@ -0,0 +1,31 @@
+
+qt_internal_add_test(tst_configuration
+    SOURCES
+        ../error-checking.h
+        tst_configuration.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../data/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManCommonPrivate
+        Qt::AppManMainPrivate
+)
+
+# Resources:
+set(qmake_immediate_resource_files
+    "data/config1.yaml"
+    "data/config2.yaml"
+    "data/empty.yaml"
+)
+
+qt_internal_add_resource(tst_configuration "qmake_immediate"
+    PREFIX
+        "/"
+    FILES
+        ${qmake_immediate_resource_files}
+)
+
+qt_internal_extend_target(tst_configuration CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/configuration/configuration.pro b/tests/auto/configuration/configuration.pro
index da3ff241..da3ff241 100644
--- a/tests/configuration/configuration.pro
+++ b/tests/auto/configuration/configuration.pro
diff --git a/tests/configuration/data/config1.yaml b/tests/auto/configuration/data/config1.yaml
index 06954344..06954344 100644
--- a/tests/configuration/data/config1.yaml
+++ b/tests/auto/configuration/data/config1.yaml
diff --git a/tests/configuration/data/config2.yaml b/tests/auto/configuration/data/config2.yaml
index cd9d9766..cd9d9766 100644
--- a/tests/configuration/data/config2.yaml
+++ b/tests/auto/configuration/data/config2.yaml
diff --git a/tests/configuration/data/empty.yaml b/tests/auto/configuration/data/empty.yaml
index a87fe348..a87fe348 100644
--- a/tests/configuration/data/empty.yaml
+++ b/tests/auto/configuration/data/empty.yaml
diff --git a/tests/configuration/tst_configuration.cpp b/tests/auto/configuration/tst_configuration.cpp
index 67eeec41..67eeec41 100644
--- a/tests/configuration/tst_configuration.cpp
+++ b/tests/auto/configuration/tst_configuration.cpp
diff --git a/tests/auto/cryptography/CMakeLists.txt b/tests/auto/cryptography/CMakeLists.txt
new file mode 100644
index 00000000..4cc87a7d
--- /dev/null
+++ b/tests/auto/cryptography/CMakeLists.txt
@@ -0,0 +1,20 @@
+
+qt_internal_add_test(tst_cryptography
+    SOURCES
+        ../error-checking.h
+        tst_cryptography.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../data/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManCommonPrivate
+        Qt::AppManCryptoPrivate
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_cryptography CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/cryptography/cryptography.pro b/tests/auto/cryptography/cryptography.pro
index d18f6441..d18f6441 100644
--- a/tests/cryptography/cryptography.pro
+++ b/tests/auto/cryptography/cryptography.pro
diff --git a/tests/cryptography/tst_cryptography.cpp b/tests/auto/cryptography/tst_cryptography.cpp
index ff8c2ae6..ff8c2ae6 100644
--- a/tests/cryptography/tst_cryptography.cpp
+++ b/tests/auto/cryptography/tst_cryptography.cpp
diff --git a/tests/auto/debugwrapper/CMakeLists.txt b/tests/auto/debugwrapper/CMakeLists.txt
new file mode 100644
index 00000000..fc041f88
--- /dev/null
+++ b/tests/auto/debugwrapper/CMakeLists.txt
@@ -0,0 +1,19 @@
+
+qt_internal_add_test(tst_debugwrapper
+    SOURCES
+        ../error-checking.h
+        tst_debugwrapper.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../data/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManManagerPrivate
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_debugwrapper CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/debugwrapper/debugwrapper.pro b/tests/auto/debugwrapper/debugwrapper.pro
index b7e9128a..b7e9128a 100644
--- a/tests/debugwrapper/debugwrapper.pro
+++ b/tests/auto/debugwrapper/debugwrapper.pro
diff --git a/tests/debugwrapper/tst_debugwrapper.cpp b/tests/auto/debugwrapper/tst_debugwrapper.cpp
index 8037bb31..8037bb31 100644
--- a/tests/debugwrapper/tst_debugwrapper.cpp
+++ b/tests/auto/debugwrapper/tst_debugwrapper.cpp
diff --git a/tests/error-checking.h b/tests/auto/error-checking.h
index e80cdde5..e80cdde5 100644
--- a/tests/error-checking.h
+++ b/tests/auto/error-checking.h
diff --git a/tests/auto/installationreport/CMakeLists.txt b/tests/auto/installationreport/CMakeLists.txt
new file mode 100644
index 00000000..f0204d00
--- /dev/null
+++ b/tests/auto/installationreport/CMakeLists.txt
@@ -0,0 +1,21 @@
+
+qt_internal_add_test(tst_installationreport
+    SOURCES
+        ../error-checking.h
+        tst_installationreport.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../data/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManCryptoPrivate
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_installationreport CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/installationreport/installationreport.pro b/tests/auto/installationreport/installationreport.pro
index ce1aa46b..ce1aa46b 100644
--- a/tests/installationreport/installationreport.pro
+++ b/tests/auto/installationreport/installationreport.pro
diff --git a/tests/installationreport/tst_installationreport.cpp b/tests/auto/installationreport/tst_installationreport.cpp
index edb1b35a..edb1b35a 100644
--- a/tests/installationreport/tst_installationreport.cpp
+++ b/tests/auto/installationreport/tst_installationreport.cpp
diff --git a/tests/auto/main/CMakeLists.txt b/tests/auto/main/CMakeLists.txt
new file mode 100644
index 00000000..05e6d2cd
--- /dev/null
+++ b/tests/auto/main/CMakeLists.txt
@@ -0,0 +1,39 @@
+
+qt_internal_add_test(tst_main
+    SOURCES
+        ../error-checking.h
+        tst_main.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../data/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManIntentServerPrivate
+        Qt::AppManMainPrivate
+        Qt::AppManManagerPrivate
+)
+
+# Resources:
+set(main_resource_files
+    "dummy.qml"
+)
+
+qt_internal_add_resource(tst_main "main"
+    PREFIX
+        "/foo"
+    FILES
+        ${main_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:main.pro:<TRUE>:
+# OTHER_FILES = "am-config.yaml"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_main CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/main/am-config.yaml b/tests/auto/main/am-config.yaml
index ff538f1b..ff538f1b 100644
--- a/tests/main/am-config.yaml
+++ b/tests/auto/main/am-config.yaml
diff --git a/tests/main/builtin-apps/hello-world.red/icon.png b/tests/auto/main/builtin-apps/hello-world.red/icon.png
index 04ca44dd..04ca44dd 100644
--- a/tests/main/builtin-apps/hello-world.red/icon.png
+++ b/tests/auto/main/builtin-apps/hello-world.red/icon.png
diff --git a/tests/main/builtin-apps/hello-world.red/info.yaml b/tests/auto/main/builtin-apps/hello-world.red/info.yaml
index fa52180e..fa52180e 100644
--- a/tests/main/builtin-apps/hello-world.red/info.yaml
+++ b/tests/auto/main/builtin-apps/hello-world.red/info.yaml
diff --git a/tests/main/builtin-apps/hello-world.red/main.qml b/tests/auto/main/builtin-apps/hello-world.red/main.qml
index b225bdfc..b225bdfc 100644
--- a/tests/main/builtin-apps/hello-world.red/main.qml
+++ b/tests/auto/main/builtin-apps/hello-world.red/main.qml
diff --git a/tests/main/dir-with-update-already-installed/apps/hello-world.red/.installation-report.yaml b/tests/auto/main/dir-with-update-already-installed/apps/hello-world.red/.installation-report.yaml
index ec57b3d7..ec57b3d7 100644
--- a/tests/main/dir-with-update-already-installed/apps/hello-world.red/.installation-report.yaml
+++ b/tests/auto/main/dir-with-update-already-installed/apps/hello-world.red/.installation-report.yaml
diff --git a/tests/main/dir-with-update-already-installed/apps/hello-world.red/icon.png b/tests/auto/main/dir-with-update-already-installed/apps/hello-world.red/icon.png
index 04ca44dd..04ca44dd 100644
--- a/tests/main/dir-with-update-already-installed/apps/hello-world.red/icon.png
+++ b/tests/auto/main/dir-with-update-already-installed/apps/hello-world.red/icon.png
diff --git a/tests/main/dir-with-update-already-installed/apps/hello-world.red/info.yaml b/tests/auto/main/dir-with-update-already-installed/apps/hello-world.red/info.yaml
index af6a9f70..af6a9f70 100644
--- a/tests/main/dir-with-update-already-installed/apps/hello-world.red/info.yaml
+++ b/tests/auto/main/dir-with-update-already-installed/apps/hello-world.red/info.yaml
diff --git a/tests/main/dir-with-update-already-installed/apps/hello-world.red/main.qml b/tests/auto/main/dir-with-update-already-installed/apps/hello-world.red/main.qml
index 29b2e715..29b2e715 100644
--- a/tests/main/dir-with-update-already-installed/apps/hello-world.red/main.qml
+++ b/tests/auto/main/dir-with-update-already-installed/apps/hello-world.red/main.qml
diff --git a/tests/main/dir-with-update-already-installed/docs/hello-world.red/placeholder b/tests/auto/main/dir-with-update-already-installed/docs/hello-world.red/placeholder
index e69de29b..e69de29b 100644
--- a/tests/main/dir-with-update-already-installed/docs/hello-world.red/placeholder
+++ b/tests/auto/main/dir-with-update-already-installed/docs/hello-world.red/placeholder
diff --git a/tests/main/dir-with-update-already-installed/manifests/hello-world.red/icon.png b/tests/auto/main/dir-with-update-already-installed/manifests/hello-world.red/icon.png
index 04ca44dd..04ca44dd 100644
--- a/tests/main/dir-with-update-already-installed/manifests/hello-world.red/icon.png
+++ b/tests/auto/main/dir-with-update-already-installed/manifests/hello-world.red/icon.png
diff --git a/tests/main/dir-with-update-already-installed/manifests/hello-world.red/info.yaml b/tests/auto/main/dir-with-update-already-installed/manifests/hello-world.red/info.yaml
index af6a9f70..af6a9f70 100644
--- a/tests/main/dir-with-update-already-installed/manifests/hello-world.red/info.yaml
+++ b/tests/auto/main/dir-with-update-already-installed/manifests/hello-world.red/info.yaml
diff --git a/tests/main/dummy.qml b/tests/auto/main/dummy.qml
index 2d95c818..2d95c818 100644
--- a/tests/main/dummy.qml
+++ b/tests/auto/main/dummy.qml
diff --git a/tests/main/main.pro b/tests/auto/main/main.pro
index e60ec75f..e60ec75f 100644
--- a/tests/main/main.pro
+++ b/tests/auto/main/main.pro
diff --git a/tests/main/main.qrc b/tests/auto/main/main.qrc
index 8cae2bbb..8cae2bbb 100644
--- a/tests/main/main.qrc
+++ b/tests/auto/main/main.qrc
diff --git a/tests/main/tst_main.cpp b/tests/auto/main/tst_main.cpp
index 9d9f04a5..9d9f04a5 100644
--- a/tests/main/tst_main.cpp
+++ b/tests/auto/main/tst_main.cpp
diff --git a/tests/auto/packagecreator/CMakeLists.txt b/tests/auto/packagecreator/CMakeLists.txt
new file mode 100644
index 00000000..a9cf00d8
--- /dev/null
+++ b/tests/auto/packagecreator/CMakeLists.txt
@@ -0,0 +1,21 @@
+
+qt_internal_add_test(tst_packagecreator
+    SOURCES
+        ../error-checking.h
+        tst_packagecreator.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../data/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManPackagePrivate
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_packagecreator CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/packagecreator/packagecreator.pro b/tests/auto/packagecreator/packagecreator.pro
index 269c12c7..269c12c7 100644
--- a/tests/packagecreator/packagecreator.pro
+++ b/tests/auto/packagecreator/packagecreator.pro
diff --git a/tests/packagecreator/tst_packagecreator.cpp b/tests/auto/packagecreator/tst_packagecreator.cpp
index 4882a871..1cd237b6 100644
--- a/tests/packagecreator/tst_packagecreator.cpp
+++ b/tests/auto/packagecreator/tst_packagecreator.cpp
@@ -82,6 +82,9 @@ void tst_PackageCreator::initTestCase()
     m_isCygwin = tar.readAllStandardOutput().contains("Cygwin");
 
     QVERIFY(PackageUtilities::checkCorrectLocale());
+
+    if (!QDir(qL1S(AM_TESTDATA_DIR "/packages")).exists())
+        QSKIP("No test packages available in the data/ directory");
 }
 
 void tst_PackageCreator::createAndVerify_data()
diff --git a/tests/auto/packageextractor/CMakeLists.txt b/tests/auto/packageextractor/CMakeLists.txt
new file mode 100644
index 00000000..9775d7a3
--- /dev/null
+++ b/tests/auto/packageextractor/CMakeLists.txt
@@ -0,0 +1,21 @@
+
+qt_internal_add_test(tst_packageextractor
+    SOURCES
+        ../error-checking.h
+        tst_packageextractor.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../data/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManPackagePrivate
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_packageextractor CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/packageextractor/packageextractor.pro b/tests/auto/packageextractor/packageextractor.pro
index 761720cf..761720cf 100644
--- a/tests/packageextractor/packageextractor.pro
+++ b/tests/auto/packageextractor/packageextractor.pro
diff --git a/tests/packageextractor/tst_packageextractor.cpp b/tests/auto/packageextractor/tst_packageextractor.cpp
index 50dd78a6..50dd78a6 100644
--- a/tests/packageextractor/tst_packageextractor.cpp
+++ b/tests/auto/packageextractor/tst_packageextractor.cpp
diff --git a/tests/auto/packager-tool/CMakeLists.txt b/tests/auto/packager-tool/CMakeLists.txt
new file mode 100644
index 00000000..8521f7f1
--- /dev/null
+++ b/tests/auto/packager-tool/CMakeLists.txt
@@ -0,0 +1,23 @@
+
+qt_internal_add_test(tst_packager-tool
+    SOURCES
+        ../../../src/tools/packager/packagingjob.cpp
+        ../error-checking.h
+        tst_packager-tool.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../data/\\\"
+    INCLUDE_DIRECTORIES
+        ../../../src/tools/packager
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManCryptoPrivate
+        Qt::AppManManagerPrivate
+        Qt::AppManPackagePrivate
+)
+
+qt_internal_extend_target(tst_packager-tool CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/packager-tool/packager-tool.pro b/tests/auto/packager-tool/packager-tool.pro
index 08876ac6..08876ac6 100644
--- a/tests/packager-tool/packager-tool.pro
+++ b/tests/auto/packager-tool/packager-tool.pro
diff --git a/tests/packager-tool/tst_packager-tool.cpp b/tests/auto/packager-tool/tst_packager-tool.cpp
index 7826caee..7826caee 100644
--- a/tests/packager-tool/tst_packager-tool.cpp
+++ b/tests/auto/packager-tool/tst_packager-tool.cpp
diff --git a/tests/auto/processreader/CMakeLists.txt b/tests/auto/processreader/CMakeLists.txt
new file mode 100644
index 00000000..5e60adfc
--- /dev/null
+++ b/tests/auto/processreader/CMakeLists.txt
@@ -0,0 +1,23 @@
+
+qt_internal_add_test(tst_processreader
+    SOURCES
+        ../error-checking.h
+        tst_processreader.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../data/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManManagerPrivate
+        Qt::AppManMonitorPrivate
+        Qt::AppManWindowPrivate
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_processreader CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/processreader/advanced.smaps b/tests/auto/processreader/advanced.smaps
index 61212565..61212565 100644
--- a/tests/processreader/advanced.smaps
+++ b/tests/auto/processreader/advanced.smaps
diff --git a/tests/processreader/basic.smaps b/tests/auto/processreader/basic.smaps
index 00640230..00640230 100644
--- a/tests/processreader/basic.smaps
+++ b/tests/auto/processreader/basic.smaps
diff --git a/tests/processreader/invalid.smaps b/tests/auto/processreader/invalid.smaps
index 146a42b8..146a42b8 100644
--- a/tests/processreader/invalid.smaps
+++ b/tests/auto/processreader/invalid.smaps
diff --git a/tests/processreader/processreader.pro b/tests/auto/processreader/processreader.pro
index c5caa674..c5caa674 100644
--- a/tests/processreader/processreader.pro
+++ b/tests/auto/processreader/processreader.pro
diff --git a/tests/processreader/tst_processreader.cpp b/tests/auto/processreader/tst_processreader.cpp
index baec84cb..baec84cb 100644
--- a/tests/processreader/tst_processreader.cpp
+++ b/tests/auto/processreader/tst_processreader.cpp
diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt
new file mode 100644
index 00000000..73ee13fe
--- /dev/null
+++ b/tests/auto/qml/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qml.pro.
+
+add_subdirectory(simple)
+add_subdirectory(windowmanager)
+add_subdirectory(windowmapping)
+add_subdirectory(windowitem)
+add_subdirectory(windowitem2)
+add_subdirectory(installer)
+add_subdirectory(quicklaunch)
+add_subdirectory(intents)
+add_subdirectory(configs)
+add_subdirectory(lifecycle)
+add_subdirectory(resources)
+if(multi-process)
+    add_subdirectory(crash/apps/tld.test.crash/terminator2)
+    add_subdirectory(crash)
+    add_subdirectory(processtitle)
+endif()
diff --git a/tests/auto/qml/configs/CMakeLists.txt b/tests/auto/qml/configs/CMakeLists.txt
new file mode 100644
index 00000000..8bc54456
--- /dev/null
+++ b/tests/auto/qml/configs/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from configs.pro.
+
+#####################################################################
+## configs Binary:
+#####################################################################
+
+qt_internal_add_executable(configs
+    GUI
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:configs.pro:<TRUE>:
+# AM_CONFIG = "am-config.yaml"
+# TEST_APPS = "test.configs.app"
+# TEST_CONFIGURATIONS = "--force-single-process" "--force-single-process --single-app $$_PRO_FILE_PWD_/apps/test.configs.app/info.yaml"
+# TEST_FILES = "tst_configs.qml"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:configs.pro:multi-process:
+# TEST_CONFIGURATIONS = "--force-multi-process" "-c $$_PRO_FILE_PWD_/am-config-nodbus.yaml --dbus none" "--single-app $$_PRO_FILE_PWD_/apps/test.configs.app/info.yaml" "--disable-installer --wayland-socket-name wayland-am"
diff --git a/tests/qml/configs/am-config-nodbus.yaml b/tests/auto/qml/configs/am-config-nodbus.yaml
index 78030bf0..78030bf0 100644
--- a/tests/qml/configs/am-config-nodbus.yaml
+++ b/tests/auto/qml/configs/am-config-nodbus.yaml
diff --git a/tests/qml/configs/am-config.yaml b/tests/auto/qml/configs/am-config.yaml
index 5333dae3..5333dae3 100644
--- a/tests/qml/configs/am-config.yaml
+++ b/tests/auto/qml/configs/am-config.yaml
diff --git a/tests/qml/configs/apps/test.configs.app/app.qml b/tests/auto/qml/configs/apps/test.configs.app/app.qml
index 07a5f413..07a5f413 100644
--- a/tests/qml/configs/apps/test.configs.app/app.qml
+++ b/tests/auto/qml/configs/apps/test.configs.app/app.qml
diff --git a/benchmarks/appman-bench/templates/appman-qml/icon.png b/tests/auto/qml/configs/apps/test.configs.app/icon.png
index c1397153..c1397153 100644
--- a/benchmarks/appman-bench/templates/appman-qml/icon.png
+++ b/tests/auto/qml/configs/apps/test.configs.app/icon.png
diff --git a/tests/qml/configs/apps/test.configs.app/info.yaml b/tests/auto/qml/configs/apps/test.configs.app/info.yaml
index 401ed395..401ed395 100644
--- a/tests/qml/configs/apps/test.configs.app/info.yaml
+++ b/tests/auto/qml/configs/apps/test.configs.app/info.yaml
diff --git a/tests/qml/configs/configs.pro b/tests/auto/qml/configs/configs.pro
index 86604d5e..86604d5e 100644
--- a/tests/qml/configs/configs.pro
+++ b/tests/auto/qml/configs/configs.pro
diff --git a/tests/qml/configs/tst_configs.qml b/tests/auto/qml/configs/tst_configs.qml
index 88c7bd48..88c7bd48 100644
--- a/tests/qml/configs/tst_configs.qml
+++ b/tests/auto/qml/configs/tst_configs.qml
diff --git a/tests/auto/qml/crash/CMakeLists.txt b/tests/auto/qml/crash/CMakeLists.txt
new file mode 100644
index 00000000..2ba8b4a4
--- /dev/null
+++ b/tests/auto/qml/crash/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from crash.pro.
+
+#####################################################################
+## crash Binary:
+#####################################################################
+
+qt_internal_add_executable(crash
+    GUI
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:crash.pro:<TRUE>:
+# AM_CONFIG = "am-config.yaml"
+# TEST_APPS = "tld.test.crash"
+# TEST_CONFIGURATIONS = "--force-multi-process"
+# TEST_FILES = "tst_crash.qml"
diff --git a/tests/qml/crash/am-config.yaml b/tests/auto/qml/crash/am-config.yaml
index 61b2bfb2..61b2bfb2 100644
--- a/tests/qml/crash/am-config.yaml
+++ b/tests/auto/qml/crash/am-config.yaml
diff --git a/tests/qml/crash/apps/tld.test.crash/app.qml b/tests/auto/qml/crash/apps/tld.test.crash/app.qml
index a97c60f2..a97c60f2 100644
--- a/tests/qml/crash/apps/tld.test.crash/app.qml
+++ b/tests/auto/qml/crash/apps/tld.test.crash/app.qml
diff --git a/benchmarks/appman-bench/templates/qmlscene/icon.png b/tests/auto/qml/crash/apps/tld.test.crash/icon.png
index c1397153..c1397153 100644
--- a/benchmarks/appman-bench/templates/qmlscene/icon.png
+++ b/tests/auto/qml/crash/apps/tld.test.crash/icon.png
diff --git a/tests/qml/crash/apps/tld.test.crash/info.yaml b/tests/auto/qml/crash/apps/tld.test.crash/info.yaml
index 77ca2e76..77ca2e76 100644
--- a/tests/qml/crash/apps/tld.test.crash/info.yaml
+++ b/tests/auto/qml/crash/apps/tld.test.crash/info.yaml
diff --git a/tests/auto/qml/crash/apps/tld.test.crash/terminator2/CMakeLists.txt b/tests/auto/qml/crash/apps/tld.test.crash/terminator2/CMakeLists.txt
new file mode 100644
index 00000000..21646c82
--- /dev/null
+++ b/tests/auto/qml/crash/apps/tld.test.crash/terminator2/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from terminator2.pro.
+
+#####################################################################
+## terminator2plugin Generic Library:
+#####################################################################
+
+qt_internal_add_cmake_library(terminator2plugin
+    MODULE
+    INSTALL_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/Terminator"
+    EXCEPTIONS
+    OUTPUT_DIRECTORY "$$_PRO_FILE_PWD_/Terminator"
+    SOURCES
+        qmlterminator2.cpp qmlterminator2.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+        Qt::Quick
+)
+
+#### Keys ignored in scope 1:.:.:terminator2.pro:<TRUE>:
+# INSTALLS = "target" "qmldir"
+# OTHER_FILES = "qmldir"
+# QMAKE_POST_LINK = "$$QMAKE_COPY" "$$replace($$list $$quote $$PWD/qmldir $$DESTDIR , /, $$QMAKE_DIR_SEP)"
+# TEMPLATE = "lib"
+# qmldir.files = "$$PWD/qmldir"
+# qmldir.path = "$$DESTDIR"
+# target.path = "$$DESTDIR"
+
+qt_autogen_tools_initial_setup(terminator2plugin)
diff --git a/tests/qml/crash/apps/tld.test.crash/terminator2/qmldir b/tests/auto/qml/crash/apps/tld.test.crash/terminator2/Terminator/qmldir
index ac15a495..ac15a495 100644
--- a/tests/qml/crash/apps/tld.test.crash/terminator2/qmldir
+++ b/tests/auto/qml/crash/apps/tld.test.crash/terminator2/Terminator/qmldir
diff --git a/tests/auto/qml/crash/apps/tld.test.crash/terminator2/qmldir b/tests/auto/qml/crash/apps/tld.test.crash/terminator2/qmldir
new file mode 100644
index 00000000..ac15a495
--- /dev/null
+++ b/tests/auto/qml/crash/apps/tld.test.crash/terminator2/qmldir
@@ -0,0 +1,2 @@
+module Terminator
+plugin terminator2plugin
diff --git a/tests/qml/crash/apps/tld.test.crash/terminator2/qmlterminator2.cpp b/tests/auto/qml/crash/apps/tld.test.crash/terminator2/qmlterminator2.cpp
index 5a90dc49..5a90dc49 100644
--- a/tests/qml/crash/apps/tld.test.crash/terminator2/qmlterminator2.cpp
+++ b/tests/auto/qml/crash/apps/tld.test.crash/terminator2/qmlterminator2.cpp
diff --git a/tests/qml/crash/apps/tld.test.crash/terminator2/qmlterminator2.h b/tests/auto/qml/crash/apps/tld.test.crash/terminator2/qmlterminator2.h
index 27bc8e28..27bc8e28 100644
--- a/tests/qml/crash/apps/tld.test.crash/terminator2/qmlterminator2.h
+++ b/tests/auto/qml/crash/apps/tld.test.crash/terminator2/qmlterminator2.h
diff --git a/tests/qml/crash/apps/tld.test.crash/terminator2/terminator2.pro b/tests/auto/qml/crash/apps/tld.test.crash/terminator2/terminator2.pro
index 3c482379..3c482379 100644
--- a/tests/qml/crash/apps/tld.test.crash/terminator2/terminator2.pro
+++ b/tests/auto/qml/crash/apps/tld.test.crash/terminator2/terminator2.pro
diff --git a/tests/qml/crash/crash.pro b/tests/auto/qml/crash/crash.pro
index c1c7d869..c1c7d869 100644
--- a/tests/qml/crash/crash.pro
+++ b/tests/auto/qml/crash/crash.pro
diff --git a/tests/qml/crash/tst_crash.qml b/tests/auto/qml/crash/tst_crash.qml
index cc7f42d2..cc7f42d2 100644
--- a/tests/qml/crash/tst_crash.qml
+++ b/tests/auto/qml/crash/tst_crash.qml
diff --git a/tests/auto/qml/installer/CMakeLists.txt b/tests/auto/qml/installer/CMakeLists.txt
new file mode 100644
index 00000000..6daf54ee
--- /dev/null
+++ b/tests/auto/qml/installer/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from installer.pro.
+
+#####################################################################
+## installer Binary:
+#####################################################################
+
+qt_internal_add_executable(installer
+    GUI
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:installer.pro:<TRUE>:
+# AM_CONFIG = "am-config.yaml"
+# AM_TESTDATA_DIR = "\"$$PWD/../../data/\""
+# TEST_FILES = "tst_installer.qml"
diff --git a/tests/qml/installer/am-config.yaml b/tests/auto/qml/installer/am-config.yaml
index d0e12789..d0e12789 100644
--- a/tests/qml/installer/am-config.yaml
+++ b/tests/auto/qml/installer/am-config.yaml
diff --git a/tests/qml/installer/apps/hello-world.red/app1.qml b/tests/auto/qml/installer/apps/hello-world.red/app1.qml
index 7e6ba025..7e6ba025 100644
--- a/tests/qml/installer/apps/hello-world.red/app1.qml
+++ b/tests/auto/qml/installer/apps/hello-world.red/app1.qml
diff --git a/tests/qml/installer/apps/hello-world.red/icon1.png b/tests/auto/qml/installer/apps/hello-world.red/icon1.png
index c1397153..c1397153 100644
--- a/tests/qml/installer/apps/hello-world.red/icon1.png
+++ b/tests/auto/qml/installer/apps/hello-world.red/icon1.png
diff --git a/tests/qml/installer/apps/hello-world.red/info.yaml b/tests/auto/qml/installer/apps/hello-world.red/info.yaml
index 1b628d1e..1b628d1e 100644
--- a/tests/qml/installer/apps/hello-world.red/info.yaml
+++ b/tests/auto/qml/installer/apps/hello-world.red/info.yaml
diff --git a/tests/qml/installer/installer.pro b/tests/auto/qml/installer/installer.pro
index 2adfb2a4..2adfb2a4 100644
--- a/tests/qml/installer/installer.pro
+++ b/tests/auto/qml/installer/installer.pro
diff --git a/tests/qml/installer/tst_installer.qml b/tests/auto/qml/installer/tst_installer.qml
index d3443ee7..d3443ee7 100644
--- a/tests/qml/installer/tst_installer.qml
+++ b/tests/auto/qml/installer/tst_installer.qml
diff --git a/tests/auto/qml/intents/CMakeLists.txt b/tests/auto/qml/intents/CMakeLists.txt
new file mode 100644
index 00000000..20543415
--- /dev/null
+++ b/tests/auto/qml/intents/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from intents.pro.
+
+#####################################################################
+## intents Binary:
+#####################################################################
+
+qt_internal_add_executable(intents
+    GUI
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:intents.pro:<TRUE>:
+# AM_CONFIG = "am-config.yaml"
+# TEST_APPS = "intents1" "intents2" "cannot-start"
+# TEST_CONFIGURATIONS = "--force-single-process"
+# TEST_FILES = "tst_intents.qml"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:intents.pro:multi-process:
+# TEST_CONFIGURATIONS = "--force-multi-process" "--force-multi-process -c $$_PRO_FILE_PWD_/am-config-quick.yaml"
diff --git a/tests/qml/intents/am-config-quick.yaml b/tests/auto/qml/intents/am-config-quick.yaml
index 96b3098c..96b3098c 100644
--- a/tests/qml/intents/am-config-quick.yaml
+++ b/tests/auto/qml/intents/am-config-quick.yaml
diff --git a/tests/qml/intents/am-config.yaml b/tests/auto/qml/intents/am-config.yaml
index 1667c123..1667c123 100644
--- a/tests/qml/intents/am-config.yaml
+++ b/tests/auto/qml/intents/am-config.yaml
diff --git a/tests/qml/intents/apps/cannot-start/cannot-start b/tests/auto/qml/intents/apps/cannot-start/cannot-start
index 5c3118dc..5c3118dc 100644
--- a/tests/qml/intents/apps/cannot-start/cannot-start
+++ b/tests/auto/qml/intents/apps/cannot-start/cannot-start
diff --git a/tests/qml/intents/apps/cannot-start/icon.png b/tests/auto/qml/intents/apps/cannot-start/icon.png
index adb840ce..adb840ce 100644
--- a/tests/qml/intents/apps/cannot-start/icon.png
+++ b/tests/auto/qml/intents/apps/cannot-start/icon.png
diff --git a/tests/qml/intents/apps/cannot-start/info.yaml b/tests/auto/qml/intents/apps/cannot-start/info.yaml
index 64c81589..64c81589 100644
--- a/tests/qml/intents/apps/cannot-start/info.yaml
+++ b/tests/auto/qml/intents/apps/cannot-start/info.yaml
diff --git a/tests/qml/intents/apps/intents1/icon.png b/tests/auto/qml/intents/apps/intents1/icon.png
index adb840ce..adb840ce 100644
--- a/tests/qml/intents/apps/intents1/icon.png
+++ b/tests/auto/qml/intents/apps/intents1/icon.png
diff --git a/tests/qml/intents/apps/intents1/info.yaml b/tests/auto/qml/intents/apps/intents1/info.yaml
index d5f72561..d5f72561 100644
--- a/tests/qml/intents/apps/intents1/info.yaml
+++ b/tests/auto/qml/intents/apps/intents1/info.yaml
diff --git a/tests/qml/intents/apps/intents1/intents1.qml b/tests/auto/qml/intents/apps/intents1/intents1.qml
index d9e80183..d9e80183 100644
--- a/tests/qml/intents/apps/intents1/intents1.qml
+++ b/tests/auto/qml/intents/apps/intents1/intents1.qml
diff --git a/tests/qml/intents/apps/intents2/icon.png b/tests/auto/qml/intents/apps/intents2/icon.png
index adb840ce..adb840ce 100644
--- a/tests/qml/intents/apps/intents2/icon.png
+++ b/tests/auto/qml/intents/apps/intents2/icon.png
diff --git a/tests/qml/intents/apps/intents2/info.yaml b/tests/auto/qml/intents/apps/intents2/info.yaml
index 209ab30c..209ab30c 100644
--- a/tests/qml/intents/apps/intents2/info.yaml
+++ b/tests/auto/qml/intents/apps/intents2/info.yaml
diff --git a/tests/qml/intents/apps/intents2/intents2.qml b/tests/auto/qml/intents/apps/intents2/intents2.qml
index 2545a3f5..2545a3f5 100644
--- a/tests/qml/intents/apps/intents2/intents2.qml
+++ b/tests/auto/qml/intents/apps/intents2/intents2.qml
diff --git a/tests/qml/intents/intents.pro b/tests/auto/qml/intents/intents.pro
index a05a7b72..a05a7b72 100644
--- a/tests/qml/intents/intents.pro
+++ b/tests/auto/qml/intents/intents.pro
diff --git a/tests/qml/intents/tst_intents.qml b/tests/auto/qml/intents/tst_intents.qml
index 2caccfcb..2caccfcb 100644
--- a/tests/qml/intents/tst_intents.qml
+++ b/tests/auto/qml/intents/tst_intents.qml
diff --git a/tests/auto/qml/lifecycle/CMakeLists.txt b/tests/auto/qml/lifecycle/CMakeLists.txt
new file mode 100644
index 00000000..36b09f7c
--- /dev/null
+++ b/tests/auto/qml/lifecycle/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from lifecycle.pro.
+
+#####################################################################
+## lifecycle Binary:
+#####################################################################
+
+qt_internal_add_executable(lifecycle
+    GUI
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:lifecycle.pro:<TRUE>:
+# AM_CONFIG = "am-config.yaml"
+# TEST_APPS = "tld.test.lifecycle"
+# TEST_FILES = "tst_lifecycle.qml"
diff --git a/tests/qml/lifecycle/am-config.yaml b/tests/auto/qml/lifecycle/am-config.yaml
index 61b2bfb2..61b2bfb2 100644
--- a/tests/qml/lifecycle/am-config.yaml
+++ b/tests/auto/qml/lifecycle/am-config.yaml
diff --git a/tests/qml/lifecycle/apps/tld.test.lifecycle/app.qml b/tests/auto/qml/lifecycle/apps/tld.test.lifecycle/app.qml
index a5f21ad0..a5f21ad0 100644
--- a/tests/qml/lifecycle/apps/tld.test.lifecycle/app.qml
+++ b/tests/auto/qml/lifecycle/apps/tld.test.lifecycle/app.qml
diff --git a/tests/qml/configs/apps/test.configs.app/icon.png b/tests/auto/qml/lifecycle/apps/tld.test.lifecycle/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/configs/apps/test.configs.app/icon.png
+++ b/tests/auto/qml/lifecycle/apps/tld.test.lifecycle/icon.png
diff --git a/tests/qml/lifecycle/apps/tld.test.lifecycle/info.yaml b/tests/auto/qml/lifecycle/apps/tld.test.lifecycle/info.yaml
index 198cbe51..198cbe51 100644
--- a/tests/qml/lifecycle/apps/tld.test.lifecycle/info.yaml
+++ b/tests/auto/qml/lifecycle/apps/tld.test.lifecycle/info.yaml
diff --git a/tests/qml/lifecycle/lifecycle.pro b/tests/auto/qml/lifecycle/lifecycle.pro
index 98ab9709..98ab9709 100644
--- a/tests/qml/lifecycle/lifecycle.pro
+++ b/tests/auto/qml/lifecycle/lifecycle.pro
diff --git a/tests/qml/lifecycle/tst_lifecycle.qml b/tests/auto/qml/lifecycle/tst_lifecycle.qml
index d75584e2..d75584e2 100644
--- a/tests/qml/lifecycle/tst_lifecycle.qml
+++ b/tests/auto/qml/lifecycle/tst_lifecycle.qml
diff --git a/tests/auto/qml/processtitle/CMakeLists.txt b/tests/auto/qml/processtitle/CMakeLists.txt
new file mode 100644
index 00000000..55cd61b9
--- /dev/null
+++ b/tests/auto/qml/processtitle/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from processtitle.pro.
+
+#####################################################################
+## processtitle Binary:
+#####################################################################
+
+qt_internal_add_executable(processtitle
+    GUI
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:processtitle.pro:<TRUE>:
+# AM_CONFIG = "am-config.yaml"
+# TEST_APPS = "test.processtitle.app"
+# TEST_CONFIGURATIONS = "--force-multi-process" "--force-multi-process -c $$_PRO_FILE_PWD_/am-config-quick.yaml"
+# TEST_FILES = "tst_processtitle.qml"
diff --git a/tests/qml/processtitle/am-config-quick.yaml b/tests/auto/qml/processtitle/am-config-quick.yaml
index a21a1dea..a21a1dea 100644
--- a/tests/qml/processtitle/am-config-quick.yaml
+++ b/tests/auto/qml/processtitle/am-config-quick.yaml
diff --git a/tests/qml/processtitle/am-config.yaml b/tests/auto/qml/processtitle/am-config.yaml
index 4ab6878e..4ab6878e 100644
--- a/tests/qml/processtitle/am-config.yaml
+++ b/tests/auto/qml/processtitle/am-config.yaml
diff --git a/tests/qml/processtitle/apps/appappapp1appappapp2appappapp3appappapp4appappapp5appappapp6appappapp7/app.qml b/tests/auto/qml/processtitle/apps/appappapp1appappapp2appappapp3appappapp4appappapp5appappapp6appappapp7/app.qml
index 7371a7c8..7371a7c8 100644
--- a/tests/qml/processtitle/apps/appappapp1appappapp2appappapp3appappapp4appappapp5appappapp6appappapp7/app.qml
+++ b/tests/auto/qml/processtitle/apps/appappapp1appappapp2appappapp3appappapp4appappapp5appappapp6appappapp7/app.qml
diff --git a/tests/qml/crash/apps/tld.test.crash/icon.png b/tests/auto/qml/processtitle/apps/appappapp1appappapp2appappapp3appappapp4appappapp5appappapp6appappapp7/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/crash/apps/tld.test.crash/icon.png
+++ b/tests/auto/qml/processtitle/apps/appappapp1appappapp2appappapp3appappapp4appappapp5appappapp6appappapp7/icon.png
diff --git a/tests/qml/processtitle/apps/appappapp1appappapp2appappapp3appappapp4appappapp5appappapp6appappapp7/info.yaml b/tests/auto/qml/processtitle/apps/appappapp1appappapp2appappapp3appappapp4appappapp5appappapp6appappapp7/info.yaml
index 2e1cae3b..2e1cae3b 100644
--- a/tests/qml/processtitle/apps/appappapp1appappapp2appappapp3appappapp4appappapp5appappapp6appappapp7/info.yaml
+++ b/tests/auto/qml/processtitle/apps/appappapp1appappapp2appappapp3appappapp4appappapp5appappapp6appappapp7/info.yaml
diff --git a/tests/qml/processtitle/apps/test.processtitle.app/app.qml b/tests/auto/qml/processtitle/apps/test.processtitle.app/app.qml
index 7371a7c8..7371a7c8 100644
--- a/tests/qml/processtitle/apps/test.processtitle.app/app.qml
+++ b/tests/auto/qml/processtitle/apps/test.processtitle.app/app.qml
diff --git a/tests/qml/lifecycle/apps/tld.test.lifecycle/icon.png b/tests/auto/qml/processtitle/apps/test.processtitle.app/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/lifecycle/apps/tld.test.lifecycle/icon.png
+++ b/tests/auto/qml/processtitle/apps/test.processtitle.app/icon.png
diff --git a/tests/qml/processtitle/apps/test.processtitle.app/info.yaml b/tests/auto/qml/processtitle/apps/test.processtitle.app/info.yaml
index e178aa04..e178aa04 100644
--- a/tests/qml/processtitle/apps/test.processtitle.app/info.yaml
+++ b/tests/auto/qml/processtitle/apps/test.processtitle.app/info.yaml
diff --git a/tests/qml/processtitle/processtitle.pro b/tests/auto/qml/processtitle/processtitle.pro
index e78b54a1..e78b54a1 100644
--- a/tests/qml/processtitle/processtitle.pro
+++ b/tests/auto/qml/processtitle/processtitle.pro
diff --git a/tests/qml/processtitle/tst_processtitle.qml b/tests/auto/qml/processtitle/tst_processtitle.qml
index acb3646e..acb3646e 100644
--- a/tests/qml/processtitle/tst_processtitle.qml
+++ b/tests/auto/qml/processtitle/tst_processtitle.qml
diff --git a/tests/qml/qml.pro b/tests/auto/qml/qml.pro
index 902ab2f1..902ab2f1 100644
--- a/tests/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
diff --git a/tests/auto/qml/quicklaunch/CMakeLists.txt b/tests/auto/qml/quicklaunch/CMakeLists.txt
new file mode 100644
index 00000000..9fcb8aeb
--- /dev/null
+++ b/tests/auto/qml/quicklaunch/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from quicklaunch.pro.
+
+#####################################################################
+## quicklaunch Binary:
+#####################################################################
+
+qt_internal_add_executable(quicklaunch
+    GUI
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:quicklaunch.pro:<TRUE>:
+# AM_CONFIG = "am-config.yaml"
+# TEST_APPS = "tld.test.quicklaunch"
+# TEST_FILES = "tst_quicklaunch.qml"
diff --git a/tests/qml/quicklaunch/am-config.yaml b/tests/auto/qml/quicklaunch/am-config.yaml
index e8de3d00..e8de3d00 100644
--- a/tests/qml/quicklaunch/am-config.yaml
+++ b/tests/auto/qml/quicklaunch/am-config.yaml
diff --git a/tests/qml/quicklaunch/apps/tld.test.quicklaunch/app.qml b/tests/auto/qml/quicklaunch/apps/tld.test.quicklaunch/app.qml
index 571288d1..571288d1 100644
--- a/tests/qml/quicklaunch/apps/tld.test.quicklaunch/app.qml
+++ b/tests/auto/qml/quicklaunch/apps/tld.test.quicklaunch/app.qml
diff --git a/tests/qml/processtitle/apps/appappapp1appappapp2appappapp3appappapp4appappapp5appappapp6appappapp7/icon.png b/tests/auto/qml/quicklaunch/apps/tld.test.quicklaunch/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/processtitle/apps/appappapp1appappapp2appappapp3appappapp4appappapp5appappapp6appappapp7/icon.png
+++ b/tests/auto/qml/quicklaunch/apps/tld.test.quicklaunch/icon.png
diff --git a/tests/qml/quicklaunch/apps/tld.test.quicklaunch/info.yaml b/tests/auto/qml/quicklaunch/apps/tld.test.quicklaunch/info.yaml
index e898a02b..e898a02b 100644
--- a/tests/qml/quicklaunch/apps/tld.test.quicklaunch/info.yaml
+++ b/tests/auto/qml/quicklaunch/apps/tld.test.quicklaunch/info.yaml
diff --git a/tests/qml/quicklaunch/quicklaunch.pro b/tests/auto/qml/quicklaunch/quicklaunch.pro
index 2d990a4b..2d990a4b 100644
--- a/tests/qml/quicklaunch/quicklaunch.pro
+++ b/tests/auto/qml/quicklaunch/quicklaunch.pro
diff --git a/tests/qml/quicklaunch/tst_quicklaunch.qml b/tests/auto/qml/quicklaunch/tst_quicklaunch.qml
index d9744eec..d9744eec 100644
--- a/tests/qml/quicklaunch/tst_quicklaunch.qml
+++ b/tests/auto/qml/quicklaunch/tst_quicklaunch.qml
diff --git a/tests/auto/qml/resources/CMakeLists.txt b/tests/auto/qml/resources/CMakeLists.txt
new file mode 100644
index 00000000..0893a7ac
--- /dev/null
+++ b/tests/auto/qml/resources/CMakeLists.txt
@@ -0,0 +1,37 @@
+# Generated from resources.pro.
+
+#####################################################################
+## systemuiplugin Generic Library:
+#####################################################################
+
+qt_internal_add_cmake_library(systemuiplugin
+    MODULE
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+)
+
+# Resources:
+set(systemuiplugin_resource_files
+    "qml/widgets/MagentaRect.qml"
+)
+
+qt_internal_add_resource(systemuiplugin "systemuiplugin"
+    PREFIX
+        "/"
+    FILES
+        ${systemuiplugin_resource_files}
+)
+
+
+#### Keys ignored in scope 2:.:.:test.pro:<TRUE>:
+# AM_CONFIG = "am-config.yaml"
+# DIRECTORIES = "apps/app2/qml" "relative"
+# FILES = "am-config.yaml" "apps/app1/icon.png" "apps/app1/info.yaml" "apps/app2/icon.png" "apps/app2/info.yaml"
+# RESOURCE_SOURCE = "systemuifile.qrc"
+# TEMPLATE = "lib"
+# TEST_APPS = "app1" "app2"
+# TEST_FILES = "tst_resource.qml"
+
+qt_autogen_tools_initial_setup(systemuiplugin)
+add_subdirectory(appcommon)
+add_subdirectory(apps/app1)
+add_subdirectory(apps/app2)
diff --git a/tests/qml/resources/am-config.yaml b/tests/auto/qml/resources/am-config.yaml
index a06cb076..a06cb076 100644
--- a/tests/qml/resources/am-config.yaml
+++ b/tests/auto/qml/resources/am-config.yaml
diff --git a/tests/auto/qml/resources/appcommon/CMakeLists.txt b/tests/auto/qml/resources/appcommon/CMakeLists.txt
new file mode 100644
index 00000000..45d12696
--- /dev/null
+++ b/tests/auto/qml/resources/appcommon/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Generated from appcommon.pro.
+
diff --git a/tests/qml/resources/appcommon/Quicklaunch.qml b/tests/auto/qml/resources/appcommon/Quicklaunch.qml
index e9cc4144..e9cc4144 100644
--- a/tests/qml/resources/appcommon/Quicklaunch.qml
+++ b/tests/auto/qml/resources/appcommon/Quicklaunch.qml
diff --git a/tests/qml/resources/appcommon/appcommon.pro b/tests/auto/qml/resources/appcommon/appcommon.pro
index 47028775..47028775 100644
--- a/tests/qml/resources/appcommon/appcommon.pro
+++ b/tests/auto/qml/resources/appcommon/appcommon.pro
diff --git a/tests/qml/resources/appcommon/appcommonfile.qrc b/tests/auto/qml/resources/appcommon/appcommonfile.qrc
index 4dc15f85..4dc15f85 100644
--- a/tests/qml/resources/appcommon/appcommonfile.qrc
+++ b/tests/auto/qml/resources/appcommon/appcommonfile.qrc
diff --git a/tests/qml/resources/appcommon/qml/common/CommonObj.qml b/tests/auto/qml/resources/appcommon/qml/common/CommonObj.qml
index 1b181488..1b181488 100644
--- a/tests/qml/resources/appcommon/qml/common/CommonObj.qml
+++ b/tests/auto/qml/resources/appcommon/qml/common/CommonObj.qml
diff --git a/tests/qml/resources/appcommon/qml/common/qmldir b/tests/auto/qml/resources/appcommon/qml/common/qmldir
index 5458b257..5458b257 100644
--- a/tests/qml/resources/appcommon/qml/common/qmldir
+++ b/tests/auto/qml/resources/appcommon/qml/common/qmldir
diff --git a/tests/auto/qml/resources/apps/app1/CMakeLists.txt b/tests/auto/qml/resources/apps/app1/CMakeLists.txt
new file mode 100644
index 00000000..7ff28b4a
--- /dev/null
+++ b/tests/auto/qml/resources/apps/app1/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from app1.pro.
+
+#####################################################################
+## app1plugin Generic Library:
+#####################################################################
+
+qt_internal_add_cmake_library(app1plugin
+    MODULE
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+)
+
+# Resources:
+set(app1plugin_resource_files
+    "qml/forms/AquaRect.qml"
+)
+
+qt_internal_add_resource(app1plugin "app1plugin"
+    PREFIX
+        "/app1"
+    FILES
+        ${app1plugin_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:app1.pro:<TRUE>:
+# OTHER_FILES = "info.yaml" "icon.png"
+# RESOURCE_SOURCE = "app1file.qrc"
+# TEMPLATE = "lib"
+
+qt_autogen_tools_initial_setup(app1plugin)
diff --git a/tests/qml/resources/apps/app1/app1.pro b/tests/auto/qml/resources/apps/app1/app1.pro
index cbbb4758..cbbb4758 100644
--- a/tests/qml/resources/apps/app1/app1.pro
+++ b/tests/auto/qml/resources/apps/app1/app1.pro
diff --git a/tests/qml/resources/apps/app1/app1.qml b/tests/auto/qml/resources/apps/app1/app1.qml
index d519f3ac..d519f3ac 100644
--- a/tests/qml/resources/apps/app1/app1.qml
+++ b/tests/auto/qml/resources/apps/app1/app1.qml
diff --git a/tests/qml/resources/apps/app1/app1file.qrc b/tests/auto/qml/resources/apps/app1/app1file.qrc
index 6c958e89..6c958e89 100644
--- a/tests/qml/resources/apps/app1/app1file.qrc
+++ b/tests/auto/qml/resources/apps/app1/app1file.qrc
diff --git a/tests/qml/resources/apps/app1/app1plugin.qrc b/tests/auto/qml/resources/apps/app1/app1plugin.qrc
index 6c4e2ae3..6c4e2ae3 100644
--- a/tests/qml/resources/apps/app1/app1plugin.qrc
+++ b/tests/auto/qml/resources/apps/app1/app1plugin.qrc
diff --git a/tests/qml/processtitle/apps/test.processtitle.app/icon.png b/tests/auto/qml/resources/apps/app1/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/processtitle/apps/test.processtitle.app/icon.png
+++ b/tests/auto/qml/resources/apps/app1/icon.png
diff --git a/tests/qml/resources/apps/app1/info.yaml b/tests/auto/qml/resources/apps/app1/info.yaml
index a5287f2c..a5287f2c 100644
--- a/tests/qml/resources/apps/app1/info.yaml
+++ b/tests/auto/qml/resources/apps/app1/info.yaml
diff --git a/tests/qml/resources/apps/app1/qml/forms/AquaRect.qml b/tests/auto/qml/resources/apps/app1/qml/forms/AquaRect.qml
index cefb485c..cefb485c 100644
--- a/tests/qml/resources/apps/app1/qml/forms/AquaRect.qml
+++ b/tests/auto/qml/resources/apps/app1/qml/forms/AquaRect.qml
diff --git a/tests/qml/resources/apps/app1/qml/forms/YellowRect.qml b/tests/auto/qml/resources/apps/app1/qml/forms/YellowRect.qml
index b1c91a1f..b1c91a1f 100644
--- a/tests/qml/resources/apps/app1/qml/forms/YellowRect.qml
+++ b/tests/auto/qml/resources/apps/app1/qml/forms/YellowRect.qml
diff --git a/tests/qml/resources/apps/app1/qml/forms/qmldir b/tests/auto/qml/resources/apps/app1/qml/forms/qmldir
index 12a5506b..12a5506b 100644
--- a/tests/qml/resources/apps/app1/qml/forms/qmldir
+++ b/tests/auto/qml/resources/apps/app1/qml/forms/qmldir
diff --git a/tests/qml/resources/apps/app2/BlueRect.qml b/tests/auto/qml/resources/apps/app2/BlueRect.qml
index 138bdff4..138bdff4 100644
--- a/tests/qml/resources/apps/app2/BlueRect.qml
+++ b/tests/auto/qml/resources/apps/app2/BlueRect.qml
diff --git a/tests/auto/qml/resources/apps/app2/CMakeLists.txt b/tests/auto/qml/resources/apps/app2/CMakeLists.txt
new file mode 100644
index 00000000..03a5a5a1
--- /dev/null
+++ b/tests/auto/qml/resources/apps/app2/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Generated from app2.pro.
+
diff --git a/tests/qml/resources/apps/app2/app2.pro b/tests/auto/qml/resources/apps/app2/app2.pro
index 7a5190df..7a5190df 100644
--- a/tests/qml/resources/apps/app2/app2.pro
+++ b/tests/auto/qml/resources/apps/app2/app2.pro
diff --git a/tests/qml/resources/apps/app2/app2.qml b/tests/auto/qml/resources/apps/app2/app2.qml
index c0310ee0..c0310ee0 100644
--- a/tests/qml/resources/apps/app2/app2.qml
+++ b/tests/auto/qml/resources/apps/app2/app2.qml
diff --git a/tests/qml/resources/apps/app2/app2.qrc b/tests/auto/qml/resources/apps/app2/app2.qrc
index 80bc560c..80bc560c 100644
--- a/tests/qml/resources/apps/app2/app2.qrc
+++ b/tests/auto/qml/resources/apps/app2/app2.qrc
diff --git a/tests/qml/quicklaunch/apps/tld.test.quicklaunch/icon.png b/tests/auto/qml/resources/apps/app2/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/quicklaunch/apps/tld.test.quicklaunch/icon.png
+++ b/tests/auto/qml/resources/apps/app2/icon.png
diff --git a/tests/qml/resources/apps/app2/info.yaml b/tests/auto/qml/resources/apps/app2/info.yaml
index 6eda565b..6eda565b 100644
--- a/tests/qml/resources/apps/app2/info.yaml
+++ b/tests/auto/qml/resources/apps/app2/info.yaml
diff --git a/tests/qml/resources/apps/app2/qml/appwidgets/GreenRect.qml b/tests/auto/qml/resources/apps/app2/qml/appwidgets/GreenRect.qml
index 7bf8d3a3..7bf8d3a3 100644
--- a/tests/qml/resources/apps/app2/qml/appwidgets/GreenRect.qml
+++ b/tests/auto/qml/resources/apps/app2/qml/appwidgets/GreenRect.qml
diff --git a/tests/qml/resources/apps/app2/qml/appwidgets/qmldir b/tests/auto/qml/resources/apps/app2/qml/appwidgets/qmldir
index a158bf25..a158bf25 100644
--- a/tests/qml/resources/apps/app2/qml/appwidgets/qmldir
+++ b/tests/auto/qml/resources/apps/app2/qml/appwidgets/qmldir
diff --git a/tests/qml/resources/qml/widgets/MagentaRect.qml b/tests/auto/qml/resources/qml/widgets/MagentaRect.qml
index 511cea95..511cea95 100644
--- a/tests/qml/resources/qml/widgets/MagentaRect.qml
+++ b/tests/auto/qml/resources/qml/widgets/MagentaRect.qml
diff --git a/tests/qml/resources/qml/widgets/RedRect.qml b/tests/auto/qml/resources/qml/widgets/RedRect.qml
index a27122e7..a27122e7 100644
--- a/tests/qml/resources/qml/widgets/RedRect.qml
+++ b/tests/auto/qml/resources/qml/widgets/RedRect.qml
diff --git a/tests/qml/resources/qml/widgets/qmldir b/tests/auto/qml/resources/qml/widgets/qmldir
index be36132a..be36132a 100644
--- a/tests/qml/resources/qml/widgets/qmldir
+++ b/tests/auto/qml/resources/qml/widgets/qmldir
diff --git a/tests/qml/resources/relative/elements/LinenRect.qml b/tests/auto/qml/resources/relative/elements/LinenRect.qml
index 1fdf9205..1fdf9205 100644
--- a/tests/qml/resources/relative/elements/LinenRect.qml
+++ b/tests/auto/qml/resources/relative/elements/LinenRect.qml
diff --git a/tests/qml/resources/relative/elements/qmldir b/tests/auto/qml/resources/relative/elements/qmldir
index 16a01e45..16a01e45 100644
--- a/tests/qml/resources/relative/elements/qmldir
+++ b/tests/auto/qml/resources/relative/elements/qmldir
diff --git a/tests/qml/resources/resources.pro b/tests/auto/qml/resources/resources.pro
index 6da64f00..6da64f00 100644
--- a/tests/qml/resources/resources.pro
+++ b/tests/auto/qml/resources/resources.pro
diff --git a/tests/qml/resources/systemuifile.qrc b/tests/auto/qml/resources/systemuifile.qrc
index ce48e1a4..ce48e1a4 100644
--- a/tests/qml/resources/systemuifile.qrc
+++ b/tests/auto/qml/resources/systemuifile.qrc
diff --git a/tests/qml/resources/systemuiplugin.qrc b/tests/auto/qml/resources/systemuiplugin.qrc
index 7fe63a54..7fe63a54 100644
--- a/tests/qml/resources/systemuiplugin.qrc
+++ b/tests/auto/qml/resources/systemuiplugin.qrc
diff --git a/tests/qml/resources/test.pro b/tests/auto/qml/resources/test.pro
index 3553c02a..3553c02a 100644
--- a/tests/qml/resources/test.pro
+++ b/tests/auto/qml/resources/test.pro
diff --git a/tests/qml/resources/tst_resource.qml b/tests/auto/qml/resources/tst_resource.qml
index 8eb0e406..8eb0e406 100644
--- a/tests/qml/resources/tst_resource.qml
+++ b/tests/auto/qml/resources/tst_resource.qml
diff --git a/tests/auto/qml/simple/CMakeLists.txt b/tests/auto/qml/simple/CMakeLists.txt
new file mode 100644
index 00000000..9e793676
--- /dev/null
+++ b/tests/auto/qml/simple/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from simple.pro.
+
+#####################################################################
+## simple Binary:
+#####################################################################
+
+qt_internal_add_executable(simple
+    GUI
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:simple.pro:<TRUE>:
+# AM_CONFIG = "am-config.yaml"
+# TEST_APPS = "tld.test.simple1" "tld.test.simple2"
+# TEST_FILES = "tst_applicationmanager.qml"
diff --git a/tests/qml/simple/am-config.yaml b/tests/auto/qml/simple/am-config.yaml
index 2a515905..2a515905 100644
--- a/tests/qml/simple/am-config.yaml
+++ b/tests/auto/qml/simple/am-config.yaml
diff --git a/tests/qml/simple/apps/tld.test.simple1/app1.qml b/tests/auto/qml/simple/apps/tld.test.simple1/app1.qml
index 11c7ad78..11c7ad78 100644
--- a/tests/qml/simple/apps/tld.test.simple1/app1.qml
+++ b/tests/auto/qml/simple/apps/tld.test.simple1/app1.qml
diff --git a/tests/qml/simple/apps/tld.test.simple1/icon.png b/tests/auto/qml/simple/apps/tld.test.simple1/icon.png
index adb840ce..adb840ce 100644
--- a/tests/qml/simple/apps/tld.test.simple1/icon.png
+++ b/tests/auto/qml/simple/apps/tld.test.simple1/icon.png
diff --git a/tests/qml/simple/apps/tld.test.simple1/info.yaml b/tests/auto/qml/simple/apps/tld.test.simple1/info.yaml
index 49a0e1e4..49a0e1e4 100644
--- a/tests/qml/simple/apps/tld.test.simple1/info.yaml
+++ b/tests/auto/qml/simple/apps/tld.test.simple1/info.yaml
diff --git a/tests/qml/simple/apps/tld.test.simple2/app.qml b/tests/auto/qml/simple/apps/tld.test.simple2/app.qml
index 4f046770..4f046770 100644
--- a/tests/qml/simple/apps/tld.test.simple2/app.qml
+++ b/tests/auto/qml/simple/apps/tld.test.simple2/app.qml
diff --git a/tests/qml/simple/apps/tld.test.simple2/icon.png b/tests/auto/qml/simple/apps/tld.test.simple2/icon.png
index adb840ce..adb840ce 100644
--- a/tests/qml/simple/apps/tld.test.simple2/icon.png
+++ b/tests/auto/qml/simple/apps/tld.test.simple2/icon.png
diff --git a/tests/qml/simple/apps/tld.test.simple2/info.yaml b/tests/auto/qml/simple/apps/tld.test.simple2/info.yaml
index f3366712..f3366712 100644
--- a/tests/qml/simple/apps/tld.test.simple2/info.yaml
+++ b/tests/auto/qml/simple/apps/tld.test.simple2/info.yaml
diff --git a/tests/qml/simple/simple.pro b/tests/auto/qml/simple/simple.pro
index 72dbea95..72dbea95 100644
--- a/tests/qml/simple/simple.pro
+++ b/tests/auto/qml/simple/simple.pro
diff --git a/tests/qml/simple/text-file.txt b/tests/auto/qml/simple/text-file.txt
index 0a05cde5..0a05cde5 100644
--- a/tests/qml/simple/text-file.txt
+++ b/tests/auto/qml/simple/text-file.txt
diff --git a/tests/qml/simple/tst_applicationmanager.qml b/tests/auto/qml/simple/tst_applicationmanager.qml
index ce3db553..ce3db553 100644
--- a/tests/qml/simple/tst_applicationmanager.qml
+++ b/tests/auto/qml/simple/tst_applicationmanager.qml
diff --git a/tests/auto/qml/windowitem/CMakeLists.txt b/tests/auto/qml/windowitem/CMakeLists.txt
new file mode 100644
index 00000000..271566ee
--- /dev/null
+++ b/tests/auto/qml/windowitem/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from windowitem.pro.
+
+#####################################################################
+## windowitem Binary:
+#####################################################################
+
+qt_internal_add_executable(windowitem
+    GUI
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:windowitem.pro:<TRUE>:
+# AM_CONFIG = "am-config.yaml"
+# TEST_APPS = "test.windowitem.app" "test.windowitem.multiwin"
+# TEST_FILES = "tst_windowitem.qml"
diff --git a/tests/qml/windowitem/am-config.yaml b/tests/auto/qml/windowitem/am-config.yaml
index aa82540b..aa82540b 100644
--- a/tests/qml/windowitem/am-config.yaml
+++ b/tests/auto/qml/windowitem/am-config.yaml
diff --git a/tests/qml/resources/apps/app1/icon.png b/tests/auto/qml/windowitem/apps/test.windowitem.app/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/resources/apps/app1/icon.png
+++ b/tests/auto/qml/windowitem/apps/test.windowitem.app/icon.png
diff --git a/tests/qml/windowitem/apps/test.windowitem.app/info.yaml b/tests/auto/qml/windowitem/apps/test.windowitem.app/info.yaml
index 1ef6fd93..1ef6fd93 100644
--- a/tests/qml/windowitem/apps/test.windowitem.app/info.yaml
+++ b/tests/auto/qml/windowitem/apps/test.windowitem.app/info.yaml
diff --git a/tests/qml/windowitem/apps/test.windowitem.app/main.qml b/tests/auto/qml/windowitem/apps/test.windowitem.app/main.qml
index 0fec1364..0fec1364 100644
--- a/tests/qml/windowitem/apps/test.windowitem.app/main.qml
+++ b/tests/auto/qml/windowitem/apps/test.windowitem.app/main.qml
diff --git a/tests/qml/resources/apps/app2/icon.png b/tests/auto/qml/windowitem/apps/test.windowitem.multiwin/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/resources/apps/app2/icon.png
+++ b/tests/auto/qml/windowitem/apps/test.windowitem.multiwin/icon.png
diff --git a/tests/qml/windowitem/apps/test.windowitem.multiwin/info.yaml b/tests/auto/qml/windowitem/apps/test.windowitem.multiwin/info.yaml
index 2c44d5d3..2c44d5d3 100644
--- a/tests/qml/windowitem/apps/test.windowitem.multiwin/info.yaml
+++ b/tests/auto/qml/windowitem/apps/test.windowitem.multiwin/info.yaml
diff --git a/tests/qml/windowitem/apps/test.windowitem.multiwin/main.qml b/tests/auto/qml/windowitem/apps/test.windowitem.multiwin/main.qml
index c3e0607d..c3e0607d 100644
--- a/tests/qml/windowitem/apps/test.windowitem.multiwin/main.qml
+++ b/tests/auto/qml/windowitem/apps/test.windowitem.multiwin/main.qml
diff --git a/tests/qml/windowitem/tst_windowitem.qml b/tests/auto/qml/windowitem/tst_windowitem.qml
index 1ad7d319..1ad7d319 100644
--- a/tests/qml/windowitem/tst_windowitem.qml
+++ b/tests/auto/qml/windowitem/tst_windowitem.qml
diff --git a/tests/qml/windowitem/windowitem.pro b/tests/auto/qml/windowitem/windowitem.pro
index fcc1b1f6..fcc1b1f6 100644
--- a/tests/qml/windowitem/windowitem.pro
+++ b/tests/auto/qml/windowitem/windowitem.pro
diff --git a/tests/auto/qml/windowitem2/CMakeLists.txt b/tests/auto/qml/windowitem2/CMakeLists.txt
new file mode 100644
index 00000000..482405d9
--- /dev/null
+++ b/tests/auto/qml/windowitem2/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from windowitem2.pro.
+
+#####################################################################
+## windowitem2 Binary:
+#####################################################################
+
+qt_internal_add_executable(windowitem2
+    GUI
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:windowitem2.pro:<TRUE>:
+# AM_CONFIG = "am-config.yaml"
+# TEST_APPS = "test.windowitem2.app"
+# TEST_FILES = "tst_windowitem2.qml"
diff --git a/tests/qml/windowitem2/am-config.yaml b/tests/auto/qml/windowitem2/am-config.yaml
index 5333dae3..5333dae3 100644
--- a/tests/qml/windowitem2/am-config.yaml
+++ b/tests/auto/qml/windowitem2/am-config.yaml
diff --git a/tests/qml/windowitem/apps/test.windowitem.app/icon.png b/tests/auto/qml/windowitem2/apps/test.windowitem2.app/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/windowitem/apps/test.windowitem.app/icon.png
+++ b/tests/auto/qml/windowitem2/apps/test.windowitem2.app/icon.png
diff --git a/tests/qml/windowitem2/apps/test.windowitem2.app/info.yaml b/tests/auto/qml/windowitem2/apps/test.windowitem2.app/info.yaml
index 34198c88..34198c88 100644
--- a/tests/qml/windowitem2/apps/test.windowitem2.app/info.yaml
+++ b/tests/auto/qml/windowitem2/apps/test.windowitem2.app/info.yaml
diff --git a/tests/qml/windowitem2/apps/test.windowitem2.app/main.qml b/tests/auto/qml/windowitem2/apps/test.windowitem2.app/main.qml
index a0c453aa..a0c453aa 100644
--- a/tests/qml/windowitem2/apps/test.windowitem2.app/main.qml
+++ b/tests/auto/qml/windowitem2/apps/test.windowitem2.app/main.qml
diff --git a/tests/qml/windowitem2/tst_windowitem2.qml b/tests/auto/qml/windowitem2/tst_windowitem2.qml
index 51759539..51759539 100644
--- a/tests/qml/windowitem2/tst_windowitem2.qml
+++ b/tests/auto/qml/windowitem2/tst_windowitem2.qml
diff --git a/tests/qml/windowitem2/windowitem2.pro b/tests/auto/qml/windowitem2/windowitem2.pro
index 022ea053..022ea053 100644
--- a/tests/qml/windowitem2/windowitem2.pro
+++ b/tests/auto/qml/windowitem2/windowitem2.pro
diff --git a/tests/auto/qml/windowmanager/CMakeLists.txt b/tests/auto/qml/windowmanager/CMakeLists.txt
new file mode 100644
index 00000000..4f0d2d91
--- /dev/null
+++ b/tests/auto/qml/windowmanager/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from windowmanager.pro.
+
+#####################################################################
+## windowmanager Binary:
+#####################################################################
+
+qt_internal_add_executable(windowmanager
+    GUI
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:windowmanager.pro:<TRUE>:
+# OTHER_FILES = "IviApplicationExtension.qml"
+# TEST_FILES = "tst_windowmanager.qml"
diff --git a/tests/qml/windowmanager/IviApplicationExtension.qml b/tests/auto/qml/windowmanager/IviApplicationExtension.qml
index 08486dc4..08486dc4 100644
--- a/tests/qml/windowmanager/IviApplicationExtension.qml
+++ b/tests/auto/qml/windowmanager/IviApplicationExtension.qml
diff --git a/tests/qml/windowmanager/tst_windowmanager.qml b/tests/auto/qml/windowmanager/tst_windowmanager.qml
index 5927fae1..5927fae1 100644
--- a/tests/qml/windowmanager/tst_windowmanager.qml
+++ b/tests/auto/qml/windowmanager/tst_windowmanager.qml
diff --git a/tests/qml/windowmanager/windowmanager.pro b/tests/auto/qml/windowmanager/windowmanager.pro
index 21cd8a91..21cd8a91 100644
--- a/tests/qml/windowmanager/windowmanager.pro
+++ b/tests/auto/qml/windowmanager/windowmanager.pro
diff --git a/tests/auto/qml/windowmapping/CMakeLists.txt b/tests/auto/qml/windowmapping/CMakeLists.txt
new file mode 100644
index 00000000..d071c8e1
--- /dev/null
+++ b/tests/auto/qml/windowmapping/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from windowmapping.pro.
+
+#####################################################################
+## windowmapping Binary:
+#####################################################################
+
+qt_internal_add_executable(windowmapping
+    GUI
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:windowmapping.pro:<TRUE>:
+# AM_CONFIG = "am-config.yaml"
+# TEST_APPS = "test.winmap.amwin" "test.winmap.amwin2" "test.winmap.loader" "test.winmap.ping" "test.winmap.qtobject" "test.winmap.rectangle" "test.winmap.window"
+# TEST_FILES = "tst_windowmapping.qml"
diff --git a/tests/qml/windowmapping/am-config.yaml b/tests/auto/qml/windowmapping/am-config.yaml
index 5333dae3..5333dae3 100644
--- a/tests/qml/windowmapping/am-config.yaml
+++ b/tests/auto/qml/windowmapping/am-config.yaml
diff --git a/tests/qml/windowmapping/apps/test.winmap.amwin/amwin.qml b/tests/auto/qml/windowmapping/apps/test.winmap.amwin/amwin.qml
index 05e56276..05e56276 100644
--- a/tests/qml/windowmapping/apps/test.winmap.amwin/amwin.qml
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.amwin/amwin.qml
diff --git a/tests/qml/windowitem/apps/test.windowitem.multiwin/icon.png b/tests/auto/qml/windowmapping/apps/test.winmap.amwin/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/windowitem/apps/test.windowitem.multiwin/icon.png
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.amwin/icon.png
diff --git a/tests/qml/windowmapping/apps/test.winmap.amwin/info.yaml b/tests/auto/qml/windowmapping/apps/test.winmap.amwin/info.yaml
index 78c26e03..78c26e03 100644
--- a/tests/qml/windowmapping/apps/test.winmap.amwin/info.yaml
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.amwin/info.yaml
diff --git a/tests/qml/windowmapping/apps/test.winmap.amwin2/amwin2.qml b/tests/auto/qml/windowmapping/apps/test.winmap.amwin2/amwin2.qml
index f6d58131..f6d58131 100644
--- a/tests/qml/windowmapping/apps/test.winmap.amwin2/amwin2.qml
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.amwin2/amwin2.qml
diff --git a/tests/qml/windowitem2/apps/test.windowitem2.app/icon.png b/tests/auto/qml/windowmapping/apps/test.winmap.amwin2/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/windowitem2/apps/test.windowitem2.app/icon.png
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.amwin2/icon.png
diff --git a/tests/qml/windowmapping/apps/test.winmap.amwin2/info.yaml b/tests/auto/qml/windowmapping/apps/test.winmap.amwin2/info.yaml
index 041524a8..041524a8 100644
--- a/tests/qml/windowmapping/apps/test.winmap.amwin2/info.yaml
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.amwin2/info.yaml
diff --git a/tests/qml/windowmapping/apps/test.winmap.loader/SubWin.qml b/tests/auto/qml/windowmapping/apps/test.winmap.loader/SubWin.qml
index a39ebc53..a39ebc53 100644
--- a/tests/qml/windowmapping/apps/test.winmap.loader/SubWin.qml
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.loader/SubWin.qml
diff --git a/tests/qml/windowmapping/apps/test.winmap.amwin/icon.png b/tests/auto/qml/windowmapping/apps/test.winmap.loader/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/windowmapping/apps/test.winmap.amwin/icon.png
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.loader/icon.png
diff --git a/tests/qml/windowmapping/apps/test.winmap.loader/info.yaml b/tests/auto/qml/windowmapping/apps/test.winmap.loader/info.yaml
index 6e486078..6e486078 100644
--- a/tests/qml/windowmapping/apps/test.winmap.loader/info.yaml
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.loader/info.yaml
diff --git a/tests/qml/windowmapping/apps/test.winmap.loader/loader.qml b/tests/auto/qml/windowmapping/apps/test.winmap.loader/loader.qml
index d1394ce4..d1394ce4 100644
--- a/tests/qml/windowmapping/apps/test.winmap.loader/loader.qml
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.loader/loader.qml
diff --git a/tests/qml/windowmapping/apps/test.winmap.amwin2/icon.png b/tests/auto/qml/windowmapping/apps/test.winmap.ping/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/windowmapping/apps/test.winmap.amwin2/icon.png
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.ping/icon.png
diff --git a/tests/qml/windowmapping/apps/test.winmap.ping/info.yaml b/tests/auto/qml/windowmapping/apps/test.winmap.ping/info.yaml
index 3f4e822e..3f4e822e 100644
--- a/tests/qml/windowmapping/apps/test.winmap.ping/info.yaml
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.ping/info.yaml
diff --git a/tests/qml/windowmapping/apps/test.winmap.ping/ping.qml b/tests/auto/qml/windowmapping/apps/test.winmap.ping/ping.qml
index c6e6c02d..c6e6c02d 100644
--- a/tests/qml/windowmapping/apps/test.winmap.ping/ping.qml
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.ping/ping.qml
diff --git a/tests/qml/windowmapping/apps/test.winmap.loader/icon.png b/tests/auto/qml/windowmapping/apps/test.winmap.qtobject/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/windowmapping/apps/test.winmap.loader/icon.png
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.qtobject/icon.png
diff --git a/tests/qml/windowmapping/apps/test.winmap.qtobject/info.yaml b/tests/auto/qml/windowmapping/apps/test.winmap.qtobject/info.yaml
index 98926746..98926746 100644
--- a/tests/qml/windowmapping/apps/test.winmap.qtobject/info.yaml
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.qtobject/info.yaml
diff --git a/tests/qml/windowmapping/apps/test.winmap.qtobject/qtobject.qml b/tests/auto/qml/windowmapping/apps/test.winmap.qtobject/qtobject.qml
index 203b0f56..203b0f56 100644
--- a/tests/qml/windowmapping/apps/test.winmap.qtobject/qtobject.qml
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.qtobject/qtobject.qml
diff --git a/tests/qml/windowmapping/apps/test.winmap.ping/icon.png b/tests/auto/qml/windowmapping/apps/test.winmap.rectangle/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/windowmapping/apps/test.winmap.ping/icon.png
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.rectangle/icon.png
diff --git a/tests/qml/windowmapping/apps/test.winmap.rectangle/info.yaml b/tests/auto/qml/windowmapping/apps/test.winmap.rectangle/info.yaml
index 0981b53d..0981b53d 100644
--- a/tests/qml/windowmapping/apps/test.winmap.rectangle/info.yaml
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.rectangle/info.yaml
diff --git a/tests/qml/windowmapping/apps/test.winmap.rectangle/rectangle.qml b/tests/auto/qml/windowmapping/apps/test.winmap.rectangle/rectangle.qml
index 8e11e72c..8e11e72c 100644
--- a/tests/qml/windowmapping/apps/test.winmap.rectangle/rectangle.qml
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.rectangle/rectangle.qml
diff --git a/tests/qml/windowmapping/apps/test.winmap.qtobject/icon.png b/tests/auto/qml/windowmapping/apps/test.winmap.window/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/windowmapping/apps/test.winmap.qtobject/icon.png
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.window/icon.png
diff --git a/tests/qml/windowmapping/apps/test.winmap.window/info.yaml b/tests/auto/qml/windowmapping/apps/test.winmap.window/info.yaml
index c527475d..c527475d 100644
--- a/tests/qml/windowmapping/apps/test.winmap.window/info.yaml
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.window/info.yaml
diff --git a/tests/qml/windowmapping/apps/test.winmap.window/window.qml b/tests/auto/qml/windowmapping/apps/test.winmap.window/window.qml
index 588f33ce..588f33ce 100644
--- a/tests/qml/windowmapping/apps/test.winmap.window/window.qml
+++ b/tests/auto/qml/windowmapping/apps/test.winmap.window/window.qml
diff --git a/tests/qml/windowmapping/tst_windowmapping.qml b/tests/auto/qml/windowmapping/tst_windowmapping.qml
index 140665c5..140665c5 100644
--- a/tests/qml/windowmapping/tst_windowmapping.qml
+++ b/tests/auto/qml/windowmapping/tst_windowmapping.qml
diff --git a/tests/qml/windowmapping/windowmapping.pro b/tests/auto/qml/windowmapping/windowmapping.pro
index e29aba28..e29aba28 100644
--- a/tests/qml/windowmapping/windowmapping.pro
+++ b/tests/auto/qml/windowmapping/windowmapping.pro
diff --git a/tests/auto/runtime/CMakeLists.txt b/tests/auto/runtime/CMakeLists.txt
new file mode 100644
index 00000000..d3973556
--- /dev/null
+++ b/tests/auto/runtime/CMakeLists.txt
@@ -0,0 +1,22 @@
+
+qt_internal_add_test(tst_runtime
+    SOURCES
+        ../error-checking.h
+        tst_runtime.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../data/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Qml
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManManagerPrivate
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_runtime CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/runtime/runtime.pro b/tests/auto/runtime/runtime.pro
index 64c550cc..64c550cc 100644
--- a/tests/runtime/runtime.pro
+++ b/tests/auto/runtime/runtime.pro
diff --git a/tests/runtime/tst_runtime.cpp b/tests/auto/runtime/tst_runtime.cpp
index ee62e5d4..ee62e5d4 100644
--- a/tests/runtime/tst_runtime.cpp
+++ b/tests/auto/runtime/tst_runtime.cpp
diff --git a/tests/auto/signature/CMakeLists.txt b/tests/auto/signature/CMakeLists.txt
new file mode 100644
index 00000000..4a102b45
--- /dev/null
+++ b/tests/auto/signature/CMakeLists.txt
@@ -0,0 +1,41 @@
+
+qt_internal_add_test(tst_signature
+    SOURCES
+        ../error-checking.h
+        tst_signature.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../data/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManCommonPrivate
+        Qt::AppManCryptoPrivate
+)
+
+# Resources:
+set(tst_signature_resource_files
+    "signature-openssl.p7"
+    "signature-securityframework.p7"
+    "signature-wincrypt.p7"
+    "signing-no-key.p12"
+    "signing.p12"
+    "verifying.crt"
+)
+
+qt_internal_add_resource(tst_signature "tst_signature"
+    PREFIX
+        "/"
+    FILES
+        ${tst_signature_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:signature.pro:<TRUE>:
+# OTHER_FILES = "create-test-data.sh"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_signature CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/signature/create-test-data.sh b/tests/auto/signature/create-test-data.sh
index 68f05575..68f05575 100644
--- a/tests/signature/create-test-data.sh
+++ b/tests/auto/signature/create-test-data.sh
diff --git a/tests/signature/signature-openssl.p7 b/tests/auto/signature/signature-openssl.p7
index 294310cf..294310cf 100644
--- a/tests/signature/signature-openssl.p7
+++ b/tests/auto/signature/signature-openssl.p7
diff --git a/tests/signature/signature-securityframework.p7 b/tests/auto/signature/signature-securityframework.p7
index ded48dd8..ded48dd8 100644
--- a/tests/signature/signature-securityframework.p7
+++ b/tests/auto/signature/signature-securityframework.p7
diff --git a/tests/signature/signature-wincrypt.p7 b/tests/auto/signature/signature-wincrypt.p7
index e3ef40d3..e3ef40d3 100644
--- a/tests/signature/signature-wincrypt.p7
+++ b/tests/auto/signature/signature-wincrypt.p7
diff --git a/tests/signature/signature.pro b/tests/auto/signature/signature.pro
index 43bb3d47..43bb3d47 100644
--- a/tests/signature/signature.pro
+++ b/tests/auto/signature/signature.pro
diff --git a/tests/signature/signing-no-key.p12 b/tests/auto/signature/signing-no-key.p12
index 57705d79..57705d79 100644
--- a/tests/signature/signing-no-key.p12
+++ b/tests/auto/signature/signing-no-key.p12
diff --git a/tests/signature/signing.p12 b/tests/auto/signature/signing.p12
index 5d752759..5d752759 100644
--- a/tests/signature/signing.p12
+++ b/tests/auto/signature/signing.p12
diff --git a/tests/signature/tst_signature.cpp b/tests/auto/signature/tst_signature.cpp
index ea4f471d..ea4f471d 100644
--- a/tests/signature/tst_signature.cpp
+++ b/tests/auto/signature/tst_signature.cpp
diff --git a/tests/signature/tst_signature.qrc b/tests/auto/signature/tst_signature.qrc
index f063bca7..f063bca7 100644
--- a/tests/signature/tst_signature.qrc
+++ b/tests/auto/signature/tst_signature.qrc
diff --git a/tests/signature/verifying.crt b/tests/auto/signature/verifying.crt
index de7dcc07..de7dcc07 100644
--- a/tests/signature/verifying.crt
+++ b/tests/auto/signature/verifying.crt
diff --git a/tests/auto/sudo/CMakeLists.txt b/tests/auto/sudo/CMakeLists.txt
new file mode 100644
index 00000000..5f64939c
--- /dev/null
+++ b/tests/auto/sudo/CMakeLists.txt
@@ -0,0 +1,23 @@
+
+qt_internal_add_test(tst_sudo
+    SOURCES
+        ../error-checking.h
+        tst_sudo.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../data/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManCommonPrivate
+        Qt::AppManManagerPrivate
+)
+
+#### Keys ignored in scope 1:.:.:sudo.pro:<TRUE>:
+# COVERAGE_RUNTIME = "sudo"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_sudo CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/sudo/sudo.pro b/tests/auto/sudo/sudo.pro
index 95be319b..95be319b 100644
--- a/tests/sudo/sudo.pro
+++ b/tests/auto/sudo/sudo.pro
diff --git a/tests/sudo/tst_sudo.cpp b/tests/auto/sudo/tst_sudo.cpp
index c6472152..c6472152 100644
--- a/tests/sudo/tst_sudo.cpp
+++ b/tests/auto/sudo/tst_sudo.cpp
diff --git a/tests/auto/systemreader/CMakeLists.txt b/tests/auto/systemreader/CMakeLists.txt
new file mode 100644
index 00000000..ca78937f
--- /dev/null
+++ b/tests/auto/systemreader/CMakeLists.txt
@@ -0,0 +1,23 @@
+
+qt_internal_add_test(tst_systemreader
+    SOURCES
+        ../error-checking.h
+        tst_systemreader.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManApplicationPrivate
+        Qt::AppManCommonPrivate
+        Qt::AppManManagerPrivate
+        Qt::AppManMonitorPrivate
+        Qt::AppManWindowPrivate
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_systemreader CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/systemreader/root/proc/1234/cgroup b/tests/auto/systemreader/root/proc/1234/cgroup
index cd5fc256..cd5fc256 100644
--- a/tests/systemreader/root/proc/1234/cgroup
+++ b/tests/auto/systemreader/root/proc/1234/cgroup
diff --git a/tests/systemreader/root/sys/fs/cgroup/memory/system.slice/run-u5853.scope/memory.limit_in_bytes b/tests/auto/systemreader/root/sys/fs/cgroup/memory/system.slice/run-u5853.scope/memory.limit_in_bytes
index 469ca93f..469ca93f 100644
--- a/tests/systemreader/root/sys/fs/cgroup/memory/system.slice/run-u5853.scope/memory.limit_in_bytes
+++ b/tests/auto/systemreader/root/sys/fs/cgroup/memory/system.slice/run-u5853.scope/memory.limit_in_bytes
diff --git a/tests/systemreader/root/sys/fs/cgroup/memory/system.slice/run-u5853.scope/memory.stat b/tests/auto/systemreader/root/sys/fs/cgroup/memory/system.slice/run-u5853.scope/memory.stat
index e5fe0114..e5fe0114 100644
--- a/tests/systemreader/root/sys/fs/cgroup/memory/system.slice/run-u5853.scope/memory.stat
+++ b/tests/auto/systemreader/root/sys/fs/cgroup/memory/system.slice/run-u5853.scope/memory.stat
diff --git a/tests/systemreader/systemreader.pro b/tests/auto/systemreader/systemreader.pro
index 5955d5f1..5955d5f1 100644
--- a/tests/systemreader/systemreader.pro
+++ b/tests/auto/systemreader/systemreader.pro
diff --git a/tests/systemreader/tst_systemreader.cpp b/tests/auto/systemreader/tst_systemreader.cpp
index dc62884c..6f83409a 100644
--- a/tests/systemreader/tst_systemreader.cpp
+++ b/tests/auto/systemreader/tst_systemreader.cpp
@@ -50,7 +50,7 @@ private slots:
 
 tst_SystemReader::tst_SystemReader()
 {
-    g_systemRootDir = QFINDTESTDATA("root");
+    g_systemRootDir = qL1S(AM_TESTDATA_DIR "/root");
 }
 
 void tst_SystemReader::cgroupProcessInfo()
diff --git a/tests/tests.pri b/tests/auto/tests.pri
index 64ec6309..64ec6309 100644
--- a/tests/tests.pri
+++ b/tests/auto/tests.pri
diff --git a/tests/tests.pro b/tests/auto/tests.pro
index 3bfd9083..3bfd9083 100644
--- a/tests/tests.pro
+++ b/tests/auto/tests.pro
diff --git a/tests/auto/utilities/CMakeLists.txt b/tests/auto/utilities/CMakeLists.txt
new file mode 100644
index 00000000..7e533078
--- /dev/null
+++ b/tests/auto/utilities/CMakeLists.txt
@@ -0,0 +1,19 @@
+
+qt_internal_add_test(tst_utilities
+    SOURCES
+        ../error-checking.h
+        tst_utilities.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../data/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManCommonPrivate
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_utilities CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/utilities/tst_utilities.cpp b/tests/auto/utilities/tst_utilities.cpp
index 94487932..94487932 100644
--- a/tests/utilities/tst_utilities.cpp
+++ b/tests/auto/utilities/tst_utilities.cpp
diff --git a/tests/utilities/utilities.pro b/tests/auto/utilities/utilities.pro
index 9a7c2bc0..9a7c2bc0 100644
--- a/tests/utilities/utilities.pro
+++ b/tests/auto/utilities/utilities.pro
diff --git a/tests/auto/yaml/CMakeLists.txt b/tests/auto/yaml/CMakeLists.txt
new file mode 100644
index 00000000..74d63318
--- /dev/null
+++ b/tests/auto/yaml/CMakeLists.txt
@@ -0,0 +1,34 @@
+
+qt_internal_add_test(tst_yaml
+    SOURCES
+        ../error-checking.h
+        tst_yaml.cpp
+    DEFINES
+        AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../data/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::AppManCommonPrivate
+)
+
+# Resources:
+set(qmake_immediate_resource_files
+    "data/cache1.yaml"
+    "data/cache2.yaml"
+    "data/test.yaml"
+)
+
+qt_internal_add_resource(tst_yaml "qmake_immediate"
+    PREFIX
+        "/"
+    FILES
+        ${qmake_immediate_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_yaml CONDITION TARGET Qt::DBus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/yaml/data/cache1.yaml b/tests/auto/yaml/data/cache1.yaml
index b3fcddb9..b3fcddb9 100644
--- a/tests/yaml/data/cache1.yaml
+++ b/tests/auto/yaml/data/cache1.yaml
diff --git a/tests/yaml/data/cache2.yaml b/tests/auto/yaml/data/cache2.yaml
index 8ce7bae3..8ce7bae3 100644
--- a/tests/yaml/data/cache2.yaml
+++ b/tests/auto/yaml/data/cache2.yaml
diff --git a/tests/yaml/data/test.yaml b/tests/auto/yaml/data/test.yaml
index b16e3d39..b16e3d39 100644
--- a/tests/yaml/data/test.yaml
+++ b/tests/auto/yaml/data/test.yaml
diff --git a/tests/yaml/tst_yaml.cpp b/tests/auto/yaml/tst_yaml.cpp
index 7d5a2233..b07b5274 100644
--- a/tests/yaml/tst_yaml.cpp
+++ b/tests/auto/yaml/tst_yaml.cpp
@@ -252,7 +252,7 @@ template<> class ConfigCacheAdaptor<CacheTest>
 public:
     CacheTest *loadFromSource(QIODevice *source, const QString &fileName)
     {
-        QScopedPointer<CacheTest> ct(new CacheTest);
+        std::unique_ptr<CacheTest> ct(new CacheTest);
         YamlParser p(source->readAll(), fileName);
         p.nextDocument();
         p.parseFields({ { "name", true, YamlParser::Scalar, [&ct](YamlParser *p) {
@@ -260,7 +260,7 @@ public:
                         { "file", true, YamlParser::Scalar, [&ct](YamlParser *p) {
                           ct->file = p->parseScalar().toString(); } }
                       });
-        return ct.take();
+        return ct.release();
     }
     CacheTest *loadFromCache(QDataStream &ds)
     {
diff --git a/tests/yaml/yaml.pro b/tests/auto/yaml/yaml.pro
index 5cc4bbb5..5cc4bbb5 100644
--- a/tests/yaml/yaml.pro
+++ b/tests/auto/yaml/yaml.pro
diff --git a/tests/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt
new file mode 100644
index 00000000..1e87168e
--- /dev/null
+++ b/tests/benchmarks/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+# add_subdirectory(appman-bench)
diff --git a/tests/benchmarks/appman-bench/CMakeLists.txt b/tests/benchmarks/appman-bench/CMakeLists.txt
new file mode 100644
index 00000000..61526436
--- /dev/null
+++ b/tests/benchmarks/appman-bench/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Generated from appman-bench.pro.
+
diff --git a/benchmarks/appman-bench/README b/tests/benchmarks/appman-bench/README
index 0af954ee..0af954ee 100644
--- a/benchmarks/appman-bench/README
+++ b/tests/benchmarks/appman-bench/README
diff --git a/benchmarks/appman-bench/am-config.yaml b/tests/benchmarks/appman-bench/am-config.yaml
index 21d47daf..21d47daf 100644
--- a/benchmarks/appman-bench/am-config.yaml
+++ b/tests/benchmarks/appman-bench/am-config.yaml
diff --git a/benchmarks/appman-bench/appman-bench.pro b/tests/benchmarks/appman-bench/appman-bench.pro
index 2baae5e2..2baae5e2 100644
--- a/benchmarks/appman-bench/appman-bench.pro
+++ b/tests/benchmarks/appman-bench/appman-bench.pro
diff --git a/benchmarks/appman-bench/run.sh b/tests/benchmarks/appman-bench/run.sh
index d6a3242c..d6a3242c 100644
--- a/benchmarks/appman-bench/run.sh
+++ b/tests/benchmarks/appman-bench/run.sh
diff --git a/benchmarks/appman-bench/system-ui/main.qml b/tests/benchmarks/appman-bench/system-ui/main.qml
index 20843986..20843986 100644
--- a/benchmarks/appman-bench/system-ui/main.qml
+++ b/tests/benchmarks/appman-bench/system-ui/main.qml
diff --git a/tests/qml/windowmapping/apps/test.winmap.rectangle/icon.png b/tests/benchmarks/appman-bench/templates/appman-qml/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/windowmapping/apps/test.winmap.rectangle/icon.png
+++ b/tests/benchmarks/appman-bench/templates/appman-qml/icon.png
diff --git a/benchmarks/appman-bench/templates/appman-qml/info.yaml b/tests/benchmarks/appman-bench/templates/appman-qml/info.yaml
index 6d82c3d0..6d82c3d0 100644
--- a/benchmarks/appman-bench/templates/appman-qml/info.yaml
+++ b/tests/benchmarks/appman-bench/templates/appman-qml/info.yaml
diff --git a/benchmarks/appman-bench/templates/appman-qml/main.qml b/tests/benchmarks/appman-bench/templates/appman-qml/main.qml
index 07cc3de5..07cc3de5 100644
--- a/benchmarks/appman-bench/templates/appman-qml/main.qml
+++ b/tests/benchmarks/appman-bench/templates/appman-qml/main.qml
diff --git a/tests/qml/windowmapping/apps/test.winmap.window/icon.png b/tests/benchmarks/appman-bench/templates/qmlscene/icon.png
index c1397153..c1397153 100644
--- a/tests/qml/windowmapping/apps/test.winmap.window/icon.png
+++ b/tests/benchmarks/appman-bench/templates/qmlscene/icon.png
diff --git a/benchmarks/appman-bench/templates/qmlscene/info.yaml b/tests/benchmarks/appman-bench/templates/qmlscene/info.yaml
index 3ecadf30..3ecadf30 100644
--- a/benchmarks/appman-bench/templates/qmlscene/info.yaml
+++ b/tests/benchmarks/appman-bench/templates/qmlscene/info.yaml
diff --git a/benchmarks/appman-bench/templates/qmlscene/main.qml b/tests/benchmarks/appman-bench/templates/qmlscene/main.qml
index 6b7c0f27..6b7c0f27 100644
--- a/benchmarks/appman-bench/templates/qmlscene/main.qml
+++ b/tests/benchmarks/appman-bench/templates/qmlscene/main.qml
diff --git a/benchmarks/appman-bench/tests/controls2.qml b/tests/benchmarks/appman-bench/tests/controls2.qml
index b0f3bff6..b0f3bff6 100644
--- a/benchmarks/appman-bench/tests/controls2.qml
+++ b/tests/benchmarks/appman-bench/tests/controls2.qml
diff --git a/benchmarks/appman-bench/tests/rect.qml b/tests/benchmarks/appman-bench/tests/rect.qml
index 39f9cd10..39f9cd10 100644
--- a/benchmarks/appman-bench/tests/rect.qml
+++ b/tests/benchmarks/appman-bench/tests/rect.qml
diff --git a/benchmarks/appman-bench/tests/repeater.qml b/tests/benchmarks/appman-bench/tests/repeater.qml
index 35a57980..35a57980 100644
--- a/benchmarks/appman-bench/tests/repeater.qml
+++ b/tests/benchmarks/appman-bench/tests/repeater.qml
diff --git a/benchmarks/appman-bench/tests/shader.qml b/tests/benchmarks/appman-bench/tests/shader.qml
index 6ea1aabe..6ea1aabe 100644
--- a/benchmarks/appman-bench/tests/shader.qml
+++ b/tests/benchmarks/appman-bench/tests/shader.qml
diff --git a/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
index ca7d4f1f..ca7d4f1f 100644
--- a/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/benchmarks.pro
diff --git a/tests/data/certificates/create-test-certificates.sh b/tests/data/certificates/create-test-certificates.sh
index 415a6104..415a6104 100644..100755
--- a/tests/data/certificates/create-test-certificates.sh
+++ b/tests/data/certificates/create-test-certificates.sh
diff --git a/tests/data/create-test-packages.sh b/tests/data/create-test-packages.sh
index 3a051ee2..3a051ee2 100644..100755
--- a/tests/data/create-test-packages.sh
+++ b/tests/data/create-test-packages.sh
diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt
new file mode 100644
index 00000000..12298f87
--- /dev/null
+++ b/tests/manual/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+# add_subdirectory(monitormodel)
diff --git a/tests/manual/monitormodel/CMakeLists.txt b/tests/manual/monitormodel/CMakeLists.txt
new file mode 100644
index 00000000..e6fa5b92
--- /dev/null
+++ b/tests/manual/monitormodel/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Generated from monitormodel.pro.
+