summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2025-11-28 10:07:54 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2025-12-15 13:42:42 +0100
commit91b0f435046052ffcd656be23e11ee204bfd3fe5 (patch)
tree99899d7d439e1cd394d1bec54ec7b47ee118f747 /src
parent07722835bd491dab32383e0979af61ffca3a9b4e (diff)
CMake: Don't yield error if qwebengine_convert_dict is unavailable
Consider a cross-build of QtWebEngine where the host build doesn't provide the qwebengine_convert_dict tool. We have this situation on the CI where a MinGW build of the qtwebengine repo is used for the host and MSVC arm64 for the target. Check if the qwebengine_convert_dict target is available and bail out with a warning if it's not. Change-Id: I448d2a1bb64781d3847bb685f8f8a3fbe8cbd35e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/core/api/Qt6WebEngineCoreMacros.cmake7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/api/Qt6WebEngineCoreMacros.cmake b/src/core/api/Qt6WebEngineCoreMacros.cmake
index 8bb731548..ed58aa8e7 100644
--- a/src/core/api/Qt6WebEngineCoreMacros.cmake
+++ b/src/core/api/Qt6WebEngineCoreMacros.cmake
@@ -14,6 +14,13 @@ function(qt6_add_webengine_dictionary)
cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+ if(NOT TARGET ${QT_CMAKE_EXPORT_NAMESPACE}::qwebengine_convert_dict)
+ message(WARNING
+ "qwebengine_convert_dict is not available. Skipping qt6_add_webengine_dictionary."
+ )
+ return()
+ endif()
+
if (NOT ARGS_SOURCE OR NOT EXISTS "${ARGS_SOURCE}" OR NOT IS_ABSOLUTE "${ARGS_SOURCE}")
message(FATAL_ERROR "Function qt_add_webengine_dictionary requires an absolute path to SOURCE dictionary.")
endif()