diff options
| author | Michal Klocek <[email protected]> | 2025-05-22 15:19:24 +0200 |
|---|---|---|
| committer | Michal Klocek <[email protected]> | 2025-05-23 10:54:31 +0000 |
| commit | 69bbdd6ccc0863d8fa760728d80e7b6da399e006 (patch) | |
| tree | c78f810d9721e2735481238e916428300aa309d5 | |
| parent | 0d4c8f27380b790435f09a007985b3c2d5201c25 (diff) | |
We need tools to run test on native windows arm.
Till now the exclude prevented tools being cross-compiled,
unlike desktop build which by calling
qtam_internal_add_build_config which in turn
called qt_internal_add_resource made required dependency
to override exclusion.
Note all test pass on test vm if appman-qmltestrunner is
copied from build vm. Also there are no sbom issues
on that particular build vm with this change.
Amends e8a425e632229bb2c41a18e0be4e28f56d517ab8.
Task-number: QTBUG-99702
Task-number: COIN-1211
Change-Id: I5a1fad1382d8764d69d8c72b895ef36f494569be
Reviewed-by: Alexey Edelev <[email protected]>
| -rw-r--r-- | src/CMakeLists.txt | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 31a0d2e7..4772bb48 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,18 +3,6 @@ qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/common-lib/configure.c set(QT_SBOM_DEFAULT_QT_LICENSE_ID_LIBRARIES "QT_COMMERCIAL_OR_GPL3") -# Workaround for boot2qt to successfully build, until someone can figure out -# why it doesn't like the tools from being excluded. -if(NOT QT_APPMAN_SKIP_EXCLUDE_TOOLS_FROM_DEFAULT_TARGET) - qt_exclude_tool_directories_from_default_target( - tools/appman - tools/testrunner - tools/controller - tools/launcher-qml - tools/package-server - ) -endif() - add_subdirectory(3rdparty) add_subdirectory(wayland-extensions) add_subdirectory(dbus-interfaces) |