From 80d86fed13c5a59691d26a711ffa9bfdd994f27c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 23 Sep 2019 13:20:30 +0200 Subject: [PATCH] Fix qtdeclarative build There is an issue about versionless tool target not finding the regular targets, and that fails the configuration phase of qtdeclarative. Temporarily don't export the versionless targets, to get the qt5 build going. Change-Id: I5c7baff7f677f4a3f1f91b9e8082ba8a80f9cddd Reviewed-by: Simon Hausmann --- cmake/QtBuild.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 758af7ebfe4..4ddbcff3abe 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1649,10 +1649,11 @@ endif() NAMESPACE "${QT_CMAKE_EXPORT_NAMESPACE}::" DESTINATION "${config_install_dir}") - - qt_internal_export_modern_cmake_config_targets_file(TARGETS ${QT_KNOWN_MODULE_${module_name}_TOOLS} - EXPORT_NAME_PREFIX ${INSTALL_CMAKE_NAMESPACE}${target} - CONFIG_INSTALL_DIR ${config_install_dir}) + # Temporarily disable creation of versionless targets for tools, + # because it breaks qtdeclarative build. + #qt_internal_export_modern_cmake_config_targets_file(TARGETS ${QT_KNOWN_MODULE_${module_name}_TOOLS} + # EXPORT_NAME_PREFIX ${INSTALL_CMAKE_NAMESPACE}${target} + # CONFIG_INSTALL_DIR ${config_install_dir}) endfunction() function(qt_internal_check_directory_or_type name dir type default result_var)