qiurui
/
qtgrpc
mirror of https://github.com/qt/qtgrpc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Update commercial SPDX-License-Identifier" 

This reverts commit daf9390a5f.
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 <jani.heikkinen@qt.io>
(cherry picked from commit 6afcaa5bef)
This commit is contained in:
Tarja Sundqvist 2025-05-30 16:27:37 +03:00
parent ae2b13aa17
commit b24bb68d34
16 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/protobuf/qabstractprotobufserializer.cpp
View File

@ -1,6 +1,6 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2022 The Qt Company Ltd.
// Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com> // Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com>
// 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 <QtProtobuf/qabstractprotobufserializer.h> #include <QtProtobuf/qabstractprotobufserializer.h>

2
src/protobuf/qabstractprotobufserializer.h
View File

@ -1,6 +1,6 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2022 The Qt Company Ltd.
// Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com> // Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com>
// 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 #ifndef QABSTRACTPROTOBUFSERIALIZER_H
#define QABSTRACTPROTOBUFSERIALIZER_H #define QABSTRACTPROTOBUFSERIALIZER_H

2
src/protobuf/qprotobuflazymessagepointer.h
View File

@ -1,6 +1,6 @@
// Copyright (C) 2020 Alexey Edelev <semlanik@gmail.com> // Copyright (C) 2020 Alexey Edelev <semlanik@gmail.com>
// Copyright (C) 2022 The Qt Company Ltd. // 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 #ifndef QPROTOBUFLAZYMESSAGEPOINTER_H
#define QPROTOBUFLAZYMESSAGEPOINTER_H #define QPROTOBUFLAZYMESSAGEPOINTER_H

2
src/protobuf/qprotobufmessage.cpp
View File

@ -1,5 +1,5 @@
// Copyright (C) 2022 The Qt Company Ltd. // 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_p.h"
#include "qprotobufmessage.h" #include "qprotobufmessage.h"

2
src/protobuf/qprotobufmessage.h
View File

@ -1,5 +1,5 @@
// Copyright (C) 2022 The Qt Company Ltd. // 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 #ifndef Q_PROTOBUF_MESSAGE_H
#define Q_PROTOBUF_MESSAGE_H #define Q_PROTOBUF_MESSAGE_H

2
src/protobuf/qprotobufmessage_p.h
View File

@ -1,5 +1,5 @@
// Copyright (C) 2022 The Qt Company Ltd. // 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 #ifndef Q_PROTOBUF_MESSAGE_P_H
#define Q_PROTOBUF_MESSAGE_P_H #define Q_PROTOBUF_MESSAGE_P_H

2
src/protobuf/qprotobufobject.h
View File

@ -1,6 +1,6 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2022 The Qt Company Ltd.
// Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com> // Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com>
// 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 #ifndef QPROTOBUFOBJECT_H
#define QPROTOBUFOBJECT_H #define QPROTOBUFOBJECT_H

2
src/protobuf/qprotobufselfcheckiterator.h
View File

@ -1,6 +1,6 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2022 The Qt Company Ltd.
// Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com> // Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com>
// 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 #ifndef QPROTOBUFSELFCHECKITERATOR_H
#define QPROTOBUFSELFCHECKITERATOR_H #define QPROTOBUFSELFCHECKITERATOR_H

2
src/protobuf/qprotobufserializer.cpp
View File

@ -1,6 +1,6 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2022 The Qt Company Ltd.
// Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com>, Viktor Kopp <vifactor@gmail.com> // Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com>, Viktor Kopp <vifactor@gmail.com>
// 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.h"
#include "qprotobufserializer_p.h" #include "qprotobufserializer_p.h"

2
src/protobuf/qprotobufserializer.h
View File

@ -1,6 +1,6 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2022 The Qt Company Ltd.
// Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com> // Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com>
// 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 #ifndef QPROTOBUFSERIALIZER_H
#define QPROTOBUFSERIALIZER_H #define QPROTOBUFSERIALIZER_H

2
src/protobuf/qprotobufserializer_p.h
View File

@ -1,6 +1,6 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2022 The Qt Company Ltd.
// Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com>, Viktor Kopp <vifactor@gmail.com> // Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com>, Viktor Kopp <vifactor@gmail.com>
// 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 #ifndef QPROTOBUFSERIALIZER_P_H
#define QPROTOBUFSERIALIZER_P_H #define QPROTOBUFSERIALIZER_P_H

2
src/protobuf/qtprotobufglobal.h
View File

@ -1,5 +1,5 @@
// Copyright (C) 2022 The Qt Company Ltd. // 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 #ifndef QTPROTOBUFGLOBAL_H
#define QTPROTOBUFGLOBAL_H #define QTPROTOBUFGLOBAL_H

2
src/protobuf/qtprotobuflogging.cpp
View File

@ -1,5 +1,5 @@
// Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com> // Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com>
// 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" #include "qtprotobuflogging_p.h"

2
src/protobuf/qtprotobuflogging_p.h
View File

@ -1,6 +1,6 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2022 The Qt Company Ltd.
// Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com> // Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com>
// 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 #ifndef QTPROTOBUFLOGGING_P_H
#define QTPROTOBUFLOGGING_P_H #define QTPROTOBUFLOGGING_P_H

2
src/protobuf/qtprotobuftypes.cpp
View File

@ -1,6 +1,6 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2022 The Qt Company Ltd.
// Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com> // Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com>
// 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 <QtProtobuf/qtprotobufglobal.h> #include <QtProtobuf/qtprotobufglobal.h>

2
src/protobuf/qtprotobuftypes.h
View File

@ -1,6 +1,6 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2022 The Qt Company Ltd.
// Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com> // Copyright (C) 2019 Alexey Edelev <semlanik@gmail.com>
// 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 #ifndef QTPROTOBUFTYPES_H
#define QTPROTOBUFTYPES_H #define QTPROTOBUFTYPES_H