summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@qt.io>2023-11-28 16:54:17 +0100
committerRobert Griebl <robert.griebl@qt.io>2023-12-06 13:54:55 +0100
commit0924eb6eba093a960d2738a726cd179e343c4161 (patch)
treef318defe62cb73b363b41649f1e0a34f59d82a46 /tests
parent8a019b21f27b92a1bfdf0e232e115bc60ac67e37 (diff)
Simplify builing a custom appman executable
- fixed our cmake library dependencies in regards to private/public - the bwrap plugin should not depend on any AppMan module besides the plugin interface one - the special QML modules are now implicit dependencies of main-lib and application-main-lib respectively, which makes it possible to move the ugly AM_QML_REGISTER_TYPES mechanism out of the appman and launcher executables and into those libraries. - also fixed the iOS build, where we cannot use Security-Framework due to missing functionality, but the fallback to (a non existing) openssl doesn't make sense either. Change-Id: Iced023be98eed3416654a0645f0aa4ed58d10e48 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/controller-tool/CMakeLists.txt5
-rw-r--r--tests/auto/controller-tool/tst_controller-tool.cpp3
2 files changed, 0 insertions, 8 deletions
diff --git a/tests/auto/controller-tool/CMakeLists.txt b/tests/auto/controller-tool/CMakeLists.txt
index aaf1b127..5eced333 100644
--- a/tests/auto/controller-tool/CMakeLists.txt
+++ b/tests/auto/controller-tool/CMakeLists.txt
@@ -8,10 +8,5 @@ qt_internal_add_test(tst_controller-tool
LIBRARIES
Qt::DBus
Qt::Network
- Qt::AppManApplicationPrivate
- Qt::AppManCommonPrivate
- Qt::AppManIntentServerPrivate
Qt::AppManMainPrivate
- Qt::AppManQmlSystemUIPrivate
- Qt::AppManManagerPrivate
)
diff --git a/tests/auto/controller-tool/tst_controller-tool.cpp b/tests/auto/controller-tool/tst_controller-tool.cpp
index 36fa1154..7ab8e788 100644
--- a/tests/auto/controller-tool/tst_controller-tool.cpp
+++ b/tests/auto/controller-tool/tst_controller-tool.cpp
@@ -23,9 +23,6 @@
#include <QtAppManMain/configuration.h>
-AM_QML_REGISTER_TYPES(QtApplicationManager_SystemUI)
-AM_QML_REGISTER_TYPES(QtApplicationManager)
-
QT_USE_NAMESPACE_AM
using namespace QtYaml;