diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-23 13:20:30 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-23 11:22:01 +0000 |
| commit | 80d86fed13c5a59691d26a711ffa9bfdd994f27c (patch) | |
| tree | f1af098cdd63cbb20486c8cbc23d65520035e1aa | |
| parent | 3ecfeb3629ab9628a6a52bb7a86e9e53af8595c2 (diff) | |
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 <simon.hausmann@qt.io>
| -rw-r--r-- | cmake/QtBuild.cmake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 758af7ebfe..4ddbcff3ab 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) |