From d0ff36878d817be235ae0cfad62174ef5aa8b4d2 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 7 Oct 2024 19:24:28 +0200 Subject: [PATCH] CMake: Remove double addition of LicenseRef-ICC-License to the SBOM It's already automatically added as part of the license iteration code in _qt_internal_sbom_begin_project which globs ${PROJECT_SOURCE_DIR}/LICENSES/LicenseRef-*.txt and adds those. Adding it a second time manually is unnecessary, and breaks conversion to SPDX 3.0 with the spdx java preliminary tool. Task-number: QTBUG-122899 Change-Id: Id42a02c6f2e536880b37a0ed773cf62426b46b97 Reviewed-by: Joerg Bornemann (cherry picked from commit b11aaf066eaf1491a1661dd8f3baa66acfbd46f6) Reviewed-by: Qt Cherry-pick Bot --- src/gui/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 96387c542ad..f85d38d1cbe 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -315,10 +315,6 @@ if(QT_FEATURE_pdf) ATTRIBUTION_FILE_DIR_PATHS ../3rdparty/icc ) - qt_internal_sbom_add_license( - LICENSE_ID "ICC-License" - LICENSE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/icc/LICENSE.txt" - ) qt_internal_add_resource(Gui "qpdf" PREFIX