From 6afcaa5befddeccfd1fcab5669d7a3c0a50095e0 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Fri, 30 May 2025 16:27:37 +0300 Subject: [PATCH] Revert "Update commercial SPDX-License-Identifier" This reverts commit daf9390a5f941341adf7acff879ece50816c97e4. The revert is needed for the opensource releases which cannot contain commercial license headers. Conflicts solved: src/tools/qtgrpcgen/clientdeclarationprinter.cpp src/tools/qtgrpcgen/clientdeclarationprinter.h src/tools/qtgrpcgen/clientdefinitionprinter.cpp src/tools/qtgrpcgen/clientdefinitionprinter.h src/tools/qtgrpcgen/grpctemplates.cpp src/tools/qtgrpcgen/grpctemplates.h src/tools/qtgrpcgen/main.cpp src/tools/qtgrpcgen/qgrpcgenerator.cpp src/tools/qtgrpcgen/qgrpcgenerator.h src/tools/qtgrpcgen/serverdeclarationprinter.cpp src/tools/qtgrpcgen/serverdeclarationprinter.h src/tools/qtprotobufgen/enumdeclarationprinter.cpp src/tools/qtprotobufgen/enumdeclarationprinter.h src/tools/qtprotobufgen/enumdefinitionprinter.cpp src/tools/qtprotobufgen/enumdefinitionprinter.h src/tools/qtprotobufgen/main.cpp src/tools/qtprotobufgen/messagedeclarationprinter.cpp src/tools/qtprotobufgen/messagedeclarationprinter.h src/tools/qtprotobufgen/messagedefinitionprinter.cpp src/tools/qtprotobufgen/messagedefinitionprinter.h src/tools/qtprotobufgen/qprotobufgenerator.cpp src/tools/qtprotobufgen/qprotobufgenerator.h src/tools/qtprotoccommon/baseprinter.cpp src/tools/qtprotoccommon/baseprinter.h src/tools/qtprotoccommon/commontemplates.cpp src/tools/qtprotoccommon/commontemplates.h src/tools/qtprotoccommon/descriptorprinterbase.h src/tools/qtprotoccommon/generatorbase.cpp src/tools/qtprotoccommon/generatorbase.h src/tools/qtprotoccommon/generatorcommon.cpp src/tools/qtprotoccommon/generatorcommon.h src/tools/qtprotoccommon/options.cpp src/tools/qtprotoccommon/options.h src/tools/qtprotoccommon/qtprotocdefs.h src/tools/qtprotoccommon/utils.cpp src/tools/qtprotoccommon/utils.h Change-Id: Ic8304e2c67cd7b708f7de499c6352c39cdc4d4bf Reviewed-by: Jani Heikkinen --- src/protobuf/qabstractprotobufserializer.cpp | 2 +- src/protobuf/qabstractprotobufserializer.h | 2 +- src/protobuf/qprotobuflazymessagepointer.h | 2 +- src/protobuf/qprotobufmessage.cpp | 2 +- src/protobuf/qprotobufmessage.h | 2 +- src/protobuf/qprotobufmessage_p.h | 2 +- src/protobuf/qprotobufobject.h | 2 +- src/protobuf/qprotobufselfcheckiterator.h | 2 +- src/protobuf/qprotobufserializer.cpp | 2 +- src/protobuf/qprotobufserializer.h | 2 +- src/protobuf/qprotobufserializer_p.h | 2 +- src/protobuf/qtprotobufglobal.h | 2 +- src/protobuf/qtprotobuflogging.cpp | 2 +- src/protobuf/qtprotobuflogging_p.h | 2 +- src/protobuf/qtprotobuftypes.cpp | 2 +- src/protobuf/qtprotobuftypes.h | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/protobuf/qabstractprotobufserializer.cpp b/src/protobuf/qabstractprotobufserializer.cpp index 45d61df8..3a416bd8 100644 --- a/src/protobuf/qabstractprotobufserializer.cpp +++ b/src/protobuf/qabstractprotobufserializer.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2019 Alexey Edelev -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include diff --git a/src/protobuf/qabstractprotobufserializer.h b/src/protobuf/qabstractprotobufserializer.h index c64a29d7..cc8b6f20 100644 --- a/src/protobuf/qabstractprotobufserializer.h +++ b/src/protobuf/qabstractprotobufserializer.h @@ -1,6 +1,6 @@ // Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2019 Alexey Edelev -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QABSTRACTPROTOBUFSERIALIZER_H #define QABSTRACTPROTOBUFSERIALIZER_H diff --git a/src/protobuf/qprotobuflazymessagepointer.h b/src/protobuf/qprotobuflazymessagepointer.h index e0a0d1ed..fb7272eb 100644 --- a/src/protobuf/qprotobuflazymessagepointer.h +++ b/src/protobuf/qprotobuflazymessagepointer.h @@ -1,6 +1,6 @@ // Copyright (C) 2020 Alexey Edelev // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QPROTOBUFLAZYMESSAGEPOINTER_H #define QPROTOBUFLAZYMESSAGEPOINTER_H diff --git a/src/protobuf/qprotobufmessage.cpp b/src/protobuf/qprotobufmessage.cpp index 613b486b..04ab4f24 100644 --- a/src/protobuf/qprotobufmessage.cpp +++ b/src/protobuf/qprotobufmessage.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qprotobufmessage_p.h" #include "qprotobufmessage.h" diff --git a/src/protobuf/qprotobufmessage.h b/src/protobuf/qprotobufmessage.h index 22e3696f..9ad9a652 100644 --- a/src/protobuf/qprotobufmessage.h +++ b/src/protobuf/qprotobufmessage.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef Q_PROTOBUF_MESSAGE_H #define Q_PROTOBUF_MESSAGE_H diff --git a/src/protobuf/qprotobufmessage_p.h b/src/protobuf/qprotobufmessage_p.h index 09565477..fb82358b 100644 --- a/src/protobuf/qprotobufmessage_p.h +++ b/src/protobuf/qprotobufmessage_p.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef Q_PROTOBUF_MESSAGE_P_H #define Q_PROTOBUF_MESSAGE_P_H diff --git a/src/protobuf/qprotobufobject.h b/src/protobuf/qprotobufobject.h index eaf7ae37..f36babe3 100644 --- a/src/protobuf/qprotobufobject.h +++ b/src/protobuf/qprotobufobject.h @@ -1,6 +1,6 @@ // Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2019 Alexey Edelev -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QPROTOBUFOBJECT_H #define QPROTOBUFOBJECT_H diff --git a/src/protobuf/qprotobufselfcheckiterator.h b/src/protobuf/qprotobufselfcheckiterator.h index b06a7204..94707aac 100644 --- a/src/protobuf/qprotobufselfcheckiterator.h +++ b/src/protobuf/qprotobufselfcheckiterator.h @@ -1,6 +1,6 @@ // Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2019 Alexey Edelev -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QPROTOBUFSELFCHECKITERATOR_H #define QPROTOBUFSELFCHECKITERATOR_H diff --git a/src/protobuf/qprotobufserializer.cpp b/src/protobuf/qprotobufserializer.cpp index 7d9bf6f0..5154b6e3 100644 --- a/src/protobuf/qprotobufserializer.cpp +++ b/src/protobuf/qprotobufserializer.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2019 Alexey Edelev , Viktor Kopp -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qprotobufserializer.h" #include "qprotobufserializer_p.h" diff --git a/src/protobuf/qprotobufserializer.h b/src/protobuf/qprotobufserializer.h index c171db67..181afe4b 100644 --- a/src/protobuf/qprotobufserializer.h +++ b/src/protobuf/qprotobufserializer.h @@ -1,6 +1,6 @@ // Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2019 Alexey Edelev -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QPROTOBUFSERIALIZER_H #define QPROTOBUFSERIALIZER_H diff --git a/src/protobuf/qprotobufserializer_p.h b/src/protobuf/qprotobufserializer_p.h index 6e6e89d5..339988fe 100644 --- a/src/protobuf/qprotobufserializer_p.h +++ b/src/protobuf/qprotobufserializer_p.h @@ -1,6 +1,6 @@ // Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2019 Alexey Edelev , Viktor Kopp -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QPROTOBUFSERIALIZER_P_H #define QPROTOBUFSERIALIZER_P_H diff --git a/src/protobuf/qtprotobufglobal.h b/src/protobuf/qtprotobufglobal.h index 1ee1a0c9..cbe9376d 100644 --- a/src/protobuf/qtprotobufglobal.h +++ b/src/protobuf/qtprotobufglobal.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTPROTOBUFGLOBAL_H #define QTPROTOBUFGLOBAL_H diff --git a/src/protobuf/qtprotobuflogging.cpp b/src/protobuf/qtprotobuflogging.cpp index 4c289f53..5a85d7e6 100644 --- a/src/protobuf/qtprotobuflogging.cpp +++ b/src/protobuf/qtprotobuflogging.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 Alexey Edelev -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtprotobuflogging_p.h" diff --git a/src/protobuf/qtprotobuflogging_p.h b/src/protobuf/qtprotobuflogging_p.h index b3430e7e..f68db319 100644 --- a/src/protobuf/qtprotobuflogging_p.h +++ b/src/protobuf/qtprotobuflogging_p.h @@ -1,6 +1,6 @@ // Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2019 Alexey Edelev -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTPROTOBUFLOGGING_P_H #define QTPROTOBUFLOGGING_P_H diff --git a/src/protobuf/qtprotobuftypes.cpp b/src/protobuf/qtprotobuftypes.cpp index 23d64739..3ecb3cfc 100644 --- a/src/protobuf/qtprotobuftypes.cpp +++ b/src/protobuf/qtprotobuftypes.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2019 Alexey Edelev -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include diff --git a/src/protobuf/qtprotobuftypes.h b/src/protobuf/qtprotobuftypes.h index 6814c7a6..c14b7be9 100644 --- a/src/protobuf/qtprotobuftypes.h +++ b/src/protobuf/qtprotobuftypes.h @@ -1,6 +1,6 @@ // Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2019 Alexey Edelev -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTPROTOBUFTYPES_H #define QTPROTOBUFTYPES_H