Skip to content

Commit

Permalink
CMake: Remove double addition of LicenseRef-ICC-License to the SBOM
Browse files Browse the repository at this point in the history
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 <[email protected]>
(cherry picked from commit b11aaf0)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
  • Loading branch information
alcroito authored and Qt Cherry-pick Bot committed Nov 14, 2024
1 parent 429bf6c commit d0ff368
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions src/gui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d0ff368

Please sign in to comment.