1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Remove double addition of LicenseRef-ICC-License to the SBOM

Browse Source 
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 <joerg.bornemann@qt.io>
(cherry picked from commit b11aaf066eaf1491a1661dd8f3baa66acfbd46f6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2024-10-07 19:24:28 +02:00 committed by Qt Cherry-pick Bot
parent 429bf6cbb2
commit d0ff36878d
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/CMakeLists.txt
View File

@ -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