cmake: remove qmake build system (except in examples/)

Change-Id: I8d00047f8e03bb77863041eaa99f1bba13a15a32
Reviewed-by: Dominik Holland <dominik.holland@qt.io>

83 files changed, 19 insertions, 2044 deletions

diff --git a/.qmake.conf b/.qmake.conf
deleted file mode 100644
index cad05d8c..00000000
--- a/.qmake.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-load(qt_build_config)
-
-MODULE_VERSION = 6.0.0
-
-SOURCE_DIR=$$PWD
-BUILD_DIR=$$shadowed($$PWD)
-QMAKEFEATURES=$$SOURCE_DIR/qmake-features
-
-CMAKE_MODULE_TESTS = -
-
-# Load the am-coverage feature in every pro file
-# This makes sure we compile everything with coverage data
-# when the coverage target gets executed
-!win32: CONFIG += am-coverage
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c350b52f..8b7249ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,8 @@ if(NOT TARGET Qt::Gui OR NOT TARGET Qt::Quick)
     return()
 endif()
 
+## COVERAGE ###########################################################
+
 if(AM_COVERAGE)
     if(NOT (LINUX AND (GCC OR CLANG)))
         message(FATAL_ERROR "Coverage builds are only supported on Linux, using GCC or Clang.")
@@ -87,10 +89,27 @@ if(AM_COVERAGE)
     )
 endif()
 
+## BUILD ##############################################################
+
 qt_build_repo()
 
+## DOCUMENTATION ######################################################
+
 add_custom_target(QtApplicationManagerDoc)
 
 qt_internal_add_docs(QtApplicationManagerDoc
     doc/qtapplicationmanager.qdocconf
 )
+
+## QMAKE FEATURES #####################################################
+
+if(NOT QT_BUILD_STANDALONE_TESTS)
+    # Copy mkspecs for users preferring qmake builds
+    set(mkspecs_install_dir "${INSTALL_MKSPECSDIR}")
+    qt_path_join(mkspecs_install_dir ${QT_INSTALL_DIR} ${mkspecs_install_dir})
+
+    qt_copy_or_install(DIRECTORY qmake-features/
+        DESTINATION "${mkspecs_install_dir}"
+        FILES_MATCHING PATTERN "*.pr[if]"
+    )
+endif()
diff --git a/application-manager.pro b/application-manager.pro
deleted file mode 100644
index 0f6f4e88..00000000
--- a/application-manager.pro
+++ /dev/null
@@ -1,159 +0,0 @@
-requires(linux|android|macos|ios|win32:!winrt)
-!versionAtLeast(QT_VERSION, 5.15.0) {
-    log("$$escape_expand(\\n\\n) *** The QtApplicationManager module needs to be built against Qt 5.15.0+ ***$$escape_expand(\\n\\n)")
-    CONFIG += Qt_version_needs_to_be_at_least_5_15_0
-}
-requires(!Qt_version_needs_to_be_at_least_5_15_0)
-
-!tools-only:requires(qtHaveModule(gui))
-!tools-only:requires(qtHaveModule(qml))
-
-TEMPLATE = subdirs
-CONFIG += ordered
-
-SUBDIRS += qmake-features
-SUBDIRS += benchmarks
-
-enable-tests:QT_BUILD_PARTS *= tests
-else:contains(QT_BUILD_PARTS, "tests"):CONFIG += enable-tests
-enable-examples:QT_BUILD_PARTS *= examples
-else:contains(QT_BUILD_PARTS, "examples"):CONFIG += enable-examples
-
-!ios { # QtCreator won't load the pro file correctly otherwise
-    load(configure)
-    qtCompileTest(libarchive)
-    qtCompileTest(libyaml)
-    qtHaveModule(gui):qtCompileTest(touchemulation)
-}
-
-qtHaveModule(waylandcompositor):qtHaveModule(quick):qtHaveModule(gui):qtConfig(opengl):CONFIG += am_compatible_compositor
-
-load(am-config)
-
-force-single-process:force-multi-process:error("You cannot both specify force-single-process and force-multi-process")
-force-multi-process:!am_compatible_compositor:error("You forced multi-process mode, but the QtCompositor module is not available")
-
-!disable-installer:if(linux|force-libcrypto) {
-    !if(contains(QT_CONFIG,"openssl")|contains(QT_CONFIG,"openssl-linked")|contains(QT_CONFIG,"ssl")):error("Qt was built without OpenSSL support.")
-}
-
-!config_libyaml|no-system-libyaml {
-    force-system-libyaml:error("Could not find a system installation for libyaml.")
-    else:SUBDIRS += 3rdparty/libyaml/libyaml.pro
-}
-!config_libarchive|no-system-libarchive {
-    force-system-libarchive:error("Could not find a system installation for libarchive.")
-    else:SUBDIRS += 3rdparty/libarchive/libarchive.pro
-}
-
-!disable-libbacktrace:if(linux:!android:if(enable-libbacktrace|CONFIG(debug, debug|release))|macos) {
-    check_libbacktrace = "yes"
-    SUBDIRS += 3rdparty/libbacktrace/libbacktrace.pro
-} else {
-    check_libbacktrace = "no"
-}
-
-windows:msvc:!disable-stackwalker {
-    check_stackwalker = "yes"
-    SUBDIRS += 3rdparty/stackwalker/stackwalker.pro
-} else {
-    check_stackwalker = "no"
-}
-
-!tools-only: SUBDIRS += doc
-
-load(qt_parts)
-
-android|tools-only {
-    # removing them from QT_BUILD_PARTS doesn't help
-    SUBDIRS -= sub_tests
-    SUBDIRS -= sub_examples
-}
-
-if(linux|force-libcrypto):check_crypto = "libcrypto / OpenSSL"
-else:win32:check_crypto = "WinCrypt"
-else:if(macos|ios):check_crypto = "SecurityFramework"
-
-auto-multi-process { check_multi = "yes (auto detect)" } else { check_multi = "no (auto detect)" }
-force-single-process { check_multi = "no (force-single-process)" }
-force-multi-process  { check_multi = "yes (force-multi-process)" }
-
-CONFIG(debug, debug|release) { check_debug = "debug" } else { check_debug = "release" }
-
-!isEmpty(AM_HARDWARE_ID_FF):check_hwid = "(from file) $$AM_HARDWARE_ID_FF"
-else:!isEmpty(AM_HARDWARE_ID):check_hwid = "$$AM_HARDWARE_ID"
-else:check_hwid = "auto (derived from network MAC address)"
-
-load(config-output)
-
-printConfigLine()
-printConfigLine("-- Application Manager configuration", , orange)
-printConfigLine("Version", "$$MODULE_VERSION", white)
-printConfigLine("Hardware Id", $$check_hwid, auto)
-printConfigLine("Qt version", $$[QT_VERSION], white)
-printConfigLine("Qt installation", $$[QT_HOST_BINS])
-printConfigLine("Debug or release", $$check_debug, white)
-printConfigLine("Installation prefix", $$INSTALL_PREFIX, auto)
-printConfigLine("Tools only build", $$yesNo(CONFIG(tools-only)), auto)
-printConfigLine("Enable support for QtWidgets", $$yesNo(CONFIG(enable-widgets)), auto)
-printConfigLine("Touch emulation", $$yesNo(CONFIG(config_touchemulation)), auto)
-printConfigLine("QtCompositor support", $$yesNo(CONFIG(am_compatible_compositor)), auto)
-printConfigLine("Multi-process mode", $$check_multi, auto)
-printConfigLine("Installer enabled", $$yesNo(!CONFIG(disable-installer)), auto)
-printConfigLine("Ext. DBus interfaces enabled", $$yesNo(!CONFIG(disable-external-dbus-interfaces)), auto)
-printConfigLine("Tests enabled", $$yesNo(CONFIG(enable-tests)), auto)
-printConfigLine("Examples enabled", $$yesNo(CONFIG(enable-examples)), auto)
-!disable-installer:printConfigLine("Crypto backend", $$check_crypto, auto)
-printConfigLine("Genivi support", $$yesNo(qtHaveModule(geniviextras)), auto)
-unix:printConfigLine("libbacktrace support", $$check_libbacktrace, auto)
-windows:printConfigLine("StackWalker support", $$check_stackwalker, auto)
-printConfigLine("Systemd workaround", $$yesNo(CONFIG(systemd-workaround)), auto)
-printConfigLine("System libarchive", $$yesNo(config_libarchive:!no-system-libarchive), auto)
-printConfigLine("System libyaml", $$yesNo(config_libyaml:!no-system-libyaml), auto)
-printConfigLine()
-
-OTHER_FILES += \
-    INSTALL.md \
-    .qmake.conf \
-    application-manager.conf \
-    template-opt/am/*.yaml \
-    sync.profile \
-    header.*[^~] \
-    LICENSE.*[^~] \
-    config.tests/libarchive/* \
-    config.tests/libyaml/* \
-    config.tests/touchemulation/* \
-    util/bash/appman-prompt \
-    util/bash/README \
-
-GCOV_EXCLUDE = /usr/* \
-               $$[QT_INSTALL_PREFIX]/* \
-               $$[QT_INSTALL_PREFIX/src]/* \
-               $$_PRO_FILE_PWD_/tests/* \
-               moc_* \
-               $$_PRO_FILE_PWD_/examples/* \
-               $$OUT_PWD/* \
-
-
-!prefix_build: GCOV_EXCLUDE += $$clean_path($$[QT_INSTALL_PREFIX]/../*) $$clean_path($$[QT_INSTALL_PREFIX/src]/../*)
-
-for (f, GCOV_EXCLUDE) {
-    GCOV_EXCLUDE_STR += $$shell_quote($$f)
-}
-
-global-check-coverage.target = check-coverage
-global-check-coverage.depends = coverage
-global-check-coverage.commands = ( \
-    find . -name \"*.gcov-info\" -print0 | xargs -0 rm -f && \
-    lcov -c -i -d . --rc lcov_branch_coverage=1 --rc geninfo_auto_base=1 -o $$OUT_PWD/base.gcov-info && \
-    cd tests && make check && cd .. && \
-    lcov -c -d . --rc lcov_branch_coverage=1 --rc geninfo_auto_base=1 -o $$OUT_PWD/test.gcov-info && \
-    lcov --rc lcov_branch_coverage=1 -o $$OUT_PWD/temp.gcov-info `find . -name \"*.gcov-info\" | xargs -n1 echo -a` && \
-    lcov --rc lcov_branch_coverage=1 -o $$OUT_PWD/application-manager.gcov-info -r temp.gcov-info $$GCOV_EXCLUDE_STR && \
-    rm -f base.gcov-info test.gcov-info temp.gcov-info && \
-    genhtml -o branch-coverage -s -f --legend --branch-coverage --rc lcov_branch_coverage=1 --demangle-cpp application-manager.gcov-info && \
-    echo \"\\n\\nCoverage info is available at file://`pwd`/branch-coverage/index.html\" \
-)
-
-QMAKE_EXTRA_TARGETS -= sub-check-coverage
-QMAKE_EXTRA_TARGETS *= global-check-coverage
diff --git a/doc/doc.pro b/doc/doc.pro
deleted file mode 100644
index 2baaf8e9..00000000
--- a/doc/doc.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-TEMPLATE = aux
-
-# setup the correct include paths for qdoc
-CONFIG += force_qt
-QT = core network
-qtHaveModule(quick):QT *= quick
-qtHaveModule(dbus): QT *= dbus
-qtHaveModule(widgets): QT *= widgets
-qtHaveModule(dltlogging):QT *= dltlogging
-
-# needed for the new clang based qdoc parser in Qt 5.11
-!prefix_build:INCLUDEPATH *= $$[QT_INSTALL_HEADERS]
-else:INCLUDEPATH *= $$BUILD_DIR/include
-
-build_online_docs: {
-    QMAKE_DOCS = $$PWD/online/applicationmanager.qdocconf
-} else {
-    QMAKE_DOCS = $$PWD/applicationmanager.qdocconf
-}
-
-OTHER_FILES += \
-    *.qdocconf \
-    *.qdoc \
-    QtApplicationManagerDoc \
diff --git a/examples/applicationmanager/applicationmanager.pro b/examples/applicationmanager/applicationmanager.pro
index 37a6cae4..651be23e 100644
--- a/examples/applicationmanager/applicationmanager.pro
+++ b/examples/applicationmanager/applicationmanager.pro
@@ -3,10 +3,6 @@
 # depend on appman_common-private
 requires(false)
 
-load(am-config)
-
-requires(!disable-installer)
-
 TEMPLATE = subdirs
 
 SUBDIRS = \
diff --git a/qmake-features/CMakeLists.txt b/qmake-features/CMakeLists.txt
deleted file mode 100644
index c58ce690..00000000
--- a/qmake-features/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated from qmake-features.pro.
-
diff --git a/qmake-features/add-static-library.prf b/qmake-features/add-static-library.prf
deleted file mode 100644
index 1597cf1a..00000000
--- a/qmake-features/add-static-library.prf
+++ /dev/null
@@ -1,32 +0,0 @@
-load(fix-library-path)
-
-defineTest(addStaticLibrary) {
-    libpath = $$1
-    libext = ".a"
-    libprefix = "lib"
-    srcdir = $$join(libpath,,$$join(PWD,,,'/'),)
-    libname = $$basename(libpath)
-    libdir = $$join(libpath,,$$join(OUT_PWD,,,'/'),)
-
-    libdir = $$fixLibraryPath($$libdir)
-    win32 {
-        libext = ".lib"
-        libprefix = ""
-    }
-    libdir=$$clean_path($$libdir)
-
-    INCLUDEPATH *= $$srcdir
-    CONFIG *= link_prl
-
-    *-gcc*:LIBS += -Wl,--whole-archive
-    LIBS += $$join(libdir,,-L,)
-    LIBS += $$join(libname,,-l,)
-    *-gcc*:LIBS += -Wl,--no-whole-archive
-
-    PRE_TARGETDEPS *= $$join(libdir,,,$$join(libname,,"/$$libprefix",$$libext))
-
-    export(INCLUDEPATH)
-    export(LIBS)
-    export(PRE_TARGETDEPS)
-    export(CONFIG)
-}
diff --git a/qmake-features/am-config.prf b/qmake-features/am-config.prf
deleted file mode 100644
index 82ebd7c6..00000000
--- a/qmake-features/am-config.prf
+++ /dev/null
@@ -1,71 +0,0 @@
-
-CONFIG *= c++11
-CONFIG *= link_pkgconfig
-CONFIG *= no_private_qt_headers_warning hide_symbols
-CONFIG -= app_bundle qml_debug
-CONFIG += exceptions
-
-DEFINES += QT_MESSAGELOGCONTEXT QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
-
-# CONFIG += sanitizer sanitize_address sanitize_undefined
-
-win32-msvc*:QMAKE_CXXFLAGS += /FS /wd4290 /DNOMINMAX /D_CRT_SECURE_NO_WARNINGS
-
-disable-installer:DEFINES *= AM_DISABLE_INSTALLER
-disable-external-dbus-interfaces:DEFINES *= AM_DISABLE_EXTERNAL_DBUS_INTERFACES
-systemd-workaround:DEFINES *= AM_SYSTEMD_WORKAROUND
-enable-widgets:DEFINES *= AM_ENABLE_WIDGETS
-config_touchemulation:DEFINES += AM_ENABLE_TOUCH_EMULATION
-!disable-libbacktrace:if(linux:!android:if(enable-libbacktrace|CONFIG(debug, debug|release))|macos): DEFINES *= AM_USE_LIBBACKTRACE
-windows:msvc:!disable-stackwalker: DEFINES *= AM_USE_STACKWALKER
-
-!force-single-process {
-    linux|macos {
-        if(qtHaveModule(waylandcompositor)) {
-            CONFIG *= auto-multi-process
-        }
-    }
-    if(force-multi-process|auto-multi-process) {
-        CONFIG *= multi-process
-        DEFINES *= AM_MULTI_PROCESS
-    }
-}
-
-DEFINES *= AM_VERSION=\\\"$$MODULE_VERSION\\\"
-
-defineTest(CONFIG_VALUE) {
-    !contains(CONFIG, "^$$1=.*"):return(false)
-    value = $$find(CONFIG, "^$$1=.*")
-    !isEmpty(value):value=$$section(value, =, 1, 1)
-    $$2 = $$value
-    export($$2)
-    return(true)
-}
-
-CONFIG_VALUE(install-prefix, INSTALL_PREFIX)
-
-CONFIG_VALUE(hardware-id, AM_HARDWARE_ID):DEFINES *= AM_HARDWARE_ID=\\\"$$AM_HARDWARE_ID\\\"
-else:CONFIG_VALUE(hardware-id-from-file, AM_HARDWARE_ID_FF):DEFINES *= AM_HARDWARE_ID_FROM_FILE=\\\"$$AM_HARDWARE_ID_FF\\\"
-
-linux|force-libcrypto:DEFINES *= AM_USE_LIBCRYPTO
-
-!win32:load(am-coverage.prf)
-
-
-# Unlike MSVC, MinGW does not add a dummy manifest, leading to UAC prompts on executable
-# filenames containing "bad" words like setup, install, update, patch, ...
-# RC files cannot be compiled into static libs, so we just generate one for each app.
-win32-g++*:equals(TEMPLATE, "app") {
-    MINGW_MF = "1 24 { \"<?xml version=\"\"1.0\"\" encoding=\"\"UTF-8\"\" standalone=\"\"yes\"\"?>\
-                <assembly xmlns=\"\"urn:schemas-microsoft-com:asm.v1\"\" manifestVersion=\"\"1.0\"\">\
-                  <trustInfo xmlns=\"\"urn:schemas-microsoft-com:asm.v2\"\">\
-                    <security>\
-                      <requestedPrivileges xmlns=\"\"urn:schemas-microsoft-com:asm.v3\"\">\
-                        <requestedExecutionLevel level=\"\"asInvoker\"\" uiAccess=\"\"false\"\" />\
-                      </requestedPrivileges>\
-                    </security>\
-                  </trustInfo>\
-                </assembly>\" }"
-    write_file($$OUT_PWD/mingw-resource-win.rc, MINGW_MF)
-    RC_FILE = $$OUT_PWD/mingw-resource-win.rc
-}
diff --git a/qmake-features/am-coverage.prf b/qmake-features/am-coverage.prf
deleted file mode 100644
index f08f190c..00000000
--- a/qmake-features/am-coverage.prf
+++ /dev/null
@@ -1,18 +0,0 @@
-# generate code coverage information using gcov/lcov/genhtml
-CONFIG(debug,debug|release) {
-    equals(TEMPLATE, "subdirs") {
-        coverage.target = coverage
-        coverage.CONFIG = recursive
-        QMAKE_EXTRA_TARGETS += coverage
-    } else {
-        coverage_pre.commands += @echo && echo "Building with coverage support..." && echo $(eval CXXFLAGS += -O0 -fprofile-arcs -ftest-coverage)$(eval LFLAGS += -O0 -fprofile-arcs -ftest-coverage)
-
-        coverage.CONFIG += recursive
-        coverage.commands = @echo && echo "Finished building with coverage support." && echo
-        build_pass|!debug_and_release:coverage.depends = coverage_pre all
-
-        QMAKE_EXTRA_TARGETS *= coverage_pre coverage
-    }
-}
-
-QMAKE_CLEAN += $(OBJECTS_DIR)/*.gcda $(OBJECTS_DIR)/*.gcno $(TARGET).gcov-info
diff --git a/qmake-features/am-qml-testcase.prf b/qmake-features/am-qml-testcase.prf
deleted file mode 100644
index adf91f1e..00000000
--- a/qmake-features/am-qml-testcase.prf
+++ /dev/null
@@ -1,103 +0,0 @@
-TEMPLATE = aux
-
-load(am-config)
-
-# Add environment for non-installed builds. Do this first, so the
-# 'make' variable expansions don't end up in a batch file/script.
-QT_TOOL_NAME = appman-qmltestrunner
-!isEmpty(TEST_FILES): qtAddTargetEnv(COMMAND, QT)
-
-# If the test ends up in a different directory, we should cd to that directory.
-TESTRUN_CWD = $$DESTDIR
-
-debug_and_release:debug_and_release_target {
-    # But in debug-and-release-target mode we don't want to cd into the debug/release
-    # directory (e.g. if the test goes to foo/release/tst_thing.exe, we want to do
-    # 'cd foo && release/tst_thing.exe', not 'cd foo/release && tst_thing.exe').
-
-    TESTRUN_CWD ~= s/(release|debug)$//
-    TEST_TARGET_DIR = $$relative_path($$absolute_path($$DESTDIR, $$OUT_PWD), $$absolute_path($$TESTRUN_CWD, $$OUT_PWD))
-}
-
-# Allow for a custom test runner script
-COMMAND += $(TESTRUNNER)
-
-# Define how the appman should be run, single-process, multi-process, both
-isEmpty(MODE) {
-    MODE = both
-    CONFIG *= qmltest-mode-auto
-}
-
-# Determine the location of the testrunner
-prefix_build {
-    AM_TESTRUNNER_DIR = $$BUILD_DIR/bin
-} else {
-    !isEmpty(INSTALL_PREFIX) {
-        AM_TESTRUNNER_DIR = $${INSTALL_PREFIX}/bin
-    } else {
-        AM_TESTRUNNER_DIR = $$[QT_INSTALL_BINS]
-    }
-}
-
-# The check command
-COMMAND += $$AM_TESTRUNNER_DIR/appman-qmltestrunner --no-cache --no-dlt-logging
-mac: COMMAND += --dbus=none
-!multi-process: {
-    !build_pass:!qmltest-mode-auto:message("am-qml-testcase: forcing MODE to single-process, because the application manager is built in single-process mode")
-    MODE = single-process
-}
-
-# Add import dirs
-for(import, IMPORTS_DIR) {
-    COMMAND += -I $$absolute_path($$import, $$_PRO_FILE_PWD_)
-}
-OTHER_FILES += $$IMPORTS_DIR
-
-# Read a config file
-for(config, AM_CONFIG) {
-    isEmpty(TESTRUN_CWD): COMMAND += -c $$absolute_path($$config, $$_PRO_FILE_PWD_)
-    else: COMMAND += -c $$config
-}
-OTHER_FILES += $$AM_CONFIG
-
-# Make AM_TESTDATA_DIR known
-!isEmpty(AM_TESTDATA_DIR) {
-    COMMAND += -o \'systemProperties: { public: { AM_TESTDATA_DIR: $$AM_TESTDATA_DIR } }\'
-}
-
-!isEmpty(TESTRUN_CWD):!contains(TESTRUN_CWD, ^\\./?): \
-    COMMAND = cd $$shell_path($$TESTRUN_CWD) && $$eval(COMMAND)
-
-QMAKE_EXTRA_TARGETS *= check
-
-# Set default test configuration (each config is run separately)
-isEmpty(TEST_CONFIGURATIONS) {
-    !equals(MODE, "single-process"): TEST_CONFIGURATIONS = "--force-multi-process"
-    !equals(MODE, "multi-process"): TEST_CONFIGURATIONS += "--force-single-process"
-}
-
-# Execute a testrunner for every file
-for(file, TEST_FILES) {
-    for(config, TEST_CONFIGURATIONS) {
-        check.commands += $$COMMAND $$absolute_path($$file, $$_PRO_FILE_PWD_) $${config} -- $(TESTARGS) &&
-    }
-}
-msvc:check.commands += VER>NUL
-else:check.commands += true;
-OTHER_FILES += $$TEST_FILES
-
-# Copy assets to build folder
-for (d , DIRECTORIES) {
-    do_copydata.commands += $(COPY_DIR) $$shell_path($$_PRO_FILE_PWD_/$${d}) $$shell_path($$OUT_PWD/$${d}) $$escape_expand(\n\t)
-}
-for (f , FILES) {
-    do_copydata.commands += $(COPY) $$shell_path($$_PRO_FILE_PWD_/$${f}) $$shell_path($$OUT_PWD/$${f}) $$escape_expand(\n\t)
-}
-
-!equals(_PRO_FILE_PWD_, $$OUT_PWD) {
-    check.depends = do_copydata
-    QMAKE_EXTRA_TARGETS += do_copydata
-}
-
-# Make sure that possible apps are in OTHER_FILES
-for (app, TEST_APPS): OTHER_FILES += apps/$${app}/*.yaml apps/$${app}/*.qml  apps/$${app}/*.png
diff --git a/qmake-features/build-config.prf b/qmake-features/build-config.prf
deleted file mode 100644
index d8be43a6..00000000
--- a/qmake-features/build-config.prf
+++ /dev/null
@@ -1,26 +0,0 @@
-# This functions creates a resource file named build-config.yaml. All variables that are given as
-# arguments are dumped into this file in YAML format as a map.
-# Given a variable named foo:
-# - if it is empty, it gets dumped as the null value: FOO: ~
-# - if it has a single values, it gets dumped as a string: FOO: "value"
-# - if it has multiple values, it gets dumped as list of strings:
-#     FOO:
-#     - "value1"
-#     - "value2"
-
-defineTest(createBuildConfig) {
-    write_file($$OUT_PWD/build-config.yaml, $$list("---"))
-    for(var, ARGS) {
-        isEmpty($$var):out = "$$var: ~"
-        else:count($$var, 1):out = "$$var: \"$$first($$var)\""
-        else {
-            out = "$$var:"
-            for(val, $$var):out += "  - \"$$val\""
-            out=$$join(out, "$$escape_expand(\\n)")
-        }
-        write_file($$OUT_PWD/build-config.yaml, out, append)
-    }
-    write_file($$OUT_PWD/config.qrc, $$list("<RCC version=\"1.0\"><qresource prefix=\"/\"><file>build-config.yaml</file></qresource></RCC>"))
-    RESOURCES += $$OUT_PWD/config.qrc
-    export(RESOURCES)
-}
diff --git a/qmake-features/config-output.prf b/qmake-features/config-output.prf
deleted file mode 100644
index 9527fe34..00000000
--- a/qmake-features/config-output.prf
+++ /dev/null
@@ -1,57 +0,0 @@
-defineReplace(yesNo) {
-   if ($$1):return("yes")
-   else:return("no")
-}
-
-defineTest(printConfigLine) {
-    !build_pass:return
-
-    msg="$$1"
-    val=$$2
-    color=$$3
-    width=$$4
-
-    isEmpty(width):width = 30
-
-    unix:system("test -t 2") { # check if we are on unix and stderr is a tty
-        macos:echo="echo"
-        else:echo="/bin/echo -e"
-
-        equals(color, "auto") {
-            yesmatch = $$find(val, "^yes")
-            nomatch = $$find(val, "^no")
-            automatch = $$find(val, "^auto")
-
-            !isEmpty(yesmatch):color = "green"
-            else:!isEmpty(nomatch):color = "red"
-            else:!isEmpty(automatch):color = "yellow"
-        }
-        equals(color, "red"):         prolog=$$system($$echo "\\\\033")[31;1m
-        else:equals(color, "green"):  prolog=$$system($$echo "\\\\033")[32;1m
-        else:equals(color, "yellow"): prolog=$$system($$echo "\\\\033")[33;1m
-        else:equals(color, "orange"): prolog=$$system($$echo "\\\\033")[33m
-        else:equals(color, "white"):  prolog=$$system($$echo "\\\\033")[37;1m
-        epilog = $$system($$echo "\\\\033")[0m
-    }
-
-    isEmpty(msg)|contains(msg, "^-- .*") {
-        log($$prolog$$section(msg, "-- ", 1, -1)$$epilog$$escape_expand(\\n))
-        return()
-    }
-
-    # The tricky part: there are no arithmetic functions in qmake!
-    # Start by createing an array of strings, where the string at [i] consists of i dots
-    # We need it the other way around though, hence the reverse at the end (sadly you
-    # cannot run a $$width..1 loop, although 30..1 does work).
-    for(i, 1..$$width) {
-        spacingEntry=""
-        for (j, 1..$$i) { spacingEntry += "." }
-        spacing += $$join(spacingEntry)
-    }
-    spacing = $$reverse(spacing)
-
-    # convert a string into an array of characters, so we can get the length via size()
-    msgArray = $$split(msg,)
-
-    log("  $$msg $$member(spacing, $$size(msgArray)) $$prolog$$val$$epilog$$escape_expand(\\n)")
-}
diff --git a/qmake-features/dbus-adaptors-xml.prf b/qmake-features/dbus-adaptors-xml.prf
deleted file mode 100644
index 66828c87..00000000
--- a/qmake-features/dbus-adaptors-xml.prf
+++ /dev/null
@@ -1,26 +0,0 @@
-
-load(moc)
-qtPrepareTool(QDBUSXML2CPP, qdbusxml2cpp)
-
-defineReplace(am_qdbusOutputBasename) {
-    return($$lower($$section($$list($$basename(1)),.,-2,-2)))
-}
-
-adaptors_header.commands = $$QDBUSXML2CPP -i dbus-utilities.h -a ${QMAKE_FILE_OUT}: ${QMAKE_FILE_IN}
-adaptors_header.depends += $$QDBUSXML2CPP_EXE
-adaptors_header.output = ${QMAKE_FUNC_FILE_IN_am_qdbusOutputBasename}_adaptor$${first(QMAKE_EXT_H)}
-adaptors_header.name = DBUS adaptor header for ${QMAKE_FILE_IN}
-adaptors_header.variable_out = dbus_adaptor_headers
-adaptors_header.input = ADAPTORS_XML
-adaptors_header.CONFIG += target_predep
-
-QMAKE_EXTRA_COMPILERS += adaptors_header
-
-adaptors_moc.commands = $$moc_header.commands
-adaptors_moc.depends += $$QMAKE_MOC_EXE
-adaptors_moc.output = $$moc_header.output
-adaptors_moc.input = dbus_adaptor_headers
-adaptors_moc.variable_out = GENERATED_SOURCES
-adaptors_moc.name = DBUS adaptor MOC headers
-
-QMAKE_EXTRA_COMPILERS += adaptors_moc
diff --git a/qmake-features/fix-library-path.prf b/qmake-features/fix-library-path.prf
deleted file mode 100644
index ca7a0132..00000000
--- a/qmake-features/fix-library-path.prf
+++ /dev/null
@@ -1,11 +0,0 @@
-defineReplace(fixLibraryPath) {
-    libpath = $$1
-    win32 {
-        CONFIG(debug, debug|release) {
-            libpath = $$join(libpath,,,/debug)
-        } else {
-            libpath = $$join(libpath,,,/release)
-        }
-    }
-    return($$libpath)
-}
diff --git a/qmake-features/install-prefix.prf b/qmake-features/install-prefix.prf
deleted file mode 100644
index 4c7a6252..00000000
--- a/qmake-features/install-prefix.prf
+++ /dev/null
@@ -1,8 +0,0 @@
-!isEmpty(INSTALL_PREFIX) {
-    prefix_build {
-        target.path = $${INSTALL_PREFIX}/bin
-        CONFIG -= relative_qt_rpath
-    } else {
-        DESTDIR = $${INSTALL_PREFIX}/bin
-    }
-}
diff --git a/qmake-features/qmake-features.pro b/qmake-features/qmake-features.pro
deleted file mode 100644
index b03e740d..00000000
--- a/qmake-features/qmake-features.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-TEMPLATE = aux
-
-OTHER_FILES += \
-    *.prf \
-
-#All the feature files we want to install and provide to other modules or to the examples
-features.files += \
-    am-systemui.prf \
-    am-app.prf \
-    am-package.prf
-features.path = $$[QT_HOST_DATA]/mkspecs/features
-
-INSTALLS += features
-
-# Ensure files are copied to qtbase mkspecs for non-prefixed builds
-!force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)) {
-    defineReplace(stripSrcDir) {
-        return($$relative_path($$1, $$_PRO_FILE_PWD_))
-    }
-    prffiles2build.input = features.files
-    prffiles2build.output = $$[QT_HOST_DATA]/mkspecs/features/${QMAKE_FUNC_FILE_IN_stripSrcDir}
-    prffiles2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-    prffiles2build.name = COPY ${QMAKE_FILE_IN}
-    prffiles2build.CONFIG = no_link target_predeps
-    QMAKE_EXTRA_COMPILERS += prffiles2build
-}
diff --git a/src/application-lib/application-lib.pro b/src/application-lib/application-lib.pro
deleted file mode 100644
index 7363acc1..00000000
--- a/src/application-lib/application-lib.pro
+++ /dev/null
@@ -1,33 +0,0 @@
-TEMPLATE = lib
-TARGET = QtAppManApplication
-MODULE = appman_application
-
-load(am-config)
-
-QT = core network
-QT_FOR_PRIVATE *= \
-    appman_common-private \
-
-CONFIG *= static internal_module
-CONFIG -= create_cmake
-
-HEADERS += \
-    applicationinfo.h \
-    packagescanner.h \
-    yamlpackagescanner.h \
-    installationreport.h \
-    applicationinterface.h \
-    intentinfo.h \
-    packageinfo.h \
-    packagedatabase.h \
-
-SOURCES += \
-    applicationinfo.cpp \
-    yamlpackagescanner.cpp \
-    installationreport.cpp \
-    applicationinterface.cpp \
-    intentinfo.cpp \
-    packageinfo.cpp \
-    packagedatabase.cpp \
-
-load(qt_module)
diff --git a/src/common-lib/common-lib.pro b/src/common-lib/common-lib.pro
deleted file mode 100644
index c4099f82..00000000
--- a/src/common-lib/common-lib.pro
+++ /dev/null
@@ -1,58 +0,0 @@
-TEMPLATE = lib
-TARGET = QtAppManCommon
-MODULE = appman_common
-
-load(am-config)
-
-QT = core core-private network concurrent
-qtHaveModule(geniviextras):QT *= geniviextras
-qtHaveModule(dbus):QT *= dbus
-qtHaveModule(qml):QT *= qml qml-private
-
-linux:LIBS += -ldl
-
-qtHaveModule(geniviextras):DEFINES *= AM_DLTLOGGING_LAZY_INIT
-
-CONFIG *= static internal_module
-CONFIG -= create_cmake
-
-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)
-
-SOURCES += \
-    exception.cpp \
-    utilities.cpp \
-    qtyaml.cpp \
-    startuptimer.cpp \
-    unixsignalhandler.cpp \
-    processtitle.cpp \
-    crashhandler.cpp \
-    logging.cpp \
-    dbus-utilities.cpp \
-    configcache.cpp
-
-qtHaveModule(qml):SOURCES += \
-    qml-utilities.cpp \
-
-HEADERS += \
-    global.h \
-    error.h \
-    exception.h \
-    utilities.h \
-    qtyaml.h \
-    startuptimer.h \
-    unixsignalhandler.h \
-    processtitle.h \
-    crashhandler.h \
-    logging.h \
-    configcache.h \
-    configcache_p.h
-
-qtHaveModule(qml):HEADERS += \
-    qml-utilities.h \
-
-qtHaveModule(dbus):HEADERS += \
-    dbus-utilities.h \
-
-load(qt_module)
diff --git a/src/crypto-lib/crypto-lib.pro b/src/crypto-lib/crypto-lib.pro
deleted file mode 100644
index 3f246568..00000000
--- a/src/crypto-lib/crypto-lib.pro
+++ /dev/null
@@ -1,45 +0,0 @@
-TEMPLATE = lib
-TARGET = QtAppManCrypto
-MODULE = appman_crypto
-
-load(am-config)
-
-QT = core
-QT_FOR_PRIVATE *= appman_common-private
-
-CONFIG *= static internal_module
-CONFIG -= create_cmake
-
-SOURCES += \
-    cryptography.cpp \
-    signature.cpp \
-
-HEADERS += \
-    cryptography.h \
-    signature.h \
-    signature_p.h \
-
-
-win32:LIBS += -ladvapi32
-
-win32:!force-libcrypto {
-    SOURCES += signature_win.cpp
-
-    LIBS += -lcrypt32
-} else:macos:!force-libcrypto {
-    SOURCES += signature_macos.cpp
-
-    LIBS += -framework CoreFoundation -framework Security
-    QT *= core-private
-} else {
-    SOURCES += \
-        libcryptofunction.cpp \
-        signature_openssl.cpp \
-
-    HEADERS += \
-        libcryptofunction.h \
-
-    QT *= network
-}
-
-load(qt_module)
diff --git a/src/dbus-lib/dbus-lib.pro b/src/dbus-lib/dbus-lib.pro
deleted file mode 100644
index ed1f249c..00000000
--- a/src/dbus-lib/dbus-lib.pro
+++ /dev/null
@@ -1,72 +0,0 @@
-TEMPLATE = lib
-TARGET = QtAppManDBus
-MODULE = appman_dbus
-
-load(am-config)
-
-QT = core dbus
-QT_FOR_PRIVATE *= \
-    appman_common-private \
-    appman_manager-private \
-    appman_window-private \
-
-CONFIG *= static internal_module
-CONFIG -= create_cmake
-CONFIG = dbus-adaptors-xml $$CONFIG
-
-HEADERS += \
-    dbuspolicy.h \
-    dbusdaemon.h \
-    abstractdbuscontextadaptor.h \
-    applicationmanagerdbuscontextadaptor.h \
-    notificationmanagerdbuscontextadaptor.h \
-    windowmanagerdbuscontextadaptor.h \
-
-SOURCES += \
-    dbuspolicy.cpp \
-    dbusdaemon.cpp \
-    abstractdbuscontextadaptor.cpp \
-    applicationmanagerdbuscontextadaptor.cpp \
-    notificationmanagerdbuscontextadaptor.cpp \
-    windowmanagerdbuscontextadaptor.cpp \
-
-ADAPTORS_XML = \
-    io.qt.applicationmanager.xml \
-    io.qt.windowmanager.xml \
-    org.freedesktop.notifications.xml \
-
-!disable-installer {
-    HEADERS += packagemanagerdbuscontextadaptor.h
-    SOURCES += packagemanagerdbuscontextadaptor.cpp
-    ADAPTORS_XML += io.qt.packagemanager.xml
-}
-
-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 \
-
-qtPrepareTool(QDBUSCPP2XML, qdbuscpp2xml)
-
-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-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
-
-recreate-dbus-xml.depends = recreate-applicationmanager-dbus-xml recreate-applicationinstaller-dbus-xml recreate-windowmanager-dbus-xml
-
-QMAKE_EXTRA_TARGETS += \
-    recreate-dbus-xml \
-    recreate-applicationmanager-dbus-xml \
-    recreate-packagemanager-dbus-xml \
-    recreate-windowmanager-dbus-xml \
-
-load(qt_module)
diff --git a/src/intent-client-lib/intent-client-lib.pro b/src/intent-client-lib/intent-client-lib.pro
deleted file mode 100644
index dc495719..00000000
--- a/src/intent-client-lib/intent-client-lib.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-TEMPLATE = lib
-TARGET = QtAppManIntentClient
-MODULE = appman_intent_client
-
-load(am-config)
-
-QT = core network qml
-QT_FOR_PRIVATE *= \
-    appman_common-private \
-
-CONFIG *= static internal_module
-CONFIG -= create_cmake
-
-HEADERS += \
-    intenthandler.h \
-    intentclient.h \
-    intentclientrequest.h \
-    intentclientsysteminterface.h
-
-SOURCES += \
-    intenthandler.cpp \
-    intentclient.cpp \
-    intentclientrequest.cpp \
-    intentclientsysteminterface.cpp
-
-load(qt_module)
diff --git a/src/intent-server-lib/intent-server-lib.pro b/src/intent-server-lib/intent-server-lib.pro
deleted file mode 100644
index 34519bfc..00000000
--- a/src/intent-server-lib/intent-server-lib.pro
+++ /dev/null
@@ -1,28 +0,0 @@
-TEMPLATE = lib
-TARGET = QtAppManIntentServer
-MODULE = appman_intent_server
-
-load(am-config)
-
-QT = core network qml
-QT_FOR_PRIVATE *= \
-    appman_common-private \
-
-CONFIG *= static internal_module
-CONFIG -= create_cmake
-
-HEADERS += \
-    intent.h \
-    intentserver.h \
-    intentserverrequest.h \
-    intentserversysteminterface.h \
-    intentmodel.h \
-
-SOURCES += \
-    intent.cpp \
-    intentserver.cpp \
-    intentserverrequest.cpp \
-    intentserversysteminterface.cpp \
-    intentmodel.cpp \
-
-load(qt_module)
diff --git a/src/launcher-lib/launcher-lib.pro b/src/launcher-lib/launcher-lib.pro
deleted file mode 100644
index eec38b3d..00000000
--- a/src/launcher-lib/launcher-lib.pro
+++ /dev/null
@@ -1,51 +0,0 @@
-TEMPLATE = lib
-TARGET = QtAppManLauncher
-MODULE = appman_launcher
-
-load(am-config)
-
-QT = qml dbus core-private quick gui gui-private quick-private
-enable-widgets:QT *= widgets
-QT_FOR_PRIVATE *= \
-    appman_common-private \
-    appman_shared_main-private \
-    appman_application-private \
-    appman_notification-private \
-    appman_intent_client-private \
-
-CONFIG *= static internal_module
-CONFIG -= create_cmake
-
-DBUS_INTERFACES += ../dbus-lib/io.qt.applicationmanager.intentinterface.xml
-
-SOURCES += \
-    dbusapplicationinterface.cpp \
-    ipcwrapperobject.cpp \
-    dbusapplicationinterfaceextension.cpp \
-    dbusnotification.cpp \
-    launchermain.cpp \
-    intentclientdbusimplementation.cpp \
-    applicationmanagerwindow.cpp \
-
-qtHaveModule(waylandclient) {
-    QT *= waylandclient waylandclient-private
-    CONFIG *= wayland-scanner generated_privates
-    private_headers.CONFIG += no_check_exists
-    WAYLANDCLIENTSOURCES += ../wayland-extensions/qtam-extension.xml
-    HEADERS += waylandqtamclientextension_p.h
-    SOURCES += waylandqtamclientextension.cpp
-
-    PKGCONFIG += wayland-client
-}
-
-HEADERS += \
-    dbusapplicationinterface.h \
-    ipcwrapperobject.h \
-    ipcwrapperobject_p.h \
-    dbusapplicationinterfaceextension.h \
-    dbusnotification.h \
-    launchermain.h \
-    intentclientdbusimplementation.h \
-    applicationmanagerwindow_p.h \
-
-load(qt_module)
diff --git a/src/main-lib/main-lib.pro b/src/main-lib/main-lib.pro
deleted file mode 100644
index 64510504..00000000
--- a/src/main-lib/main-lib.pro
+++ /dev/null
@@ -1,44 +0,0 @@
-TEMPLATE = lib
-TARGET = QtAppManMain
-MODULE = appman_main
-
-load(am-config)
-
-QT = core network qml core-private gui quick
-enable-widgets:QT *= widgets
-QT *= \
-    appman_common-private \
-    appman_application-private \
-    appman_manager-private \
-    appman_package-private \
-    appman_notification-private \
-    appman_monitor-private \
-    appman_shared_main-private \
-    appman_intent_server-private \
-    appman_window-private \
-
-!disable-external-dbus-interfaces:qtHaveModule(dbus):QT *= dbus appman_dbus-private
-
-CONFIG *= static internal_module
-CONFIG -= create_cmake
-
-win32:LIBS += -luser32
-
-DEFINES += AM_BUILD_DIR=\\\"$$BUILD_DIR\\\"
-
-HEADERS += \
-    configuration.h \
-    main.h \
-    configuration_p.h \
-    defaultconfiguration.h \
-    applicationinstaller.h \
-    windowframetimer.h \
-
-SOURCES += \
-    main.cpp \
-    configuration.cpp \
-    defaultconfiguration.cpp \
-    applicationinstaller.cpp \
-    windowframetimer.cpp \
-
-load(qt_module)
diff --git a/src/manager-lib/manager-lib.pro b/src/manager-lib/manager-lib.pro
deleted file mode 100644
index 53b1c990..00000000
--- a/src/manager-lib/manager-lib.pro
+++ /dev/null
@@ -1,125 +0,0 @@
-TEMPLATE = lib
-TARGET = QtAppManManager
-MODULE = appman_manager
-
-load(am-config)
-
-QT = core network qml gui gui-private quick qml-private quick-private
-QT_FOR_PRIVATE *= \
-    appman_common-private \
-    appman_application-private \
-    appman_notification-private \
-    appman_plugininterfaces-private \
-    appman_intent_server-private \
-    appman_intent_client-private \
-    appman_monitor-private \
-
-CONFIG *= static internal_module
-CONFIG -= create_cmake
-
-multi-process {
-    QT *= dbus
-    LIBS *= -ldl
-
-    HEADERS += \
-        nativeruntime.h \
-        nativeruntime_p.h \
-        processcontainer.h \
-
-    SOURCES += \
-        nativeruntime.cpp \
-        processcontainer.cpp \
-
-    CONFIG = dbus-adaptors-xml $$CONFIG
-
-    ADAPTORS_XML = \
-        ../dbus-lib/io.qt.applicationmanager.intentinterface.xml
-}
-
-HEADERS += \
-    application.h \
-    applicationmanager.h \
-    applicationmodel.h \
-    asynchronoustask.h \
-    notificationmanager.h \
-    abstractcontainer.h \
-    containerfactory.h \
-    plugincontainer.h \
-    abstractruntime.h \
-    runtimefactory.h \
-    quicklauncher.h \
-    applicationipcmanager.h \
-    applicationipcinterface.h \
-    applicationipcinterface_p.h \
-    applicationmanager_p.h \
-    debugwrapper.h \
-    amnamespace.h \
-    intentaminterface.h \
-    processstatus.h \
-    package.h \
-    packagemanager.h \
-    packagemanager_p.h \
-    qmlinprocessapplicationmanagerwindow.h \
-    inprocesssurfaceitem.h \
-
-qtHaveModule(qml):HEADERS += \
-    qmlinprocessruntime.h \
-    qmlinprocessapplicationinterface.h \
-
-SOURCES += \
-    application.cpp \
-    applicationmanager.cpp \
-    applicationmodel.cpp \
-    asynchronoustask.cpp \
-    notificationmanager.cpp \
-    abstractcontainer.cpp \
-    containerfactory.cpp \
-    plugincontainer.cpp \
-    abstractruntime.cpp \
-    runtimefactory.cpp \
-    quicklauncher.cpp \
-    applicationipcmanager.cpp \
-    applicationipcinterface.cpp \
-    debugwrapper.cpp \
-    intentaminterface.cpp \
-    processstatus.cpp \
-    packagemanager.cpp \
-    package.cpp \
-    qmlinprocessapplicationmanagerwindow.cpp \
-    inprocesssurfaceitem.cpp \
-
-qtHaveModule(qml):SOURCES += \
-    qmlinprocessruntime.cpp \
-    qmlinprocessapplicationinterface.cpp \
-
-qtHaveModule(waylandcompositor)|!disable-installer {
-    HEADERS += \
-        sudo.h \
-
-    SOURCES += \
-        sudo.cpp \
-}
-
-# we have an external plugin interface with signals, so we need to
-# compile the moc-data into the exporting binary (appman itself)
-HEADERS += ../plugin-interfaces/containerinterface.h
-
-
-!disable-installer {
-
-    QT_FOR_PRIVATE *= \
-        appman_package-private \
-        appman_crypto-private \
-
-    HEADERS += \
-        deinstallationtask.h \
-        installationtask.h \
-        scopeutilities.h \
-
-    SOURCES += \
-        installationtask.cpp \
-        deinstallationtask.cpp \
-        scopeutilities.cpp \
-}
-
-load(qt_module)
diff --git a/src/monitor-lib/monitor-lib.pro b/src/monitor-lib/monitor-lib.pro
deleted file mode 100644
index b107643c..00000000
--- a/src/monitor-lib/monitor-lib.pro
+++ /dev/null
@@ -1,29 +0,0 @@
-TEMPLATE = lib
-TARGET = QtAppManMonitor
-MODULE = appman_monitor
-
-load(am-config)
-
-QT = core gui
-
-QT_FOR_PRIVATE *= \
-    appman_common-private \
-
-CONFIG *= static internal_module
-CONFIG -= create_cmake
-
-linux:HEADERS += \
-    sysfsreader.h \
-
-HEADERS += \
-    systemreader.h \
-    processreader.h \
-
-linux:SOURCES += \
-    sysfsreader.cpp \
-
-SOURCES += \
-    systemreader.cpp \
-    processreader.cpp \
-
-load(qt_module)
diff --git a/src/notification-lib/notification-lib.pro b/src/notification-lib/notification-lib.pro
deleted file mode 100644
index eb7d1edc..00000000
--- a/src/notification-lib/notification-lib.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-TEMPLATE = lib
-TARGET = QtAppManNotification
-MODULE = appman_notification
-
-load(am-config)
-
-QT = core
-qtHaveModule(qml):QT *= qml
-QT_FOR_PRIVATE *= appman_common-private
-
-CONFIG *= static internal_module
-CONFIG -= create_cmake
-
-HEADERS += \
-    notification.h \
-
-SOURCES += \
-    notification.cpp \
-
-load(qt_module)
diff --git a/src/package-lib/package-lib.pro b/src/package-lib/package-lib.pro
deleted file mode 100644
index ccee057a..00000000
--- a/src/package-lib/package-lib.pro
+++ /dev/null
@@ -1,31 +0,0 @@
-TEMPLATE = lib
-TARGET = QtAppManPackage
-MODULE = appman_package
-
-load(am-config)
-
-QT = core network
-QT_FOR_PRIVATE *= \
-    appman_common-private \
-    appman_application-private \
-
-CONFIG *= static internal_module
-CONFIG -= create_cmake
-
-include($$SOURCE_DIR/3rdparty/libarchive.pri)
-include($$SOURCE_DIR/3rdparty/libz.pri)
-
-HEADERS += \
-    packageextractor_p.h \
-    packageextractor.h \
-    packagecreator_p.h \
-    packagecreator.h \
-    packageutilities.h \
-    packageutilities_p.h \
-
-SOURCES += \
-    packagecreator.cpp \
-    packageextractor.cpp \
-    packageutilities.cpp
-
-load(qt_module)
diff --git a/src/plugin-interfaces/plugin-interfaces.pro b/src/plugin-interfaces/plugin-interfaces.pro
deleted file mode 100644
index 67cb6821..00000000
--- a/src/plugin-interfaces/plugin-interfaces.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-TEMPLATE = lib
-TARGET = QtAppManPluginInterfaces
-MODULE = appman_plugininterfaces
-QT.appman_plugininterfaces.name = AppManPluginInterfaces
-
-QT = core
-CONFIG *= static internal_module create_cmake
-
-CMAKE_MODULE_TESTS = '-'
-
-HEADERS = \
-    startupinterface.h \
-    containerinterface.h
-
-load(qt_module)
-
-SOURCES += \
-    startupinterface.cpp \
-    containerinterface.cpp
-
diff --git a/src/shared-main-lib/shared-main-lib.pro b/src/shared-main-lib/shared-main-lib.pro
deleted file mode 100644
index c1ec5762..00000000
--- a/src/shared-main-lib/shared-main-lib.pro
+++ /dev/null
@@ -1,35 +0,0 @@
-TEMPLATE = lib
-TARGET = QtAppManSharedMain
-MODULE = appman_shared_main
-
-load(am-config)
-
-QT = core network qml gui gui-private quick
-QT *= \
-    appman_common-private \
-    appman_monitor-private \
-
-CONFIG *= static internal_module
-CONFIG -= create_cmake
-
-HEADERS += \
-    sharedmain.h \
-    qmllogger.h \
-    cpustatus.h \
-    iostatus.h \
-    memorystatus.h \
-    monitormodel.h \
-    frametimer.h \
-    gpustatus.h \
-
-SOURCES += \
-    sharedmain.cpp \
-    qmllogger.cpp \
-    cpustatus.cpp \
-    iostatus.cpp \
-    memorystatus.cpp \
-    monitormodel.cpp \
-    frametimer.cpp \
-    gpustatus.cpp \
-
-load(qt_module)
diff --git a/src/src.pro b/src/src.pro
deleted file mode 100644
index 15fa5547..00000000
--- a/src/src.pro
+++ /dev/null
@@ -1,124 +0,0 @@
-
-TEMPLATE = subdirs
-
-load(am-config)
-
-common_lib.subdir = common-lib
-
-plugin_interfaces.subdir = plugin-interfaces
-
-crypto_lib.subdir = crypto-lib
-crypto_lib.depends = common_lib
-
-application_lib.subdir = application-lib
-application_lib.depends = common_lib
-
-notification_lib.subdir = notification-lib
-notification_lib.depends = common_lib
-
-package_lib.subdir = package-lib
-package_lib.depends = application_lib
-
-manager_lib.subdir = manager-lib
-manager_lib.depends = application_lib notification_lib intent_server_lib intent_client_lib monitor_lib plugin_interfaces
-!disable-installer:manager_lib.depends += package_lib crypto_lib
-
-window_lib.subdir = window-lib
-window_lib.depends = manager_lib
-
-monitor_lib.subdir = monitor-lib
-monitor_lib.depends = common_lib
-
-shared_main_lib.subdir = shared-main-lib
-shared_main_lib.depends = common_lib monitor_lib
-
-intent_server_lib.subdir = intent-server-lib
-intent_server_lib.depends = common_lib
-
-intent_client_lib.subdir = intent-client-lib
-intent_client_lib.depends = common_lib
-
-launcher_lib.subdir = launcher-lib
-launcher_lib.depends = application_lib notification_lib shared_main_lib intent_client_lib
-
-main_lib.subdir = main-lib
-main_lib.depends = shared_main_lib manager_lib window_lib monitor_lib
-
-!disable-external-dbus-interfaces:qtHaveModule(dbus) {
-    dbus_lib.subdir = dbus-lib
-    dbus_lib.depends = manager_lib window_lib
-
-    main_lib.depends += dbus_lib
-}
-
-tools_launcher_qml.subdir = tools/launcher-qml
-tools_launcher_qml.depends = launcher_lib plugin_interfaces monitor_lib
-
-tools_appman.subdir = tools/appman
-tools_appman.depends = main_lib
-
-tools_testrunner.subdir = tools/testrunner
-tools_testrunner.depends = main_lib
-
-tools_dumpqmltypes.subdir = tools/dumpqmltypes
-tools_dumpqmltypes.depends = manager_lib intent_server_lib window_lib shared_main_lib launcher_lib main_lib
-
-tools_packager.subdir = tools/packager
-tools_packager.depends = package_lib application_lib crypto_lib
-
-tools_uploader.subdir = tools/uploader
-tools_uploader.depends = common_lib
-
-tools_controller.subdir = tools/controller
-tools_controller.depends = common_lib
-
-SUBDIRS = \
-    common_lib \
-    application_lib \
-    package_lib \
-
-!disable-installer:SUBDIRS += \
-    crypto_lib
-
-!tools-only {
-    SUBDIRS += \
-        plugin_interfaces \
-
-    !disable-external-dbus-interfaces:qtHaveModule(dbus):SUBDIRS += \
-        dbus_lib \
-
-    qtHaveModule(qml):SUBDIRS += \
-        notification_lib \
-        manager_lib \
-        window_lib \
-        monitor_lib \
-        shared_main_lib \
-        intent_server_lib \
-        intent_client_lib \
-        main_lib \
-        tools_appman \
-        # Although the testrunner is in tools we don't want to build it with tools-only
-        # because it is based on the manager binary
-        tools_testrunner \
-
-    qtHaveModule(qml):qtHaveModule(dbus):SUBDIRS += \
-        launcher_lib \
-
-    # This tool links against everything to extract the Qml type information
-    !disable-installer:qtHaveModule(qml):qtHaveModule(dbus):SUBDIRS += \
-        tools_dumpqmltypes \
-
-    multi-process:qtHaveModule(qml):qtHaveModule(dbus):SUBDIRS += \
-        tools_launcher_qml \
-}
-
-!cross_compile | tools-only {
-    !disable-installer:SUBDIRS += \
-        tools_packager
-
-    SUBDIRS += \
-        tools_uploader
-}
-
-qtHaveModule(dbus):SUBDIRS += \
-    tools_controller \
diff --git a/src/tools/appman/appman.pro b/src/tools/appman/appman.pro
deleted file mode 100644
index b5d4a2fa..00000000
--- a/src/tools/appman/appman.pro
+++ /dev/null
@@ -1,32 +0,0 @@
-TEMPLATE = app
-TARGET = appman
-
-load(am-config)
-
-QT = appman_main-private
-
-CONFIG *= console
-
-# As the testrunner includes this files as well, only enable it for the appman
-macos: equals(_PRO_FILE_, $$_PRO_FILE_PWD_/appman.pro): CONFIG *= separate_debug_info
-
-SOURCES += \
-    $$PWD/appman.cpp
-
-load(qt_tool)
-
-load(install-prefix)
-
-load(build-config)
-
-GIT_VERSION = $$cat($$SOURCE_DIR/.tag, lines)
-equals(GIT_VERSION, "\$Format:%H\$") {
-  unix:exists($$SOURCE_DIR/.git):GIT_VERSION=$$system(cd "$$SOURCE_DIR" && git describe --tags --always --dirty 2>/dev/null)
-  else:GIT_VERSION="unknown"
-}
-
-createBuildConfig(_DATE_, MODULE_VERSION, GIT_VERSION, SOURCE_DIR, BUILD_DIR, INSTALL_PREFIX, \
-                  QT_ARCH, QT_VERSION, QT_CONFIG, CONFIG, DEFINES, INCLUDEPATH, LIBS)
-
-# For android installing the binaries doesn't make sense, as it's a command-line utility which doesn't work on android anyway.
-android:INSTALLS=
diff --git a/src/tools/controller/controller.pro b/src/tools/controller/controller.pro
deleted file mode 100644
index 43af64db..00000000
--- a/src/tools/controller/controller.pro
+++ /dev/null
@@ -1,27 +0,0 @@
-TEMPLATE = app
-TARGET   = appman-controller
-
-load(am-config)
-
-QT = core network dbus
-QT *= appman_common-private
-
-CONFIG *= console
-
-SOURCES +=  \
-    controller.cpp \
-    interrupthandler.cpp
-
-appmanif.files =  ../../dbus-lib/io.qt.applicationmanager.xml
-appmanif.header_flags = -i dbus-utilities.h
-
-DBUS_INTERFACES += \
-    ../../dbus-lib/io.qt.packagemanager.xml \
-    appmanif
-
-load(qt_tool)
-
-load(install-prefix)
-
-HEADERS += \
-    interrupthandler.h
diff --git a/src/tools/dumpqmltypes/dumpqmltypes.pro b/src/tools/dumpqmltypes/dumpqmltypes.pro
deleted file mode 100644
index 2c18f5ea..00000000
--- a/src/tools/dumpqmltypes/dumpqmltypes.pro
+++ /dev/null
@@ -1,42 +0,0 @@
-TEMPLATE = app
-TARGET   = appman-dumpqmltypes
-
-load(am-config)
-
-QT = core
-QT *= \
-    appman_common-private \
-    appman_application-private \
-    appman_manager-private \
-    appman_notification-private \
-    appman_window-private \
-    appman_launcher-private \
-    appman_intent_client-private \
-    appman_intent_server-private \
-    appman_monitor-private \
-    appman_main-private \
-    appman_shared_main-private \
-
-CONFIG *= console
-
-SOURCES += \
-    dumpqmltypes.cpp
-
-load(qt_tool)
-
-load(install-prefix)
-
-
-!cross_compile {
-    qtPrepareTool(QMLPLUGINDUMP, appman-dumpqmltypes)
-    QT_TOOL_ENV =
-
-    build_pass|!debug_and_release {
-        QMAKE_POST_LINK += $$QMLPLUGINDUMP $$SOURCE_DIR/qmltypes
-        qmltypes_file.files = $$SOURCE_DIR/qmltypes/QtApplicationManager
-        qmltypes_file.path = $$[QT_INSTALL_QML]
-        qmltypes_file.CONFIG = no_check_exist directory
-
-        INSTALLS += qmltypes_file
-    }
-}
diff --git a/src/tools/launcher-qml/launcher-qml.pro b/src/tools/launcher-qml/launcher-qml.pro
deleted file mode 100644
index feb937dc..00000000
--- a/src/tools/launcher-qml/launcher-qml.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-TEMPLATE = app
-TARGET   = appman-launcher-qml
-
-load(am-config)
-
-QT = qml dbus core-private quick gui gui-private quick-private
-QT *= \
-    appman_common-private \
-    appman_monitor-private \
-    appman_notification-private \
-    appman_application-private \
-    appman_plugininterfaces-private \
-    appman_launcher-private \
-    appman_shared_main-private \
-
-HEADERS += \
-    launcher-qml_p.h
-
-SOURCES += \
-    launcher-qml.cpp \
-
-load(qt_tool)
-
-load(install-prefix)
diff --git a/src/tools/packager/packager.pro b/src/tools/packager/packager.pro
deleted file mode 100644
index fba890af..00000000
--- a/src/tools/packager/packager.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-TEMPLATE = app
-TARGET   = appman-packager
-
-load(am-config)
-
-QT = core network
-QT *= \
-    appman_common-private \
-    appman_crypto-private \
-    appman_application-private \
-    appman_package-private \
-
-CONFIG *= console
-
-SOURCES += \
-    packager.cpp \
-    packagingjob.cpp \
-
-HEADERS += \
-    packagingjob.h \
-
-load(qt_tool)
-
-load(install-prefix)
diff --git a/src/tools/testrunner/testrunner.pro b/src/tools/testrunner/testrunner.pro
deleted file mode 100644
index c63d23df..00000000
--- a/src/tools/testrunner/testrunner.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-include(../appman/appman.pro)
-
-TARGET   = appman-qmltestrunner
-
-DEFINES += AM_TESTRUNNER
-
-CONFIG *= console
-
-QT += qmltest qmltest-private testlib-private
-
-HEADERS += \
-    testrunner.h \
-    testrunner_p.h \
-    amtest.h
-
-SOURCES += \
-    testrunner.cpp \
-    amtest.cpp
-
-# For android installing the binaries doesn't make sense, as it's a command-line utility which doesn't work on android anyway.
-android: INSTALLS=
diff --git a/src/tools/uploader/uploader.pro b/src/tools/uploader/uploader.pro
deleted file mode 100644
index 1ec1453b..00000000
--- a/src/tools/uploader/uploader.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-TEMPLATE = app
-TARGET   = package-uploader
-
-load(am-config)
-
-QT = core network
-QT *= appman_common-private
-
-CONFIG *= console
-
-SOURCES += \
-    uploader.cpp \
-
-HEADERS += \
-
-load(qt_tool)
-
-load(install-prefix)
diff --git a/src/window-lib/window-lib.pro b/src/window-lib/window-lib.pro
deleted file mode 100644
index 2944b753..00000000
--- a/src/window-lib/window-lib.pro
+++ /dev/null
@@ -1,65 +0,0 @@
-TEMPLATE = lib
-TARGET = QtAppManWindow
-MODULE = appman_window
-
-load(am-config)
-
-QT = core network qml core-private gui quick
-QT_FOR_PRIVATE *= \
-    appman_common-private \
-    appman_application-private \
-    appman_manager-private \
-    appman_monitor-private \
-
-CONFIG *= static internal_module
-CONFIG -= create_cmake
-
-HEADERS += \
-    window.h \
-    windowitem.h \
-    inprocesswindow.h \
-    windowmanager.h \
-    windowmanager_p.h \
-    touchemulation.h \
-
-SOURCES += \
-    window.cpp \
-    windowitem.cpp \
-    inprocesswindow.cpp \
-    windowmanager.cpp \
-    touchemulation.cpp \
-
-multi-process {
-    HEADERS += \
-        waylandcompositor.h \
-        waylandwindow.h \
-        waylandqtamserverextension_p.h
-
-    SOURCES += \
-        waylandcompositor.cpp \
-        waylandwindow.cpp \
-        waylandqtamserverextension.cpp
-
-    qtHaveModule(waylandcompositor) {
-        QT *= waylandcompositor
-        # Qt < 5.14 is missing the sendPopupDone() method in QWaylandXdgShell
-        !versionAtLeast(QT_VERSION, 5.14.0):QT *= waylandcompositor-private
-    }
-    WAYLANDSERVERSOURCES += \
-        ../wayland-extensions/qtam-extension.xml
-
-    CONFIG *= wayland-scanner generated_privates
-    private_headers.CONFIG += no_check_exists
-
-    PKGCONFIG += wayland-server
-}
-
-# build the touch emulation only on X11 setups
-config_touchemulation {
-    PKGCONFIG *= xcb x11 xi
-    QT *= gui-private testlib
-    HEADERS += touchemulation_x11_p.h
-    SOURCES += touchemulation_x11.cpp
-}
-
-load(qt_module)
diff --git a/tests/auto/application/application.pro b/tests/auto/application/application.pro
deleted file mode 100644
index 2bdaf9c5..00000000
--- a/tests/auto/application/application.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TARGET = tst_application
-
-include($$PWD/../tests.pri)
-
-QT *= \
-    appman_common-private \
-    appman_application-private \
-    appman_manager-private \
-
-SOURCES += tst_application.cpp
-
-OTHER_FILES += info.yaml
-RESOURCES += tst_application.qrc
diff --git a/tests/auto/applicationinfo/applicationinfo.pro b/tests/auto/applicationinfo/applicationinfo.pro
deleted file mode 100644
index 9fcc7ffe..00000000
--- a/tests/auto/applicationinfo/applicationinfo.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TARGET = tst_applicationinfo
-
-include($$PWD/../tests.pri)
-
-QT *= \
-    appman_common-private \
-    appman_application-private \
-    appman_manager-private \
-
-SOURCES += tst_applicationinfo.cpp
diff --git a/tests/auto/applicationinstaller/applicationinstaller.pro b/tests/auto/applicationinstaller/applicationinstaller.pro
deleted file mode 100644
index b84ffac4..00000000
--- a/tests/auto/applicationinstaller/applicationinstaller.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TARGET = tst_applicationinstaller
-
-COVERAGE_RUNTIME = sudo
-
-include($$PWD/../tests.pri)
-
-QT *= \
-    appman_common-private \
-    appman_application-private \
-    appman_package-private \
-    appman_manager-private \
-
-SOURCES += tst_applicationinstaller.cpp
diff --git a/tests/auto/configuration/configuration.pro b/tests/auto/configuration/configuration.pro
deleted file mode 100644
index da3ff241..00000000
--- a/tests/auto/configuration/configuration.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TARGET = tst_configuration
-
-include($$PWD/../tests.pri)
-
-QT *= appman_common-private appman_main-private
-
-SOURCES += tst_configuration.cpp
-
-RESOURCES += \
-    data/empty.yaml \
-    data/config1.yaml \
-    data/config2.yaml \
diff --git a/tests/auto/cryptography/cryptography.pro b/tests/auto/cryptography/cryptography.pro
deleted file mode 100644
index d18f6441..00000000
--- a/tests/auto/cryptography/cryptography.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-TARGET = tst_cryptography
-
-include($$PWD/../tests.pri)
-
-QT *= appman_common-private appman_crypto-private
-
-SOURCES += tst_cryptography.cpp
diff --git a/tests/auto/debugwrapper/debugwrapper.pro b/tests/auto/debugwrapper/debugwrapper.pro
deleted file mode 100644
index b7e9128a..00000000
--- a/tests/auto/debugwrapper/debugwrapper.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TARGET = tst_debugwrapper
-
-include($$PWD/../tests.pri)
-
-QT *= \
-    appman_manager-private
-
-SOURCES += tst_debugwrapper.cpp
diff --git a/tests/auto/installationreport/installationreport.pro b/tests/auto/installationreport/installationreport.pro
deleted file mode 100644
index ce1aa46b..00000000
--- a/tests/auto/installationreport/installationreport.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TARGET = tst_installationreport
-
-include($$PWD/../tests.pri)
-
-QT *= \
-    appman_common-private \
-    appman_crypto-private \
-    appman_application-private \
-
-SOURCES += tst_installationreport.cpp
diff --git a/tests/auto/main/main.pro b/tests/auto/main/main.pro
deleted file mode 100644
index e60ec75f..00000000
--- a/tests/auto/main/main.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-TARGET = tst_main
-
-include($$PWD/../tests.pri)
-
-# this test keeps crashing in a VirtualBox based CI environment, when executed
-# via ssh (which gets the test run in Window's session 0 (no visible desktop)
-luxoft-ci:CONFIG *= insignificant_test
-
-QT *= appman_manager-private \
-      appman_application-private \
-      appman_common-private \
-      appman_main-private \
-      appman_intent_server-private \
-
-SOURCES += tst_main.cpp
-
-RESOURCES = main.qrc
-
-OTHER_FILES += am-config.yaml
-
diff --git a/tests/auto/packagecreator/packagecreator.pro b/tests/auto/packagecreator/packagecreator.pro
deleted file mode 100644
index 269c12c7..00000000
--- a/tests/auto/packagecreator/packagecreator.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TARGET = tst_packagecreator
-
-include($$PWD/../tests.pri)
-
-QT *= \
-    appman_common-private \
-    appman_application-private \
-    appman_package-private
-
-SOURCES += tst_packagecreator.cpp
diff --git a/tests/auto/packageextractor/packageextractor.pro b/tests/auto/packageextractor/packageextractor.pro
deleted file mode 100644
index 761720cf..00000000
--- a/tests/auto/packageextractor/packageextractor.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TARGET = tst_packageextractor
-
-include($$PWD/../tests.pri)
-
-QT *= \
-    appman_common-private \
-    appman_application-private \
-    appman_package-private
-
-SOURCES += tst_packageextractor.cpp
diff --git a/tests/auto/packager-tool/packager-tool.pro b/tests/auto/packager-tool/packager-tool.pro
deleted file mode 100644
index 08876ac6..00000000
--- a/tests/auto/packager-tool/packager-tool.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TARGET = tst_packager-tool
-
-include($$PWD/../tests.pri)
-
-QT *= \
-    appman_common-private \
-    appman_crypto-private \
-    appman_application-private \
-    appman_package-private \
-    appman_manager-private \
-
-INCLUDEPATH += $$PWD/../../src/tools/packager
-SOURCES += $$PWD/../../src/tools/packager/packagingjob.cpp
-
-SOURCES += tst_packager-tool.cpp
diff --git a/tests/auto/processreader/processreader.pro b/tests/auto/processreader/processreader.pro
deleted file mode 100644
index c5caa674..00000000
--- a/tests/auto/processreader/processreader.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET = tst_processreader
-
-include($$PWD/../tests.pri)
-
-QT *= appman_monitor-private \
-      appman_manager-private \
-      appman_window-private \
-      appman_application-private \
-      appman_common-private
-
-SOURCES += tst_processreader.cpp
diff --git a/tests/auto/qml/configs/configs.pro b/tests/auto/qml/configs/configs.pro
deleted file mode 100644
index 86604d5e..00000000
--- a/tests/auto/qml/configs/configs.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-load(am-config)
-
-AM_CONFIG = am-config.yaml
-TEST_FILES = tst_configs.qml
-TEST_APPS = test.configs.app
-TEST_CONFIGURATIONS = "--force-single-process" \
-                      "--force-single-process --single-app $$_PRO_FILE_PWD_/apps/test.configs.app/info.yaml"
-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"
-}
-
-load(am-qml-testcase)
diff --git a/tests/auto/qml/crash/apps/tld.test.crash/terminator2/terminator2.pro b/tests/auto/qml/crash/apps/tld.test.crash/terminator2/terminator2.pro
deleted file mode 100644
index 3c482379..00000000
--- a/tests/auto/qml/crash/apps/tld.test.crash/terminator2/terminator2.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-TEMPLATE = lib
-CONFIG += plugin exceptions
-QT += qml quick
-
-TARGET = $$qtLibraryTarget(terminator2plugin)
-
-HEADERS += qmlterminator2.h
-SOURCES += qmlterminator2.cpp
-
-DESTDIR = $$_PRO_FILE_PWD_/Terminator
-target.path=$$DESTDIR
-qmldir.files=$$PWD/qmldir
-qmldir.path=$$DESTDIR
-INSTALLS += target qmldir
-
-OTHER_FILES += qmldir
-
-QMAKE_POST_LINK += $$QMAKE_COPY $$replace($$list($$quote($$PWD/qmldir) $$DESTDIR), /, $$QMAKE_DIR_SEP)
diff --git a/tests/auto/qml/crash/crash.pro b/tests/auto/qml/crash/crash.pro
deleted file mode 100644
index c1c7d869..00000000
--- a/tests/auto/qml/crash/crash.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-AM_CONFIG = am-config.yaml
-TEST_FILES = tst_crash.qml
-TEST_APPS = tld.test.crash
-TEST_CONFIGURATIONS = "--force-multi-process"
-load(am-qml-testcase)
diff --git a/tests/auto/qml/installer/installer.pro b/tests/auto/qml/installer/installer.pro
deleted file mode 100644
index 2adfb2a4..00000000
--- a/tests/auto/qml/installer/installer.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-AM_CONFIG = am-config.yaml
-TEST_FILES = tst_installer.qml
-
-AM_TESTDATA_DIR=\"$$PWD/../../data/\"
-
-load(am-qml-testcase)
diff --git a/tests/auto/qml/intents/intents.pro b/tests/auto/qml/intents/intents.pro
deleted file mode 100644
index a05a7b72..00000000
--- a/tests/auto/qml/intents/intents.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-load(am-config)
-
-AM_CONFIG = am-config.yaml
-TEST_FILES = tst_intents.qml
-TEST_APPS = intents1 intents2 cannot-start
-TEST_CONFIGURATIONS = "--force-single-process"
-multi-process {
-    TEST_CONFIGURATIONS += "--force-multi-process" \
-                           "--force-multi-process -c $$_PRO_FILE_PWD_/am-config-quick.yaml"
-}
-
-load(am-qml-testcase)
diff --git a/tests/auto/qml/lifecycle/lifecycle.pro b/tests/auto/qml/lifecycle/lifecycle.pro
deleted file mode 100644
index 98ab9709..00000000
--- a/tests/auto/qml/lifecycle/lifecycle.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-AM_CONFIG = am-config.yaml
-TEST_FILES = tst_lifecycle.qml
-TEST_APPS = tld.test.lifecycle
-
-load(am-qml-testcase)
diff --git a/tests/auto/qml/processtitle/processtitle.pro b/tests/auto/qml/processtitle/processtitle.pro
deleted file mode 100644
index e78b54a1..00000000
--- a/tests/auto/qml/processtitle/processtitle.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-AM_CONFIG = am-config.yaml
-TEST_FILES = tst_processtitle.qml
-TEST_APPS = test.processtitle.app
-TEST_CONFIGURATIONS = "--force-multi-process" \
-                      "--force-multi-process -c $$_PRO_FILE_PWD_/am-config-quick.yaml"
-
-load(am-qml-testcase)
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
deleted file mode 100644
index 902ab2f1..00000000
--- a/tests/auto/qml/qml.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-load(am-config)
-
-TEMPLATE = subdirs
-SUBDIRS = \
-    simple \
-    windowmanager \
-    windowmapping \
-    windowitem \
-    windowitem2 \
-    installer \
-    quicklaunch \
-    intents \
-    configs \
-    lifecycle \
-    resources
-
-multi-process: SUBDIRS += \
-    crash/apps/tld.test.crash/terminator2 \
-    crash \
-    processtitle
diff --git a/tests/auto/qml/quicklaunch/quicklaunch.pro b/tests/auto/qml/quicklaunch/quicklaunch.pro
deleted file mode 100644
index 2d990a4b..00000000
--- a/tests/auto/qml/quicklaunch/quicklaunch.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-AM_CONFIG = am-config.yaml
-TEST_FILES = tst_quicklaunch.qml
-TEST_APPS = tld.test.quicklaunch
-
-load(am-qml-testcase)
diff --git a/tests/auto/qml/resources/appcommon/appcommon.pro b/tests/auto/qml/resources/appcommon/appcommon.pro
deleted file mode 100644
index 47028775..00000000
--- a/tests/auto/qml/resources/appcommon/appcommon.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-TEMPLATE = aux
-
-OTHER_FILES += Quicklaunch.qml \
-               qml/common/CommonObj.qml
-
-RESOURCE_SOURCE = appcommonfile.qrc
-load(generate-resource)
diff --git a/tests/auto/qml/resources/apps/app1/app1.pro b/tests/auto/qml/resources/apps/app1/app1.pro
deleted file mode 100644
index cbbb4758..00000000
--- a/tests/auto/qml/resources/apps/app1/app1.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = lib
-TARGET = app1plugin
-CONFIG += plugin
-RESOURCES = app1plugin.qrc
-
-RESOURCE_SOURCE = app1file.qrc
-load(generate-resource)
-
-OTHER_FILES += \
-    info.yaml \
-    icon.png
diff --git a/tests/auto/qml/resources/apps/app2/app2.pro b/tests/auto/qml/resources/apps/app2/app2.pro
deleted file mode 100644
index 7a5190df..00000000
--- a/tests/auto/qml/resources/apps/app2/app2.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = aux
-
-RESOURCE_SOURCE = app2.qrc
-load(generate-resource)
-
-OTHER_FILES += \
-    info.yaml \
-    icon.png
diff --git a/tests/auto/qml/resources/resources.pro b/tests/auto/qml/resources/resources.pro
deleted file mode 100644
index 6da64f00..00000000
--- a/tests/auto/qml/resources/resources.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = test.pro \
-          appcommon \
-          apps/app1 \
-          apps/app2
diff --git a/tests/auto/qml/resources/test.pro b/tests/auto/qml/resources/test.pro
deleted file mode 100644
index 3553c02a..00000000
--- a/tests/auto/qml/resources/test.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-AM_CONFIG = am-config.yaml
-TEST_FILES = tst_resource.qml
-TEST_APPS = app1 app2
-
-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
-DESTDIR = $$OUT_PWD
-load(am-qml-testcase)
-
-RESOURCE_SOURCE = systemuifile.qrc
-load(generate-resource)
-
-TEMPLATE = lib
-TARGET = systemuiplugin
-CONFIG += plugin
-RESOURCES = systemuiplugin.qrc
diff --git a/tests/auto/qml/simple/simple.pro b/tests/auto/qml/simple/simple.pro
deleted file mode 100644
index 72dbea95..00000000
--- a/tests/auto/qml/simple/simple.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-AM_CONFIG = am-config.yaml
-TEST_FILES = tst_applicationmanager.qml
-TEST_APPS = tld.test.simple1 tld.test.simple2
-
-load(am-qml-testcase)
diff --git a/tests/auto/qml/windowitem/windowitem.pro b/tests/auto/qml/windowitem/windowitem.pro
deleted file mode 100644
index fcc1b1f6..00000000
--- a/tests/auto/qml/windowitem/windowitem.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-AM_CONFIG = am-config.yaml
-TEST_FILES = tst_windowitem.qml
-TEST_APPS = test.windowitem.app test.windowitem.multiwin
-
-load(am-qml-testcase)
diff --git a/tests/auto/qml/windowitem2/windowitem2.pro b/tests/auto/qml/windowitem2/windowitem2.pro
deleted file mode 100644
index 022ea053..00000000
--- a/tests/auto/qml/windowitem2/windowitem2.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-AM_CONFIG = am-config.yaml
-TEST_FILES = tst_windowitem2.qml
-TEST_APPS = test.windowitem2.app
-
-load(am-qml-testcase)
diff --git a/tests/auto/qml/windowmanager/windowmanager.pro b/tests/auto/qml/windowmanager/windowmanager.pro
deleted file mode 100644
index 21cd8a91..00000000
--- a/tests/auto/qml/windowmanager/windowmanager.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEST_FILES = tst_windowmanager.qml
-
-OTHER_FILES += IviApplicationExtension.qml
-
-load(am-qml-testcase)
diff --git a/tests/auto/qml/windowmapping/windowmapping.pro b/tests/auto/qml/windowmapping/windowmapping.pro
deleted file mode 100644
index e29aba28..00000000
--- a/tests/auto/qml/windowmapping/windowmapping.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-AM_CONFIG = am-config.yaml
-TEST_FILES = tst_windowmapping.qml
-TEST_APPS = \
-    test.winmap.amwin \
-    test.winmap.amwin2 \
-    test.winmap.loader \
-    test.winmap.ping \
-    test.winmap.qtobject \
-    test.winmap.rectangle \
-    test.winmap.window \
-
-load(am-qml-testcase)
diff --git a/tests/auto/runtime/runtime.pro b/tests/auto/runtime/runtime.pro
deleted file mode 100644
index 64c550cc..00000000
--- a/tests/auto/runtime/runtime.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET = tst_runtime
-
-include($$PWD/../tests.pri)
-
-QT *= qml
-QT *= \
-    appman_common-private \
-    appman_application-private \
-    appman_manager-private \
-
-SOURCES += tst_runtime.cpp
diff --git a/tests/auto/signature/signature.pro b/tests/auto/signature/signature.pro
deleted file mode 100644
index 43bb3d47..00000000
--- a/tests/auto/signature/signature.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET = tst_signature
-
-include($$PWD/../tests.pri)
-
-QT *= appman_common-private appman_crypto-private
-
-SOURCES += tst_signature.cpp
-
-OTHER_FILES += create-test-data.sh
-
-RESOURCES += tst_signature.qrc
diff --git a/tests/auto/sudo/sudo.pro b/tests/auto/sudo/sudo.pro
deleted file mode 100644
index 95be319b..00000000
--- a/tests/auto/sudo/sudo.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET    = tst_sudo
-
-COVERAGE_RUNTIME = sudo
-
-include($$PWD/../tests.pri)
-
-QT *= \
-    appman_common-private \
-    appman_manager-private \
-
-SOURCES += tst_sudo.cpp
diff --git a/tests/auto/systemreader/systemreader.pro b/tests/auto/systemreader/systemreader.pro
deleted file mode 100644
index 5955d5f1..00000000
--- a/tests/auto/systemreader/systemreader.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET = tst_systemreader
-
-include($$PWD/../tests.pri)
-
-QT *= appman_monitor-private \
-      appman_manager-private \
-      appman_window-private \
-      appman_application-private \
-      appman_common-private
-
-SOURCES += tst_systemreader.cpp
diff --git a/tests/auto/tests.pri b/tests/auto/tests.pri
deleted file mode 100644
index 64ec6309..00000000
--- a/tests/auto/tests.pri
+++ /dev/null
@@ -1,11 +0,0 @@
-load(am-config)
-
-CONFIG *= console testcase
-QT = core network testlib
-qtHaveModule(dbus):QT *= dbus
-
-DEFINES *= AM_TESTDATA_DIR=\\\"$$PWD/data/\\\"
-DEFINES -= QT_NO_CAST_FROM_ASCII
-
-HEADERS += \
-    $$PWD/error-checking.h \
diff --git a/tests/auto/tests.pro b/tests/auto/tests.pro
deleted file mode 100644
index 3bfd9083..00000000
--- a/tests/auto/tests.pro
+++ /dev/null
@@ -1,56 +0,0 @@
-TEMPLATE = subdirs
-
-load(am-config)
-requires(!disable-installer)
-
-SUBDIRS = \
-    manual \
-    application \
-    applicationinfo \
-    main \
-    runtime \
-    cryptography \
-    signature \
-    utilities \
-    installationreport \
-    packagecreator \
-    packageextractor \
-    packager-tool \
-    applicationinstaller \
-    debugwrapper \
-    qml \
-    yaml \
-    configuration \
-
-linux*:SUBDIRS += \
-    sudo \
-    processreader \
-    systemreader \
-
-OTHER_FILES += \
-    tests.pri \
-    data/create-test-packages.sh \
-    data/certificates/create-test-certificates.sh \
-    data/utilities.sh \
-
-# sadly, the appman-packager is too complex to build as a host tool
-!cross_compile {
-    prepareRecursiveTarget(check)
-    qtPrepareTool(APPMAN_PACKAGER, appman-packager)
-
-    unix {
-        macos:ctype=UTF-8
-        else:ctype=C.UTF-8
-
-        # create test data on the fly - this is needed for the CI server
-        testdata.target = testdata
-        testdata.depends = $$PWD/data/create-test-packages.sh $$APPMAN_PACKAGER_EXE
-        testdata.commands = (cd $$PWD/data ; LC_CTYPE=$$ctype ./create-test-packages.sh $$APPMAN_PACKAGER)
-        QMAKE_EXTRA_TARGETS += testdata
-
-        # qmake would create a default check target implicitly, but since we need 'testdata' as an
-        # dependency, we have to set it up explicitly
-        check.depends = testdata $$check.depends
-    }
-    QMAKE_EXTRA_TARGETS *= check
-}
diff --git a/tests/auto/utilities/utilities.pro b/tests/auto/utilities/utilities.pro
deleted file mode 100644
index 9a7c2bc0..00000000
--- a/tests/auto/utilities/utilities.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-TARGET = tst_utilities
-
-include($$PWD/../tests.pri)
-
-QT *= appman_common-private
-
-SOURCES += tst_utilities.cpp
diff --git a/tests/auto/yaml/yaml.pro b/tests/auto/yaml/yaml.pro
deleted file mode 100644
index 5cc4bbb5..00000000
--- a/tests/auto/yaml/yaml.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TARGET = tst_yaml
-
-include($$PWD/../tests.pri)
-
-QT *= appman_common-private
-
-SOURCES += tst_yaml.cpp
-
-RESOURCES += \
-    data/test.yaml \
-    data/cache1.yaml \
-    data/cache2.yaml \
diff --git a/tests/benchmarks/appman-bench/appman-bench.pro b/tests/benchmarks/appman-bench/appman-bench.pro
deleted file mode 100644
index 2baae5e2..00000000
--- a/tests/benchmarks/appman-bench/appman-bench.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = aux
-
-OTHER_FILES = \
-    README \
-    run.sh \
-    am-config.yaml \
-    tests/* \
-    system-ui/*.qml \
-    templates/appman-qml/* \
-    templates/qmlscene/* \
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
deleted file mode 100644
index ca7d4f1f..00000000
--- a/tests/benchmarks/benchmarks.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS = \
-    appman-bench \
-
diff --git a/tests/data/ext2image b/tests/data/ext2image
deleted file mode 100644
index 9e44a94d..00000000
--- a/tests/data/ext2image
+++ /dev/null
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
deleted file mode 100644
index 49d5c3b4..00000000
--- a/tests/manual/manual.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-requires(false) # visible in QtCreator, but not built by default
-
-TEMPLATE = subdirs
-
-SUBDIRS = \
-    monitormodel \
diff --git a/tests/manual/monitormodel/monitormodel.pro b/tests/manual/monitormodel/monitormodel.pro
deleted file mode 100644
index 7c2e33bc..00000000
--- a/tests/manual/monitormodel/monitormodel.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE = aux
-
-OTHER_FILES = \
-    *.qml \
-    README \