From 675e4c9515a64eb43b8667eb844a06e57d252976 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Wed, 22 Nov 2023 12:56:15 +0200 Subject: [PATCH] Remove commercial SPDX-License-Identifier from build files The build files should not include a commercial SPDX-License-Identifier. Instead, a BSD-3-Clause license identifier is used. Task-number: QTQAINFRA-5900 Change-Id: Ia9476c3ad57b6c161ac583813fe8dacf876f7b5a Reviewed-by: Tatiana Borisova Reviewed-by: Alexey Edelev --- CMakeLists.txt | 2 +- cmake/FindWrapProtobuf.cmake | 2 +- cmake/FindWrapProtoc.cmake | 2 +- cmake/FindWrapgRPC.cmake | 2 +- cmake/FindWrapgRPCPlugin.cmake | 2 +- configure.cmake | 2 +- qt_cmdline.cmake | 2 +- src/CMakeLists.txt | 2 +- src/grpc/CMakeLists.txt | 2 +- src/grpc/configure.cmake | 2 +- src/protobuf/CMakeLists.txt | 2 +- src/protobuf/Qt6ProtobufBuildInternals.cmake | 2 +- src/protobuf/configure.cmake | 2 +- src/tools/CMakeLists.txt | 2 +- src/tools/host/CMakeLists.txt | 2 +- src/tools/qtgrpcgen/CMakeLists.txt | 2 +- src/tools/qtgrpcgen/Qt6GrpcToolsMacros.cmake | 2 +- src/tools/qtprotobufgen/CMakeLists.txt | 2 +- src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake | 2 +- src/tools/qtprotobufgen/QtProtocCommandWrapper.cmake | 2 +- src/tools/qtprotoccommon/CMakeLists.txt | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4297807..8505c96b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16) diff --git a/cmake/FindWrapProtobuf.cmake b/cmake/FindWrapProtobuf.cmake index bf99387a..36bf0e9d 100644 --- a/cmake/FindWrapProtobuf.cmake +++ b/cmake/FindWrapProtobuf.cmake @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause if(TARGET WrapProtobuf::WrapLibProtoc) set(WrapProtobuf_FOUND TRUE) diff --git a/cmake/FindWrapProtoc.cmake b/cmake/FindWrapProtoc.cmake index 283fa058..82972c8f 100644 --- a/cmake/FindWrapProtoc.cmake +++ b/cmake/FindWrapProtoc.cmake @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause if(TARGET WrapProtoc::WrapProtoc) set(WrapProtoc_FOUND TRUE) diff --git a/cmake/FindWrapgRPC.cmake b/cmake/FindWrapgRPC.cmake index e24bd2e3..ecc6e243 100644 --- a/cmake/FindWrapgRPC.cmake +++ b/cmake/FindWrapgRPC.cmake @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause if(TARGET WrapgRPC::WrapLibgRPC) set(WrapgRPC_FOUND TRUE) diff --git a/cmake/FindWrapgRPCPlugin.cmake b/cmake/FindWrapgRPCPlugin.cmake index 67bc5917..536972f3 100644 --- a/cmake/FindWrapgRPCPlugin.cmake +++ b/cmake/FindWrapgRPCPlugin.cmake @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause if(TARGET WrapgRPC::WrapgRPCPlugin) set(WrapgRPCPlugin_FOUND TRUE) diff --git a/configure.cmake b/configure.cmake index a0f9fa5a..a7d05099 100644 --- a/configure.cmake +++ b/configure.cmake @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause qt_extra_definition("QT_VERSION_STR" "\"${PROJECT_VERSION}\"" PUBLIC) qt_extra_definition("QT_VERSION_MAJOR" ${PROJECT_VERSION_MAJOR} PUBLIC) diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake index 35ae6f61..e3af2def 100644 --- a/qt_cmdline.cmake +++ b/qt_cmdline.cmake @@ -1,4 +1,4 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause qt_commandline_subconfig(src/protobuf) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index feda64cd..19a2b6bc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause # Evaluate features before including repository subparts. qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/protobuf/configure.cmake") diff --git a/src/grpc/CMakeLists.txt b/src/grpc/CMakeLists.txt index 24415e27..bfe48e1f 100644 --- a/src/grpc/CMakeLists.txt +++ b/src/grpc/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause qt_internal_add_module(Grpc SOURCES diff --git a/src/grpc/configure.cmake b/src/grpc/configure.cmake index 036dc925..c865cbd6 100644 --- a/src/grpc/configure.cmake +++ b/src/grpc/configure.cmake @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause qt_find_package(WrapgRPC PROVIDED_TARGETS WrapgRPC::WrapLibgRPC diff --git a/src/protobuf/CMakeLists.txt b/src/protobuf/CMakeLists.txt index 7d3512b2..a1036c50 100644 --- a/src/protobuf/CMakeLists.txt +++ b/src/protobuf/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause qt_internal_add_module(Protobuf SOURCES diff --git a/src/protobuf/Qt6ProtobufBuildInternals.cmake b/src/protobuf/Qt6ProtobufBuildInternals.cmake index ed9a4be1..c07ff0c7 100644 --- a/src/protobuf/Qt6ProtobufBuildInternals.cmake +++ b/src/protobuf/Qt6ProtobufBuildInternals.cmake @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause set(__qt_protobuf_build_internals_base_dir "${CMAKE_CURRENT_LIST_DIR}" CACHE INTERNAL "") macro(qt_internal_get_internal_add_protobuf_module_keywords option_args single_args multi_args) diff --git a/src/protobuf/configure.cmake b/src/protobuf/configure.cmake index 93776154..6ba79177 100644 --- a/src/protobuf/configure.cmake +++ b/src/protobuf/configure.cmake @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause qt_find_package(WrapProtobuf PROVIDED_TARGETS diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index aa8a3cdf..7186ecd2 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause # Skip building qtprotoccommon when not building tools if((QT_FEATURE_qtprotobufgen OR QT_FEATURE_qtgrpcgen) AND diff --git a/src/tools/host/CMakeLists.txt b/src/tools/host/CMakeLists.txt index 71bf0a0f..3d290914 100644 --- a/src/tools/host/CMakeLists.txt +++ b/src/tools/host/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16) diff --git a/src/tools/qtgrpcgen/CMakeLists.txt b/src/tools/qtgrpcgen/CMakeLists.txt index c53c6f50..e337ab9c 100644 --- a/src/tools/qtgrpcgen/CMakeLists.txt +++ b/src/tools/qtgrpcgen/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause qt_get_tool_target_name(target_name qtgrpcgen) qt_internal_add_tool(${target_name} diff --git a/src/tools/qtgrpcgen/Qt6GrpcToolsMacros.cmake b/src/tools/qtgrpcgen/Qt6GrpcToolsMacros.cmake index 7cbc69b6..ec64f50d 100644 --- a/src/tools/qtgrpcgen/Qt6GrpcToolsMacros.cmake +++ b/src/tools/qtgrpcgen/Qt6GrpcToolsMacros.cmake @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause # The function looks for the service definitions inside provided PROTO_FILES and returns list of # the absolute .proto file paths, protobuf include paths and files that are expected to be generated diff --git a/src/tools/qtprotobufgen/CMakeLists.txt b/src/tools/qtprotobufgen/CMakeLists.txt index e3dfac2c..984571c2 100644 --- a/src/tools/qtprotobufgen/CMakeLists.txt +++ b/src/tools/qtprotobufgen/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause qt_get_tool_target_name(target_name qtprotobufgen) qt_internal_add_tool(${target_name} diff --git a/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake b/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake index aadc9fe7..862ba81f 100644 --- a/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake +++ b/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause set(__qt_protobuf_macros_module_base_dir "${CMAKE_CURRENT_LIST_DIR}" CACHE INTERNAL "") diff --git a/src/tools/qtprotobufgen/QtProtocCommandWrapper.cmake b/src/tools/qtprotobufgen/QtProtocCommandWrapper.cmake index 776008a9..0b66e121 100644 --- a/src/tools/qtprotobufgen/QtProtocCommandWrapper.cmake +++ b/src/tools/qtprotobufgen/QtProtocCommandWrapper.cmake @@ -1,6 +1,6 @@ #!${CMAKE_COMMAND} -P # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause if(GENERATOR_NAME EQUAL "qtgrpc") set(ENV{QT_GRPC_OPTIONS} "${QT_GRPC_OPTIONS}") diff --git a/src/tools/qtprotoccommon/CMakeLists.txt b/src/tools/qtprotoccommon/CMakeLists.txt index 8d57e527..86335a8e 100644 --- a/src/tools/qtprotoccommon/CMakeLists.txt +++ b/src/tools/qtprotoccommon/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: BSD-3-Clause qt_add_library(QtProtocCommon STATIC qtprotocdefs.h