Migrate to Qt protobuf 0.2.0

neuralnetworkui/CMakeLists.txt

@@ -6,8 +6,8 @@ set(TARGET NeuralNetworkUi)
 
 find_package(Qt5 COMPONENTS Quick Gui Core Qml REQUIRED)
 
-set(QTPROTOBUF_MAKE_TESTS false)
-set(QTPROTOBUF_MAKE_EXAMPLES false)
+set(QT_PROTOBUF_MAKE_TESTS OFF)
+set(QT_PROTOBUF_MAKE_EXAMPLES OFF)
 add_subdirectory("qtprotobuf")
 
 find_package(QtProtobufProject CONFIG COMPONENTS QtProtobuf QtGrpc REQUIRED)
@@ -23,5 +23,5 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
 add_executable(NeuralNetworkUi main.cpp qml.qrc valueindicator.cpp visualizermodel.cpp dense.cpp layertrigger.cpp)
-generate_qtprotobuf(TARGET ${TARGET} PROTO_FILES ${PROTO_FILES} ${VISUALIZATION_PROTO} QML TRUE)
+qtprotobuf_generate(TARGET ${TARGET} PROTO_FILES ${PROTO_FILES} ${VISUALIZATION_PROTO} QML)
 target_link_libraries(NeuralNetworkUi PRIVATE Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick QtProtobufProject::QtProtobuf QtProtobufProject::QtGrpc ${QtProtobuf_GENERATED})

neuralnetworkui/main.cpp

@@ -29,7 +29,6 @@
 #include <QDebug>
 #include <QtProtobufTypes>
 
-#include "qtprotobuf_global.qpb.h"
 #include "remotecontrol_grpc.qpb.h"
 #include "visualization_grpc.qpb.h"
 
@@ -41,7 +40,6 @@
 
 int main(int argc, char *argv[])
 {
-    remotecontrol::qRegisterProtobufTypes();
     QtProtobuf::qRegisterProtobufTypes();
 
     QGuiApplication app(argc, argv);

neuralnetworkui/qtprotobuf

@@ -1 +1 @@
-Subproject commit 8cd7bdd128a64f9b60cc335306c49e6dab6ed1c7
+Subproject commit 6a8f5622b9f5e22870443933322bfc49b9bc8305