59 lines
3.0 KiB
Diff
59 lines
3.0 KiB
Diff
Backported to 6.5.2 from 1a610ab9c7edde2e27ff707c9e534172e288e8ed in v6.7.0-beta1~260
|
|
|
|
https://codereview.qt-project.org/gitweb?p=qt%2Fqtgrpc.git;a=commit;h=1a610ab9c7edde2e27ff707c9e534172e288e8ed
|
|
|
|
diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/clientdeclarationprinter.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/clientdeclarationprinter.cpp
|
|
--- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/clientdeclarationprinter.cpp 2023-07-07 14:29:20.000000000 +0200
|
|
+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/clientdeclarationprinter.cpp 2024-03-12 08:14:21.885741000 +0100
|
|
@@ -8,7 +8,6 @@
|
|
#include <google/protobuf/io/printer.h>
|
|
#include <google/protobuf/io/zero_copy_stream.h>
|
|
#include <google/protobuf/stubs/common.h>
|
|
-#include <google/protobuf/stubs/logging.h>
|
|
|
|
#include <string>
|
|
#include <unordered_set>
|
|
diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp
|
|
--- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp 2023-07-07 14:29:20.000000000 +0200
|
|
+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp 2024-03-12 08:16:45.956741000 +0100
|
|
@@ -12,11 +12,10 @@
|
|
|
|
#include <set>
|
|
#include <google/protobuf/compiler/code_generator.h>
|
|
-#include <google/protobuf/stubs/logging.h>
|
|
-#include <google/protobuf/stubs/common.h>
|
|
+#include <google/protobuf/descriptor.h>
|
|
#include <google/protobuf/io/printer.h>
|
|
#include <google/protobuf/io/zero_copy_stream.h>
|
|
-#include <google/protobuf/descriptor.h>
|
|
+#include <google/protobuf/stubs/common.h>
|
|
|
|
using namespace ::QtGrpc;
|
|
using namespace ::qtprotoccommon;
|
|
diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp
|
|
--- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp 2023-07-07 14:29:20.000000000 +0200
|
|
+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp 2024-03-12 08:17:09.574741000 +0100
|
|
@@ -17,7 +17,6 @@
|
|
#include <array>
|
|
#include <numeric>
|
|
#include <set>
|
|
-#include <google/protobuf/stubs/logging.h>
|
|
#include <google/protobuf/stubs/common.h>
|
|
#include <google/protobuf/io/printer.h>
|
|
#include <google/protobuf/io/zero_copy_stream.h>
|
|
diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotoccommon/generatorbase.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotoccommon/generatorbase.cpp
|
|
--- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotoccommon/generatorbase.cpp 2023-07-07 14:29:20.000000000 +0200
|
|
+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotoccommon/generatorbase.cpp 2024-03-12 08:18:20.905741000 +0100
|
|
@@ -5,10 +5,9 @@
|
|
#include "generatorbase.h"
|
|
|
|
#include <google/protobuf/descriptor.h>
|
|
-#include <google/protobuf/stubs/logging.h>
|
|
-#include <google/protobuf/stubs/common.h>
|
|
#include <google/protobuf/io/printer.h>
|
|
#include <google/protobuf/io/zero_copy_stream.h>
|
|
+#include <google/protobuf/stubs/common.h>
|
|
|
|
#include "utils.h"
|
|
#include "commontemplates.h"
|