From 06b4f35b569edd7dc87834e38c89d2025ed5f926 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 30 May 2024 15:06:11 +0200 Subject: [PATCH] Imply Q_GADGET in Q_PROTOBUF_OBJECT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes the generated code cleaner. All protobuf targets now append Q_PROTOBUF_OBJECT to AUTOMOC_MACRO_NAMES, to ensure that the AUTOMOC processing works correctly, but it should be triggered by 'moc_' includes already. In CMake versions >= 3.27 AUTOMOC_MACRO_NAMES should be propagated as the INTERFACE property of QtProtobuf module. Pick-to: 6.8 Change-Id: Ie2540af3573d3281bf67682b49788609ee55f497 Reviewed-by: Mårten Nordheim Reviewed-by: Tatiana Borisova Reviewed-by: Dennis Oberst --- src/protobuf/CMakeLists.txt | 4 + src/protobuf/qprotobufobject.h | 3 + .../Qt6ProtobufToolsMacros.cmake | 1 + src/tools/qtprotoccommon/commontemplates.cpp | 2 - .../folder/qtgrpc/tests/testservice.qpb.h | 3 - .../protobuf/qtgrpc/tests/testservice.qpb.h | 3 - .../protobuf/qprotobufoneof/CMakeLists.txt | 1 + .../qprotobufoneof/tst_qprotobufoneof.cpp | 1 - .../expected_result/comments/annotation.qpb.h | 9 -- .../custom-exports/basicmessages.qpb.h | 17 ---- .../extra-namespace/extranamespace.qpb.h | 3 - .../fieldenum/fieldindexrange.qpb.h | 4 - .../optional/tests/optional.qpb.h | 2 - .../tests/basicmessages.qpb.h | 17 ---- .../tests/mapmessages.qpb.h | 88 ------------------- .../tests/oneofmessages.qpb.h | 2 - .../tests/repeatedmessages.qpb.h | 16 ---- .../no-exports/basicmessages.qpb.h | 17 ---- .../no-options/annotation.qpb.h | 9 -- .../no-options/anymessages.qpb.h | 5 -- .../no-options/basicmessages.qpb.h | 17 ---- .../no-options/extranamespace.qpb.h | 3 - .../no-options/fieldindexrange.qpb.h | 4 - .../no-options/mapmessages.qpb.h | 88 ------------------- .../no-options/oneofmessages.qpb.h | 2 - .../expected_result/no-options/optional.qpb.h | 2 - .../no-options/repeatedmessages.qpb.h | 16 ---- .../repeatednonpackedmessages.qpb.h | 14 --- .../packed/repeatednonpackedmessages.qpb.h | 14 --- .../qml-no-package/nopackage.qpb.h | 4 - .../qml-no-package/nopackageexternal.qpb.h | 1 - .../qmlgen/basicmessages.qpb.h | 17 ---- .../expected_result/qmlgen/enummessages.qpb.h | 11 --- .../qmlgen/oneofmessages.qpb.h | 2 - .../qmlgen/repeatedmessages.qpb.h | 16 ---- 35 files changed, 9 insertions(+), 409 deletions(-) diff --git a/src/protobuf/CMakeLists.txt b/src/protobuf/CMakeLists.txt index 51e4acbe..c4e243a4 100644 --- a/src/protobuf/CMakeLists.txt +++ b/src/protobuf/CMakeLists.txt @@ -31,6 +31,10 @@ qt_internal_add_docs(Protobuf doc/qtprotobuf.qdocconf ) +if(CMAKE_VERSION GREATER_EQUAL 3.27) + set_target_properties(Protobuf PROPERTIES INTERFACE_AUTOMOC_MACRO_NAMES "Q_PROTOBUF_OBJECT") +endif() + # TODO: Remove this and fix it in qtbase's qt_internal_find_tool directly if(QT_HOST_PATH AND Qt6::qtprotobufgen IN_LIST Qt6ProtobufTools_TARGETS AND NOT QT_FORCE_BUILD_TOOLS) diff --git a/src/protobuf/qprotobufobject.h b/src/protobuf/qprotobufobject.h index af9b7927..66185061 100644 --- a/src/protobuf/qprotobufobject.h +++ b/src/protobuf/qprotobufobject.h @@ -10,9 +10,12 @@ # pragma qt_sync_stop_processing #endif + #include +#include #define Q_PROTOBUF_OBJECT\ + Q_GADGET\ public:\ static const QtProtobufPrivate::QProtobufPropertyOrdering staticPropertyOrdering;\ private: diff --git a/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake b/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake index 79ed244e..811f761c 100644 --- a/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake +++ b/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake @@ -179,6 +179,7 @@ function(_qt_internal_protoc_generate target generator output_directory) add_custom_target(${deps_target} DEPENDS ${generated_files}) set_property(TARGET ${target} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS "${deps_target}") + set_property(TARGET ${target} APPEND PROPERTY AUTOMOC_MACRO_NAMES "Q_PROTOBUF_OBJECT") set_property(TARGET ${target} PROPERTY _qt_${generator}_deps_num "${num_deps}") set_source_files_properties(${generated_files} PROPERTIES GENERATED TRUE diff --git a/src/tools/qtprotoccommon/commontemplates.cpp b/src/tools/qtprotoccommon/commontemplates.cpp index dfa02976..f8d6f39b 100644 --- a/src/tools/qtprotoccommon/commontemplates.cpp +++ b/src/tools/qtprotoccommon/commontemplates.cpp @@ -217,7 +217,6 @@ const char *CommonTemplates::ClassMessageBeginDeclarationTemplate() return "\nclass $dataclassname$;\n" "class $export_macro$ $classname$ : public QProtobufMessage\n" "{\n" - " Q_GADGET\n" " Q_PROTOBUF_OBJECT\n"; } @@ -226,7 +225,6 @@ const char *CommonTemplates::ClassMessageBeginDeclarationTemplateEmptyMacros() return "\nclass $dataclassname$;\n" "class $classname$ : public QProtobufMessage\n" "{\n" - " Q_GADGET\n" " Q_PROTOBUF_OBJECT\n"; } diff --git a/tests/auto/grpcgen/data/expected_result/folder/qtgrpc/tests/testservice.qpb.h b/tests/auto/grpcgen/data/expected_result/folder/qtgrpc/tests/testservice.qpb.h index 7328ee8b..0d7232d5 100644 --- a/tests/auto/grpcgen/data/expected_result/folder/qtgrpc/tests/testservice.qpb.h +++ b/tests/auto/grpcgen/data/expected_result/folder/qtgrpc/tests/testservice.qpb.h @@ -41,7 +41,6 @@ enum class QtProtobufFieldEnum; class SimpleStringMessage_QtProtobufData; class SimpleStringMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true) @@ -83,7 +82,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleIntMessage_QtProtobufData; class SimpleIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -125,7 +123,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class BlobMessage_QtProtobufData; class BlobMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QByteArray testBytes READ testBytes WRITE setTestBytes SCRIPTABLE true) diff --git a/tests/auto/grpcgen/data/expected_result/separate/protobuf/qtgrpc/tests/testservice.qpb.h b/tests/auto/grpcgen/data/expected_result/separate/protobuf/qtgrpc/tests/testservice.qpb.h index 4f3b40f8..296f20b9 100644 --- a/tests/auto/grpcgen/data/expected_result/separate/protobuf/qtgrpc/tests/testservice.qpb.h +++ b/tests/auto/grpcgen/data/expected_result/separate/protobuf/qtgrpc/tests/testservice.qpb.h @@ -42,7 +42,6 @@ enum class QtProtobufFieldEnum; class SimpleStringMessage_QtProtobufData; class QPB_TST_QTGRPCGEN_PROTOBUF_ONLY_EXPORT SimpleStringMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true) @@ -84,7 +83,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleIntMessage_QtProtobufData; class QPB_TST_QTGRPCGEN_PROTOBUF_ONLY_EXPORT SimpleIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -126,7 +124,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class BlobMessage_QtProtobufData; class QPB_TST_QTGRPCGEN_PROTOBUF_ONLY_EXPORT BlobMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QByteArray testBytes READ testBytes WRITE setTestBytes SCRIPTABLE true) diff --git a/tests/auto/protobuf/qprotobufoneof/CMakeLists.txt b/tests/auto/protobuf/qprotobufoneof/CMakeLists.txt index d677b36b..02b5ef14 100644 --- a/tests/auto/protobuf/qprotobufoneof/CMakeLists.txt +++ b/tests/auto/protobuf/qprotobufoneof/CMakeLists.txt @@ -14,3 +14,4 @@ qt_internal_add_test(tst_qprotobufoneof Qt::Protobuf ) +set_property(TARGET tst_qprotobufoneof APPEND PROPERTY AUTOMOC_MACRO_NAMES "Q_PROTOBUF_OBJECT") diff --git a/tests/auto/protobuf/qprotobufoneof/tst_qprotobufoneof.cpp b/tests/auto/protobuf/qprotobufoneof/tst_qprotobufoneof.cpp index f625e193..91aee53d 100644 --- a/tests/auto/protobuf/qprotobufoneof/tst_qprotobufoneof.cpp +++ b/tests/auto/protobuf/qprotobufoneof/tst_qprotobufoneof.cpp @@ -11,7 +11,6 @@ class TestMetaType : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT public: TestMetaType() : QProtobufMessage(&staticMetaObject, &TestMetaType::staticPropertyOrdering) { } diff --git a/tests/auto/protobufgen/data/expected_result/comments/annotation.qpb.h b/tests/auto/protobufgen/data/expected_result/comments/annotation.qpb.h index f97f9a44..af73506e 100644 --- a/tests/auto/protobufgen/data/expected_result/comments/annotation.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/comments/annotation.qpb.h @@ -78,7 +78,6 @@ enum class QtProtobufFieldEnum; class AnnotatedMessage1_QtProtobufData; class AnnotatedMessage1 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -124,7 +123,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class AnnotatedMessage2_QtProtobufData; class AnnotatedMessage2 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -170,7 +168,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class AnnotatedMessage3_QtProtobufData; class AnnotatedMessage3 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -217,7 +214,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class AnnotatedMessage4_QtProtobufData; class AnnotatedMessage4 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -260,7 +256,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class AnnotatedMessage5_QtProtobufData; class AnnotatedMessage5 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -304,7 +299,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class AnnotatedMessage6_QtProtobufData; class AnnotatedMessage6 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -350,7 +344,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class AnnotatedMessage7_QtProtobufData; class AnnotatedMessage7 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -396,7 +389,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class AnnotatedMessage8_QtProtobufData; class AnnotatedMessage8 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -443,7 +435,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class AnnotatedMessage9_QtProtobufData; class AnnotatedMessage9 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) diff --git a/tests/auto/protobufgen/data/expected_result/custom-exports/basicmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/custom-exports/basicmessages.qpb.h index f603151d..d16cfbbc 100644 --- a/tests/auto/protobufgen/data/expected_result/custom-exports/basicmessages.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/custom-exports/basicmessages.qpb.h @@ -126,7 +126,6 @@ enum class QtProtobufFieldEnum; class EmptyMessage_QtProtobufData; class QPB_CUSTOM_EXPORT_NAME_EXPORT EmptyMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT public: @@ -159,7 +158,6 @@ Q_NAMESPACE_EXPORT(QPB_CUSTOM_EXPORT_NAME_EXPORT) class SimpleBoolMessage_QtProtobufData; class QPB_CUSTOM_EXPORT_NAME_EXPORT SimpleBoolMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(bool testFieldBool READ testFieldBool WRITE setTestFieldBool SCRIPTABLE true) @@ -201,7 +199,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleIntMessage_QtProtobufData; class QPB_CUSTOM_EXPORT_NAME_EXPORT SimpleIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -243,7 +240,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSIntMessage_QtProtobufData; class QPB_CUSTOM_EXPORT_NAME_EXPORT SimpleSIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -285,7 +281,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUIntMessage_QtProtobufData; class QPB_CUSTOM_EXPORT_NAME_EXPORT SimpleUIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::uint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -327,7 +322,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64Message_QtProtobufData; class QPB_CUSTOM_EXPORT_NAME_EXPORT SimpleInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false) @@ -369,7 +363,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64Message_QtProtobufData; class QPB_CUSTOM_EXPORT_NAME_EXPORT SimpleSInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false) @@ -411,7 +404,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64Message_QtProtobufData; class QPB_CUSTOM_EXPORT_NAME_EXPORT SimpleUInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::uint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -453,7 +445,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringMessage_QtProtobufData; class QPB_CUSTOM_EXPORT_NAME_EXPORT SimpleStringMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true) @@ -495,7 +486,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFloatMessage_QtProtobufData; class QPB_CUSTOM_EXPORT_NAME_EXPORT SimpleFloatMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(float testFieldFloat READ testFieldFloat WRITE setTestFieldFloat SCRIPTABLE true) @@ -537,7 +527,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleDoubleMessage_QtProtobufData; class QPB_CUSTOM_EXPORT_NAME_EXPORT SimpleDoubleMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(double testFieldDouble READ testFieldDouble WRITE setTestFieldDouble SCRIPTABLE true) @@ -579,7 +568,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleBytesMessage_QtProtobufData; class QPB_CUSTOM_EXPORT_NAME_EXPORT SimpleBytesMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QByteArray testFieldBytes READ testFieldBytes WRITE setTestFieldBytes SCRIPTABLE true) @@ -621,7 +609,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixedInt32Message_QtProtobufData; class QPB_CUSTOM_EXPORT_NAME_EXPORT SimpleFixedInt32Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::fixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true) @@ -663,7 +650,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixedInt64Message_QtProtobufData; class QPB_CUSTOM_EXPORT_NAME_EXPORT SimpleFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::fixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false) @@ -705,7 +691,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixedInt32Message_QtProtobufData; class QPB_CUSTOM_EXPORT_NAME_EXPORT SimpleSFixedInt32Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sfixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true) @@ -747,7 +732,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixedInt64Message_QtProtobufData; class QPB_CUSTOM_EXPORT_NAME_EXPORT SimpleSFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sfixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false) @@ -789,7 +773,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class ComplexMessage_QtProtobufData; class QPB_CUSTOM_EXPORT_NAME_EXPORT ComplexMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringMessage *testComplexField_p READ testComplexField_p WRITE setTestComplexField_p SCRIPTABLE false) diff --git a/tests/auto/protobufgen/data/expected_result/extra-namespace/extranamespace.qpb.h b/tests/auto/protobufgen/data/expected_result/extra-namespace/extranamespace.qpb.h index b010afe4..54ee5d7f 100644 --- a/tests/auto/protobufgen/data/expected_result/extra-namespace/extranamespace.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/extra-namespace/extranamespace.qpb.h @@ -41,7 +41,6 @@ enum class QtProtobufFieldEnum; class EmptyMessage_QtProtobufData; class EmptyMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT public: @@ -74,7 +73,6 @@ Q_NAMESPACE class SimpleStringMessage_QtProtobufData; class SimpleStringMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true) @@ -116,7 +114,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class ComplexMessage_QtProtobufData; class ComplexMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) Q_PROPERTY(MyTopLevelNamespace::qtprotobufnamespace::tests::SimpleStringMessage *testComplexField_p READ testComplexField_p WRITE setTestComplexField_p SCRIPTABLE false) diff --git a/tests/auto/protobufgen/data/expected_result/fieldenum/fieldindexrange.qpb.h b/tests/auto/protobufgen/data/expected_result/fieldenum/fieldindexrange.qpb.h index 921d1089..eb959278 100644 --- a/tests/auto/protobufgen/data/expected_result/fieldenum/fieldindexrange.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/fieldenum/fieldindexrange.qpb.h @@ -47,7 +47,6 @@ enum class QtProtobufFieldEnum; class FieldIndexTest1Message_QtProtobufData; class FieldIndexTest1Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -89,7 +88,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class FieldIndexTest2Message_QtProtobufData; class FieldIndexTest2Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -131,7 +129,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class FieldIndexTest3Message_QtProtobufData; class FieldIndexTest3Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -173,7 +170,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class FieldIndexTest4Message_QtProtobufData; class FieldIndexTest4Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) diff --git a/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/optional/tests/optional.qpb.h b/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/optional/tests/optional.qpb.h index 1a1f5c3f..5d2373e3 100644 --- a/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/optional/tests/optional.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/optional/tests/optional.qpb.h @@ -38,7 +38,6 @@ enum class QtProtobufFieldEnum; class TestStringMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT TestStringMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QString stringField READ stringField WRITE setStringField SCRIPTABLE true) @@ -80,7 +79,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class OptionalMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT OptionalMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) Q_PROPERTY(QtProtobuf::sint32 testFieldOpt READ testFieldOpt_p WRITE setTestFieldOpt_p) diff --git a/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/basicmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/basicmessages.qpb.h index f96c0944..ac41826c 100644 --- a/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/basicmessages.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/basicmessages.qpb.h @@ -126,7 +126,6 @@ enum class QtProtobufFieldEnum; class EmptyMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT EmptyMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT public: @@ -159,7 +158,6 @@ Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_GEN_EXPORT) class SimpleBoolMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleBoolMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(bool testFieldBool READ testFieldBool WRITE setTestFieldBool SCRIPTABLE true) @@ -201,7 +199,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleIntMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -243,7 +240,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSIntMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -285,7 +281,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUIntMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::uint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -327,7 +322,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false) @@ -369,7 +363,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false) @@ -411,7 +404,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::uint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -453,7 +445,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleStringMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true) @@ -495,7 +486,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFloatMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFloatMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(float testFieldFloat READ testFieldFloat WRITE setTestFieldFloat SCRIPTABLE true) @@ -537,7 +527,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleDoubleMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleDoubleMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(double testFieldDouble READ testFieldDouble WRITE setTestFieldDouble SCRIPTABLE true) @@ -579,7 +568,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleBytesMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleBytesMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QByteArray testFieldBytes READ testFieldBytes WRITE setTestFieldBytes SCRIPTABLE true) @@ -621,7 +609,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixedInt32Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixedInt32Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::fixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true) @@ -663,7 +650,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixedInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::fixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false) @@ -705,7 +691,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixedInt32Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixedInt32Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sfixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true) @@ -747,7 +732,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixedInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sfixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false) @@ -789,7 +773,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class ComplexMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT ComplexMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringMessage *testComplexField_p READ testComplexField_p WRITE setTestComplexField_p SCRIPTABLE false) diff --git a/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/mapmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/mapmessages.qpb.h index 95bb593b..360b75a5 100644 --- a/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/mapmessages.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/mapmessages.qpb.h @@ -553,7 +553,6 @@ enum class QtProtobufFieldEnum; class SimpleSInt32StringMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSInt32StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -597,7 +596,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64StringMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSInt64StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -641,7 +639,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt32StringMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleInt32StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -685,7 +682,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64StringMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleInt64StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -729,7 +725,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt32StringMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUInt32StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -773,7 +768,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64StringMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUInt64StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -817,7 +811,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed32StringMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixed32StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -861,7 +854,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed64StringMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixed64StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -905,7 +897,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed32StringMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixed32StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -949,7 +940,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed64StringMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixed64StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -993,7 +983,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringStringMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleStringStringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringStringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1037,7 +1026,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt32SInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSInt32SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1081,7 +1069,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64SInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSInt64SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1125,7 +1112,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt32SInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleInt32SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1169,7 +1155,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64SInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleInt64SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1213,7 +1198,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt32SInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUInt32SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1257,7 +1241,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64SInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUInt64SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1301,7 +1284,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed32SInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixed32SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1345,7 +1327,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed64SInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixed64SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1389,7 +1370,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed32SInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixed32SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1433,7 +1413,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed64SInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixed64SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1477,7 +1456,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringSInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleStringSInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringSInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1521,7 +1499,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt32SInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSInt32SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1565,7 +1542,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64SInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSInt64SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1609,7 +1585,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt32SInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleInt32SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1653,7 +1628,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64SInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleInt64SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1697,7 +1671,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt32SInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUInt32SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1741,7 +1714,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64SInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUInt64SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1785,7 +1757,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed32SInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixed32SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1829,7 +1800,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed64SInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixed64SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1873,7 +1843,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed32SInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixed32SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1917,7 +1886,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed64SInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixed64SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1961,7 +1929,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringSInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleStringSInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringSInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2005,7 +1972,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt32UInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSInt32UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2049,7 +2015,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64UInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSInt64UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2093,7 +2058,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt32UInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleInt32UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2137,7 +2101,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64UInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleInt64UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2181,7 +2144,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt32UInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUInt32UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2225,7 +2187,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64UInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUInt64UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2269,7 +2230,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed32UInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixed32UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2313,7 +2273,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed64UInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixed64UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2357,7 +2316,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed32UInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixed32UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2401,7 +2359,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed64UInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixed64UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2445,7 +2402,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringUInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleStringUInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringUInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2489,7 +2445,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt32UInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSInt32UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2533,7 +2488,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64UInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSInt64UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2577,7 +2531,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt32UInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleInt32UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2621,7 +2574,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64UInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleInt64UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2665,7 +2617,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt32UInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUInt32UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2709,7 +2660,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64UInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUInt64UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2753,7 +2703,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed32UInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixed32UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2797,7 +2746,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed64UInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixed64UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2841,7 +2789,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed32UInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixed32UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2885,7 +2832,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed64UInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixed64UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2929,7 +2875,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringUInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleStringUInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringUInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2973,7 +2918,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt32Int32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSInt32Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3017,7 +2961,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64Int32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSInt64Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3061,7 +3004,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt32Int32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleInt32Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3105,7 +3047,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64Int32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleInt64Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3149,7 +3090,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt32Int32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUInt32Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3193,7 +3133,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64Int32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUInt64Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3237,7 +3176,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed32Int32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixed32Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3281,7 +3219,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed64Int32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixed64Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3325,7 +3262,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed32Int32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixed32Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3369,7 +3305,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed64Int32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixed64Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3413,7 +3348,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringInt32MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleStringInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3457,7 +3391,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt32Int64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSInt32Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3501,7 +3434,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64Int64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSInt64Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3545,7 +3477,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt32Int64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleInt32Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3589,7 +3520,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64Int64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleInt64Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3633,7 +3563,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt32Int64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUInt32Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3677,7 +3606,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64Int64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUInt64Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3721,7 +3649,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed32Int64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixed32Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3765,7 +3692,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed64Int64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixed64Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3809,7 +3735,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed32Int64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixed32Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3853,7 +3778,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed64Int64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixed64Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3897,7 +3821,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringInt64MapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleStringInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3941,7 +3864,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt32ComplexMessageMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSInt32ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3985,7 +3907,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64ComplexMessageMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSInt64ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4029,7 +3950,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt32ComplexMessageMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleInt32ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4073,7 +3993,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64ComplexMessageMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleInt64ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4117,7 +4036,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt32ComplexMessageMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUInt32ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4161,7 +4079,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64ComplexMessageMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleUInt64ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4205,7 +4122,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed32ComplexMessageMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixed32ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4249,7 +4165,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed64ComplexMessageMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleFixed64ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4293,7 +4208,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed32ComplexMessageMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixed32ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4337,7 +4251,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed64ComplexMessageMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleSFixed64ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4381,7 +4294,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringComplexMessageMapMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT SimpleStringComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) diff --git a/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/oneofmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/oneofmessages.qpb.h index d3ce3ea1..a5ace4d4 100644 --- a/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/oneofmessages.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/oneofmessages.qpb.h @@ -41,7 +41,6 @@ enum class SecondOneofFields; class OneofSimpleMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT OneofSimpleMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32 testOneofFieldInt READ testOneofFieldInt_p WRITE setTestOneofFieldInt_p) Q_PROPERTY(bool hasTestOneofFieldInt READ hasTestOneofFieldInt) @@ -106,7 +105,6 @@ Q_ENUM_NS(TestOneofFields) class OneofComplexMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT OneofComplexMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) Q_PROPERTY(QtProtobuf::int32 testOneofFieldInt READ testOneofFieldInt_p WRITE setTestOneofFieldInt_p) diff --git a/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/repeatedmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/repeatedmessages.qpb.h index 14eecdfd..43a82755 100644 --- a/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/repeatedmessages.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/repeatedmessages.qpb.h @@ -121,7 +121,6 @@ enum class QtProtobufFieldEnum; class RepeatedStringMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT RepeatedStringMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QStringList testRepeatedString READ testRepeatedString WRITE setTestRepeatedString SCRIPTABLE true) @@ -164,7 +163,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedDoubleMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT RepeatedDoubleMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::doubleList testRepeatedDouble READ testRepeatedDouble WRITE setTestRepeatedDouble SCRIPTABLE true) @@ -207,7 +205,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedBytesMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT RepeatedBytesMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QByteArrayList testRepeatedBytes READ testRepeatedBytes WRITE setTestRepeatedBytes SCRIPTABLE true) @@ -250,7 +247,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedFloatMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT RepeatedFloatMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::floatList testRepeatedFloat READ testRepeatedFloat WRITE setTestRepeatedFloat SCRIPTABLE true) @@ -293,7 +289,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedComplexMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT RepeatedComplexMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::ComplexMessageRepeated testRepeatedComplexData READ testRepeatedComplex WRITE setTestRepeatedComplex SCRIPTABLE true) @@ -336,7 +331,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedSIntMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT RepeatedSIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -379,7 +373,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedIntMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT RepeatedIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -422,7 +415,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedUIntMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT RepeatedUIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::uint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -465,7 +457,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedSInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT RepeatedSInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -508,7 +499,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT RepeatedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -551,7 +541,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedUInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT RepeatedUInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::uint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -594,7 +583,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedFixedIntMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT RepeatedFixedIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::fixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -637,7 +625,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedSFixedIntMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT RepeatedSFixedIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sfixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -680,7 +667,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedFixedInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT RepeatedFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::fixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -723,7 +709,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedSFixedInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT RepeatedSFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sfixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -766,7 +751,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedBoolMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_GEN_EXPORT RepeatedBoolMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::boolList testRepeatedBool READ testRepeatedBool WRITE setTestRepeatedBool SCRIPTABLE true) diff --git a/tests/auto/protobufgen/data/expected_result/no-exports/basicmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/no-exports/basicmessages.qpb.h index 00ffa37b..38c98d36 100644 --- a/tests/auto/protobufgen/data/expected_result/no-exports/basicmessages.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/no-exports/basicmessages.qpb.h @@ -125,7 +125,6 @@ enum class QtProtobufFieldEnum; class EmptyMessage_QtProtobufData; class EmptyMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT public: @@ -158,7 +157,6 @@ Q_NAMESPACE class SimpleBoolMessage_QtProtobufData; class SimpleBoolMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(bool testFieldBool READ testFieldBool WRITE setTestFieldBool SCRIPTABLE true) @@ -200,7 +198,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleIntMessage_QtProtobufData; class SimpleIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -242,7 +239,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSIntMessage_QtProtobufData; class SimpleSIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -284,7 +280,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUIntMessage_QtProtobufData; class SimpleUIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::uint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -326,7 +321,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64Message_QtProtobufData; class SimpleInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false) @@ -368,7 +362,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64Message_QtProtobufData; class SimpleSInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false) @@ -410,7 +403,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64Message_QtProtobufData; class SimpleUInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::uint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -452,7 +444,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringMessage_QtProtobufData; class SimpleStringMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true) @@ -494,7 +485,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFloatMessage_QtProtobufData; class SimpleFloatMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(float testFieldFloat READ testFieldFloat WRITE setTestFieldFloat SCRIPTABLE true) @@ -536,7 +526,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleDoubleMessage_QtProtobufData; class SimpleDoubleMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(double testFieldDouble READ testFieldDouble WRITE setTestFieldDouble SCRIPTABLE true) @@ -578,7 +567,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleBytesMessage_QtProtobufData; class SimpleBytesMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QByteArray testFieldBytes READ testFieldBytes WRITE setTestFieldBytes SCRIPTABLE true) @@ -620,7 +608,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixedInt32Message_QtProtobufData; class SimpleFixedInt32Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::fixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true) @@ -662,7 +649,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixedInt64Message_QtProtobufData; class SimpleFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::fixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false) @@ -704,7 +690,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixedInt32Message_QtProtobufData; class SimpleSFixedInt32Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sfixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true) @@ -746,7 +731,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixedInt64Message_QtProtobufData; class SimpleSFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sfixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false) @@ -788,7 +772,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class ComplexMessage_QtProtobufData; class ComplexMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringMessage *testComplexField_p READ testComplexField_p WRITE setTestComplexField_p SCRIPTABLE false) diff --git a/tests/auto/protobufgen/data/expected_result/no-options/annotation.qpb.h b/tests/auto/protobufgen/data/expected_result/no-options/annotation.qpb.h index e9c13efd..41285b44 100644 --- a/tests/auto/protobufgen/data/expected_result/no-options/annotation.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/no-options/annotation.qpb.h @@ -77,7 +77,6 @@ enum class QtProtobufFieldEnum; class AnnotatedMessage1_QtProtobufData; class AnnotatedMessage1 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -119,7 +118,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class AnnotatedMessage2_QtProtobufData; class AnnotatedMessage2 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -161,7 +159,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class AnnotatedMessage3_QtProtobufData; class AnnotatedMessage3 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -203,7 +200,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class AnnotatedMessage4_QtProtobufData; class AnnotatedMessage4 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -245,7 +241,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class AnnotatedMessage5_QtProtobufData; class AnnotatedMessage5 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -287,7 +282,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class AnnotatedMessage6_QtProtobufData; class AnnotatedMessage6 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -329,7 +323,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class AnnotatedMessage7_QtProtobufData; class AnnotatedMessage7 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -371,7 +364,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class AnnotatedMessage8_QtProtobufData; class AnnotatedMessage8 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -413,7 +405,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class AnnotatedMessage9_QtProtobufData; class AnnotatedMessage9 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) diff --git a/tests/auto/protobufgen/data/expected_result/no-options/anymessages.qpb.h b/tests/auto/protobufgen/data/expected_result/no-options/anymessages.qpb.h index 64a5c018..ea2ea7bc 100644 --- a/tests/auto/protobufgen/data/expected_result/no-options/anymessages.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/no-options/anymessages.qpb.h @@ -54,7 +54,6 @@ enum class QtProtobufFieldEnum; class AnyMessage_QtProtobufData; class AnyMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::Any field READ field WRITE setField SCRIPTABLE true) @@ -96,7 +95,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedAnyMessage_QtProtobufData; class RepeatedAnyMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QList anysData READ anys WRITE setAnys SCRIPTABLE true) @@ -139,7 +137,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class TwoAnyMessage_QtProtobufData; class TwoAnyMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::Any one READ one WRITE setOne SCRIPTABLE true) Q_PROPERTY(QtProtobuf::Any two READ two WRITE setTwo SCRIPTABLE true) @@ -186,7 +183,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class Example_QtProtobufData; class Example : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QString str READ str WRITE setStr SCRIPTABLE true) Q_PROPERTY(QtProtobuf::sint32 i READ i WRITE setI SCRIPTABLE true) @@ -248,7 +244,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleMessage_QtProtobufData; class SimpleMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32 i READ i WRITE setI SCRIPTABLE true) diff --git a/tests/auto/protobufgen/data/expected_result/no-options/basicmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/no-options/basicmessages.qpb.h index 00ffa37b..38c98d36 100644 --- a/tests/auto/protobufgen/data/expected_result/no-options/basicmessages.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/no-options/basicmessages.qpb.h @@ -125,7 +125,6 @@ enum class QtProtobufFieldEnum; class EmptyMessage_QtProtobufData; class EmptyMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT public: @@ -158,7 +157,6 @@ Q_NAMESPACE class SimpleBoolMessage_QtProtobufData; class SimpleBoolMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(bool testFieldBool READ testFieldBool WRITE setTestFieldBool SCRIPTABLE true) @@ -200,7 +198,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleIntMessage_QtProtobufData; class SimpleIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -242,7 +239,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSIntMessage_QtProtobufData; class SimpleSIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -284,7 +280,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUIntMessage_QtProtobufData; class SimpleUIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::uint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -326,7 +321,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64Message_QtProtobufData; class SimpleInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false) @@ -368,7 +362,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64Message_QtProtobufData; class SimpleSInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false) @@ -410,7 +403,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64Message_QtProtobufData; class SimpleUInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::uint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -452,7 +444,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringMessage_QtProtobufData; class SimpleStringMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true) @@ -494,7 +485,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFloatMessage_QtProtobufData; class SimpleFloatMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(float testFieldFloat READ testFieldFloat WRITE setTestFieldFloat SCRIPTABLE true) @@ -536,7 +526,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleDoubleMessage_QtProtobufData; class SimpleDoubleMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(double testFieldDouble READ testFieldDouble WRITE setTestFieldDouble SCRIPTABLE true) @@ -578,7 +567,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleBytesMessage_QtProtobufData; class SimpleBytesMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QByteArray testFieldBytes READ testFieldBytes WRITE setTestFieldBytes SCRIPTABLE true) @@ -620,7 +608,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixedInt32Message_QtProtobufData; class SimpleFixedInt32Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::fixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true) @@ -662,7 +649,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixedInt64Message_QtProtobufData; class SimpleFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::fixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false) @@ -704,7 +690,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixedInt32Message_QtProtobufData; class SimpleSFixedInt32Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sfixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true) @@ -746,7 +731,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixedInt64Message_QtProtobufData; class SimpleSFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sfixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false) @@ -788,7 +772,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class ComplexMessage_QtProtobufData; class ComplexMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringMessage *testComplexField_p READ testComplexField_p WRITE setTestComplexField_p SCRIPTABLE false) diff --git a/tests/auto/protobufgen/data/expected_result/no-options/extranamespace.qpb.h b/tests/auto/protobufgen/data/expected_result/no-options/extranamespace.qpb.h index 48885e1c..834ca74e 100644 --- a/tests/auto/protobufgen/data/expected_result/no-options/extranamespace.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/no-options/extranamespace.qpb.h @@ -41,7 +41,6 @@ enum class QtProtobufFieldEnum; class EmptyMessage_QtProtobufData; class EmptyMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT public: @@ -74,7 +73,6 @@ Q_NAMESPACE class SimpleStringMessage_QtProtobufData; class SimpleStringMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true) @@ -116,7 +114,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class ComplexMessage_QtProtobufData; class ComplexMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringMessage *testComplexField_p READ testComplexField_p WRITE setTestComplexField_p SCRIPTABLE false) diff --git a/tests/auto/protobufgen/data/expected_result/no-options/fieldindexrange.qpb.h b/tests/auto/protobufgen/data/expected_result/no-options/fieldindexrange.qpb.h index 921d1089..eb959278 100644 --- a/tests/auto/protobufgen/data/expected_result/no-options/fieldindexrange.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/no-options/fieldindexrange.qpb.h @@ -47,7 +47,6 @@ enum class QtProtobufFieldEnum; class FieldIndexTest1Message_QtProtobufData; class FieldIndexTest1Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -89,7 +88,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class FieldIndexTest2Message_QtProtobufData; class FieldIndexTest2Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -131,7 +129,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class FieldIndexTest3Message_QtProtobufData; class FieldIndexTest3Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) @@ -173,7 +170,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class FieldIndexTest4Message_QtProtobufData; class FieldIndexTest4Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) diff --git a/tests/auto/protobufgen/data/expected_result/no-options/mapmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/no-options/mapmessages.qpb.h index d7474418..cbbbabd4 100644 --- a/tests/auto/protobufgen/data/expected_result/no-options/mapmessages.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/no-options/mapmessages.qpb.h @@ -552,7 +552,6 @@ enum class QtProtobufFieldEnum; class SimpleSInt32StringMapMessage_QtProtobufData; class SimpleSInt32StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -596,7 +595,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64StringMapMessage_QtProtobufData; class SimpleSInt64StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -640,7 +638,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt32StringMapMessage_QtProtobufData; class SimpleInt32StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -684,7 +681,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64StringMapMessage_QtProtobufData; class SimpleInt64StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -728,7 +724,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt32StringMapMessage_QtProtobufData; class SimpleUInt32StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -772,7 +767,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64StringMapMessage_QtProtobufData; class SimpleUInt64StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -816,7 +810,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed32StringMapMessage_QtProtobufData; class SimpleFixed32StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -860,7 +853,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed64StringMapMessage_QtProtobufData; class SimpleFixed64StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -904,7 +896,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed32StringMapMessage_QtProtobufData; class SimpleSFixed32StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -948,7 +939,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed64StringMapMessage_QtProtobufData; class SimpleSFixed64StringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -992,7 +982,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringStringMapMessage_QtProtobufData; class SimpleStringStringMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringStringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1036,7 +1025,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt32SInt32MapMessage_QtProtobufData; class SimpleSInt32SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1080,7 +1068,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64SInt32MapMessage_QtProtobufData; class SimpleSInt64SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1124,7 +1111,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt32SInt32MapMessage_QtProtobufData; class SimpleInt32SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1168,7 +1154,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64SInt32MapMessage_QtProtobufData; class SimpleInt64SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1212,7 +1197,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt32SInt32MapMessage_QtProtobufData; class SimpleUInt32SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1256,7 +1240,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64SInt32MapMessage_QtProtobufData; class SimpleUInt64SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1300,7 +1283,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed32SInt32MapMessage_QtProtobufData; class SimpleFixed32SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1344,7 +1326,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed64SInt32MapMessage_QtProtobufData; class SimpleFixed64SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1388,7 +1369,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed32SInt32MapMessage_QtProtobufData; class SimpleSFixed32SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1432,7 +1412,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed64SInt32MapMessage_QtProtobufData; class SimpleSFixed64SInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1476,7 +1455,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringSInt32MapMessage_QtProtobufData; class SimpleStringSInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringSInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1520,7 +1498,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt32SInt64MapMessage_QtProtobufData; class SimpleSInt32SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1564,7 +1541,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64SInt64MapMessage_QtProtobufData; class SimpleSInt64SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1608,7 +1584,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt32SInt64MapMessage_QtProtobufData; class SimpleInt32SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1652,7 +1627,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64SInt64MapMessage_QtProtobufData; class SimpleInt64SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1696,7 +1670,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt32SInt64MapMessage_QtProtobufData; class SimpleUInt32SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1740,7 +1713,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64SInt64MapMessage_QtProtobufData; class SimpleUInt64SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1784,7 +1756,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed32SInt64MapMessage_QtProtobufData; class SimpleFixed32SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1828,7 +1799,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed64SInt64MapMessage_QtProtobufData; class SimpleFixed64SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1872,7 +1842,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed32SInt64MapMessage_QtProtobufData; class SimpleSFixed32SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1916,7 +1885,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed64SInt64MapMessage_QtProtobufData; class SimpleSFixed64SInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -1960,7 +1928,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringSInt64MapMessage_QtProtobufData; class SimpleStringSInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringSInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2004,7 +1971,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt32UInt32MapMessage_QtProtobufData; class SimpleSInt32UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2048,7 +2014,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64UInt32MapMessage_QtProtobufData; class SimpleSInt64UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2092,7 +2057,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt32UInt32MapMessage_QtProtobufData; class SimpleInt32UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2136,7 +2100,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64UInt32MapMessage_QtProtobufData; class SimpleInt64UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2180,7 +2143,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt32UInt32MapMessage_QtProtobufData; class SimpleUInt32UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2224,7 +2186,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64UInt32MapMessage_QtProtobufData; class SimpleUInt64UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2268,7 +2229,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed32UInt32MapMessage_QtProtobufData; class SimpleFixed32UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2312,7 +2272,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed64UInt32MapMessage_QtProtobufData; class SimpleFixed64UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2356,7 +2315,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed32UInt32MapMessage_QtProtobufData; class SimpleSFixed32UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2400,7 +2358,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed64UInt32MapMessage_QtProtobufData; class SimpleSFixed64UInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2444,7 +2401,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringUInt32MapMessage_QtProtobufData; class SimpleStringUInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringUInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2488,7 +2444,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt32UInt64MapMessage_QtProtobufData; class SimpleSInt32UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2532,7 +2487,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64UInt64MapMessage_QtProtobufData; class SimpleSInt64UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2576,7 +2530,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt32UInt64MapMessage_QtProtobufData; class SimpleInt32UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2620,7 +2573,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64UInt64MapMessage_QtProtobufData; class SimpleInt64UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2664,7 +2616,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt32UInt64MapMessage_QtProtobufData; class SimpleUInt32UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2708,7 +2659,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64UInt64MapMessage_QtProtobufData; class SimpleUInt64UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2752,7 +2702,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed32UInt64MapMessage_QtProtobufData; class SimpleFixed32UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2796,7 +2745,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed64UInt64MapMessage_QtProtobufData; class SimpleFixed64UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2840,7 +2788,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed32UInt64MapMessage_QtProtobufData; class SimpleSFixed32UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2884,7 +2831,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed64UInt64MapMessage_QtProtobufData; class SimpleSFixed64UInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2928,7 +2874,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringUInt64MapMessage_QtProtobufData; class SimpleStringUInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringUInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -2972,7 +2917,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt32Int32MapMessage_QtProtobufData; class SimpleSInt32Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3016,7 +2960,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64Int32MapMessage_QtProtobufData; class SimpleSInt64Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3060,7 +3003,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt32Int32MapMessage_QtProtobufData; class SimpleInt32Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3104,7 +3046,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64Int32MapMessage_QtProtobufData; class SimpleInt64Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3148,7 +3089,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt32Int32MapMessage_QtProtobufData; class SimpleUInt32Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3192,7 +3132,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64Int32MapMessage_QtProtobufData; class SimpleUInt64Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3236,7 +3175,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed32Int32MapMessage_QtProtobufData; class SimpleFixed32Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3280,7 +3218,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed64Int32MapMessage_QtProtobufData; class SimpleFixed64Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3324,7 +3261,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed32Int32MapMessage_QtProtobufData; class SimpleSFixed32Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3368,7 +3304,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed64Int32MapMessage_QtProtobufData; class SimpleSFixed64Int32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3412,7 +3347,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringInt32MapMessage_QtProtobufData; class SimpleStringInt32MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3456,7 +3390,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt32Int64MapMessage_QtProtobufData; class SimpleSInt32Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3500,7 +3433,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64Int64MapMessage_QtProtobufData; class SimpleSInt64Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3544,7 +3476,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt32Int64MapMessage_QtProtobufData; class SimpleInt32Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3588,7 +3519,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64Int64MapMessage_QtProtobufData; class SimpleInt64Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3632,7 +3562,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt32Int64MapMessage_QtProtobufData; class SimpleUInt32Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3676,7 +3605,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64Int64MapMessage_QtProtobufData; class SimpleUInt64Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3720,7 +3648,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed32Int64MapMessage_QtProtobufData; class SimpleFixed32Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3764,7 +3691,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed64Int64MapMessage_QtProtobufData; class SimpleFixed64Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3808,7 +3734,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed32Int64MapMessage_QtProtobufData; class SimpleSFixed32Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3852,7 +3777,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed64Int64MapMessage_QtProtobufData; class SimpleSFixed64Int64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3896,7 +3820,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringInt64MapMessage_QtProtobufData; class SimpleStringInt64MapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3940,7 +3863,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt32ComplexMessageMapMessage_QtProtobufData; class SimpleSInt32ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -3984,7 +3906,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64ComplexMessageMapMessage_QtProtobufData; class SimpleSInt64ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4028,7 +3949,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt32ComplexMessageMapMessage_QtProtobufData; class SimpleInt32ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4072,7 +3992,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64ComplexMessageMapMessage_QtProtobufData; class SimpleInt64ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4116,7 +4035,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt32ComplexMessageMapMessage_QtProtobufData; class SimpleUInt32ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4160,7 +4078,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64ComplexMessageMapMessage_QtProtobufData; class SimpleUInt64ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4204,7 +4121,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed32ComplexMessageMapMessage_QtProtobufData; class SimpleFixed32ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4248,7 +4164,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixed64ComplexMessageMapMessage_QtProtobufData; class SimpleFixed64ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4292,7 +4207,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed32ComplexMessageMapMessage_QtProtobufData; class SimpleSFixed32ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4336,7 +4250,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixed64ComplexMessageMapMessage_QtProtobufData; class SimpleSFixed64ComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) @@ -4380,7 +4293,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringComplexMessageMapMessage_QtProtobufData; class SimpleStringComplexMessageMapMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true) diff --git a/tests/auto/protobufgen/data/expected_result/no-options/oneofmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/no-options/oneofmessages.qpb.h index 121869a7..cdeb084f 100644 --- a/tests/auto/protobufgen/data/expected_result/no-options/oneofmessages.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/no-options/oneofmessages.qpb.h @@ -40,7 +40,6 @@ enum class SecondOneofFields; class OneofSimpleMessage_QtProtobufData; class OneofSimpleMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32 testOneofFieldInt READ testOneofFieldInt_p WRITE setTestOneofFieldInt_p) Q_PROPERTY(bool hasTestOneofFieldInt READ hasTestOneofFieldInt) @@ -105,7 +104,6 @@ Q_ENUM_NS(TestOneofFields) class OneofComplexMessage_QtProtobufData; class OneofComplexMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) Q_PROPERTY(QtProtobuf::int32 testOneofFieldInt READ testOneofFieldInt_p WRITE setTestOneofFieldInt_p) diff --git a/tests/auto/protobufgen/data/expected_result/no-options/optional.qpb.h b/tests/auto/protobufgen/data/expected_result/no-options/optional.qpb.h index cb3b7aab..7bc0fbf4 100644 --- a/tests/auto/protobufgen/data/expected_result/no-options/optional.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/no-options/optional.qpb.h @@ -37,7 +37,6 @@ enum class QtProtobufFieldEnum; class TestStringMessage_QtProtobufData; class TestStringMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QString stringField READ stringField WRITE setStringField SCRIPTABLE true) @@ -79,7 +78,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class OptionalMessage_QtProtobufData; class OptionalMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true) Q_PROPERTY(QtProtobuf::sint32 testFieldOpt READ testFieldOpt_p WRITE setTestFieldOpt_p) diff --git a/tests/auto/protobufgen/data/expected_result/no-options/repeatedmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/no-options/repeatedmessages.qpb.h index d19a23a9..467fed72 100644 --- a/tests/auto/protobufgen/data/expected_result/no-options/repeatedmessages.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/no-options/repeatedmessages.qpb.h @@ -120,7 +120,6 @@ enum class QtProtobufFieldEnum; class RepeatedStringMessage_QtProtobufData; class RepeatedStringMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QStringList testRepeatedString READ testRepeatedString WRITE setTestRepeatedString SCRIPTABLE true) @@ -163,7 +162,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedDoubleMessage_QtProtobufData; class RepeatedDoubleMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::doubleList testRepeatedDouble READ testRepeatedDouble WRITE setTestRepeatedDouble SCRIPTABLE true) @@ -206,7 +204,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedBytesMessage_QtProtobufData; class RepeatedBytesMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QByteArrayList testRepeatedBytes READ testRepeatedBytes WRITE setTestRepeatedBytes SCRIPTABLE true) @@ -249,7 +246,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedFloatMessage_QtProtobufData; class RepeatedFloatMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::floatList testRepeatedFloat READ testRepeatedFloat WRITE setTestRepeatedFloat SCRIPTABLE true) @@ -292,7 +288,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedComplexMessage_QtProtobufData; class RepeatedComplexMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(qtprotobufnamespace::tests::ComplexMessageRepeated testRepeatedComplexData READ testRepeatedComplex WRITE setTestRepeatedComplex SCRIPTABLE true) @@ -335,7 +330,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedSIntMessage_QtProtobufData; class RepeatedSIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -378,7 +372,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedIntMessage_QtProtobufData; class RepeatedIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -421,7 +414,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedUIntMessage_QtProtobufData; class RepeatedUIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::uint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -464,7 +456,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedSInt64Message_QtProtobufData; class RepeatedSInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -507,7 +498,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedInt64Message_QtProtobufData; class RepeatedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -550,7 +540,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedUInt64Message_QtProtobufData; class RepeatedUInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::uint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -593,7 +582,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedFixedIntMessage_QtProtobufData; class RepeatedFixedIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::fixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -636,7 +624,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedSFixedIntMessage_QtProtobufData; class RepeatedSFixedIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sfixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -679,7 +666,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedFixedInt64Message_QtProtobufData; class RepeatedFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::fixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -722,7 +708,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedSFixedInt64Message_QtProtobufData; class RepeatedSFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sfixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -765,7 +750,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedBoolMessage_QtProtobufData; class RepeatedBoolMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::boolList testRepeatedBool READ testRepeatedBool WRITE setTestRepeatedBool SCRIPTABLE true) diff --git a/tests/auto/protobufgen/data/expected_result/no-options/repeatednonpackedmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/no-options/repeatednonpackedmessages.qpb.h index e3bf4bd2..3c552f3a 100644 --- a/tests/auto/protobufgen/data/expected_result/no-options/repeatednonpackedmessages.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/no-options/repeatednonpackedmessages.qpb.h @@ -107,7 +107,6 @@ enum class QtProtobufFieldEnum; class RepeatedNonPackedIntMessage_QtProtobufData; class RepeatedNonPackedIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -150,7 +149,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedSIntMessage_QtProtobufData; class RepeatedNonPackedSIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -193,7 +191,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedUIntMessage_QtProtobufData; class RepeatedNonPackedUIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::uint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -236,7 +233,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedInt64Message_QtProtobufData; class RepeatedNonPackedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -279,7 +275,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedSInt64Message_QtProtobufData; class RepeatedNonPackedSInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -322,7 +317,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedUInt64Message_QtProtobufData; class RepeatedNonPackedUInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::uint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -365,7 +359,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedFixedIntMessage_QtProtobufData; class RepeatedNonPackedFixedIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::fixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -408,7 +401,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedSFixedIntMessage_QtProtobufData; class RepeatedNonPackedSFixedIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sfixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -451,7 +443,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedFixedInt64Message_QtProtobufData; class RepeatedNonPackedFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::fixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -494,7 +485,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedSFixedInt64Message_QtProtobufData; class RepeatedNonPackedSFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sfixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -537,7 +527,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedBoolMessage_QtProtobufData; class RepeatedNonPackedBoolMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::boolList testRepeatedBool READ testRepeatedBool WRITE setTestRepeatedBool SCRIPTABLE true) @@ -580,7 +569,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedDoubleMessage_QtProtobufData; class RepeatedNonPackedDoubleMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::doubleList testRepeatedDouble READ testRepeatedDouble WRITE setTestRepeatedDouble SCRIPTABLE true) @@ -623,7 +611,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedFloatMessage_QtProtobufData; class RepeatedNonPackedFloatMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::floatList testRepeatedFloat READ testRepeatedFloat WRITE setTestRepeatedFloat SCRIPTABLE true) @@ -666,7 +653,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class NonPackedIntMessageWithExtraMember_QtProtobufData; class NonPackedIntMessageWithExtraMember : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) Q_PROPERTY(QString extra READ extra WRITE setExtra SCRIPTABLE true) diff --git a/tests/auto/protobufgen/data/expected_result/packed/repeatednonpackedmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/packed/repeatednonpackedmessages.qpb.h index e3bf4bd2..3c552f3a 100644 --- a/tests/auto/protobufgen/data/expected_result/packed/repeatednonpackedmessages.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/packed/repeatednonpackedmessages.qpb.h @@ -107,7 +107,6 @@ enum class QtProtobufFieldEnum; class RepeatedNonPackedIntMessage_QtProtobufData; class RepeatedNonPackedIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -150,7 +149,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedSIntMessage_QtProtobufData; class RepeatedNonPackedSIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -193,7 +191,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedUIntMessage_QtProtobufData; class RepeatedNonPackedUIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::uint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -236,7 +233,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedInt64Message_QtProtobufData; class RepeatedNonPackedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -279,7 +275,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedSInt64Message_QtProtobufData; class RepeatedNonPackedSInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -322,7 +317,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedUInt64Message_QtProtobufData; class RepeatedNonPackedUInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::uint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -365,7 +359,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedFixedIntMessage_QtProtobufData; class RepeatedNonPackedFixedIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::fixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -408,7 +401,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedSFixedIntMessage_QtProtobufData; class RepeatedNonPackedSFixedIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sfixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -451,7 +443,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedFixedInt64Message_QtProtobufData; class RepeatedNonPackedFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::fixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -494,7 +485,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedSFixedInt64Message_QtProtobufData; class RepeatedNonPackedSFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::sfixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -537,7 +527,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedBoolMessage_QtProtobufData; class RepeatedNonPackedBoolMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::boolList testRepeatedBool READ testRepeatedBool WRITE setTestRepeatedBool SCRIPTABLE true) @@ -580,7 +569,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedDoubleMessage_QtProtobufData; class RepeatedNonPackedDoubleMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::doubleList testRepeatedDouble READ testRepeatedDouble WRITE setTestRepeatedDouble SCRIPTABLE true) @@ -623,7 +611,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedNonPackedFloatMessage_QtProtobufData; class RepeatedNonPackedFloatMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::floatList testRepeatedFloat READ testRepeatedFloat WRITE setTestRepeatedFloat SCRIPTABLE true) @@ -666,7 +653,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class NonPackedIntMessageWithExtraMember_QtProtobufData; class NonPackedIntMessageWithExtraMember : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT Q_PROPERTY(QtProtobuf::int32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) Q_PROPERTY(QString extra READ extra WRITE setExtra SCRIPTABLE true) diff --git a/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.h b/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.h index 2f59a1dd..f607c493 100644 --- a/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.h @@ -67,7 +67,6 @@ enum class QtProtobufFieldEnum; class EmptyMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT EmptyMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(emptyMessage) @@ -102,7 +101,6 @@ QML_NAMED_ELEMENT(EmptyMessage) class SimpleIntMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT SimpleIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleIntMessage) Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -146,7 +144,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class NoPackageExternalMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT NoPackageExternalMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(noPackageExternalMessage) Q_PROPERTY(SimpleIntMessageExt *testField_p READ testField_p WRITE setTestField_p SCRIPTABLE false) @@ -196,7 +193,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class NoPackageMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT NoPackageMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(noPackageMessage) Q_PROPERTY(SimpleIntMessage *testField_p READ testField_p WRITE setTestField_p SCRIPTABLE false) diff --git a/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackageexternal.qpb.h b/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackageexternal.qpb.h index c553afe6..7550f2d1 100644 --- a/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackageexternal.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackageexternal.qpb.h @@ -32,7 +32,6 @@ enum class QtProtobufFieldEnum; class SimpleIntMessageExt_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT SimpleIntMessageExt : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleIntMessageExt) Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) diff --git a/tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.h index 6db2645b..3ea14961 100644 --- a/tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.h @@ -129,7 +129,6 @@ enum class QtProtobufFieldEnum; class EmptyMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT EmptyMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(emptyMessage) @@ -164,7 +163,6 @@ QML_NAMED_ELEMENT(EmptyMessage) class SimpleBoolMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleBoolMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleBoolMessage) Q_PROPERTY(bool testFieldBool READ testFieldBool WRITE setTestFieldBool SCRIPTABLE true) @@ -208,7 +206,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleIntMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleIntMessage) Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -252,7 +249,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSIntMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleSIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleSIntMessage) Q_PROPERTY(QtProtobuf::sint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -296,7 +292,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUIntMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleUIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleUIntMessage) Q_PROPERTY(QtProtobuf::uint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -340,7 +335,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleInt64Message) Q_PROPERTY(QtProtobuf::int64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false) @@ -384,7 +378,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleSInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleSInt64Message) Q_PROPERTY(QtProtobuf::sint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false) @@ -428,7 +421,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleUInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleUInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleUInt64Message) Q_PROPERTY(QtProtobuf::uint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) @@ -472,7 +464,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleStringMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleStringMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleStringMessage) Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true) @@ -516,7 +507,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFloatMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleFloatMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleFloatMessage) Q_PROPERTY(float testFieldFloat READ testFieldFloat WRITE setTestFieldFloat SCRIPTABLE true) @@ -560,7 +550,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleDoubleMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleDoubleMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleDoubleMessage) Q_PROPERTY(double testFieldDouble READ testFieldDouble WRITE setTestFieldDouble SCRIPTABLE true) @@ -604,7 +593,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleBytesMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleBytesMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleBytesMessage) Q_PROPERTY(QByteArray testFieldBytes READ testFieldBytes WRITE setTestFieldBytes SCRIPTABLE true) @@ -648,7 +636,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixedInt32Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleFixedInt32Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleFixedInt32Message) Q_PROPERTY(QtProtobuf::fixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true) @@ -692,7 +679,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFixedInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleFixedInt64Message) Q_PROPERTY(QtProtobuf::fixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false) @@ -736,7 +722,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixedInt32Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleSFixedInt32Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleSFixedInt32Message) Q_PROPERTY(QtProtobuf::sfixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true) @@ -780,7 +765,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleSFixedInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleSFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleSFixedInt64Message) Q_PROPERTY(QtProtobuf::sfixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false) @@ -824,7 +808,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class ComplexMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT ComplexMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(complexMessage) Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) diff --git a/tests/auto/protobufgen/data/expected_result/qmlgen/enummessages.qpb.h b/tests/auto/protobufgen/data/expected_result/qmlgen/enummessages.qpb.h index db80f62b..0162f90a 100644 --- a/tests/auto/protobufgen/data/expected_result/qmlgen/enummessages.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/qmlgen/enummessages.qpb.h @@ -141,7 +141,6 @@ using BEnumRepeated = QList; class SimpleEnumMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleEnumMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleEnumMessage) Q_PROPERTY(LocalEnum localEnum READ localEnum WRITE setLocalEnum SCRIPTABLE true) @@ -196,7 +195,6 @@ using LocalEnumRepeated = QList; class RepeatedEnumMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedEnumMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(repeatedEnumMessage) Q_PROPERTY(qtprotobufnamespace::tests::RepeatedEnumMessage::LocalEnumRepeated localEnumList READ localEnumList WRITE setLocalEnumList SCRIPTABLE true) @@ -252,7 +250,6 @@ using LocalEnumRepeated = QList; class MixedEnumUsageMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT MixedEnumUsageMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(mixedEnumUsageMessage) Q_PROPERTY(LocalEnum localEnum READ localEnum WRITE setLocalEnum SCRIPTABLE true) @@ -331,7 +328,6 @@ using LocalEnumRepeated = QList; class NestedEnumHolder_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT NestedEnumHolder : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(nestedEnumHolder) @@ -377,7 +373,6 @@ using LocalEnumRepeated = QList; class NestedEnumHolderLevel1_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT NestedEnumHolderLevel1 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(nestedEnumHolderLevel1) @@ -422,7 +417,6 @@ using LocalEnumRepeated = QList; class NestedEnumHolderLevel2_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT NestedEnumHolderLevel2 : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(nestedEnumHolderLevel2) @@ -467,7 +461,6 @@ using LocalEnumRepeated = QList; class NestedEnumMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT NestedEnumMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(nestedEnumMessage) Q_PROPERTY(qtprotobufnamespace::tests::MixedEnumUsageMessage::LocalEnum localEnumField READ localEnumField WRITE setLocalEnumField SCRIPTABLE true) @@ -532,7 +525,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class SimpleFileEnumMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleFileEnumMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(simpleFileEnumMessage) Q_PROPERTY(qtprotobufnamespace::tests::TestEnumGadget::TestEnum globalEnum READ globalEnum WRITE setGlobalEnum SCRIPTABLE true) @@ -582,7 +574,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class StepChildEnumMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT StepChildEnumMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(stepChildEnumMessage) Q_PROPERTY(qtprotobufnamespace::tests::SimpleEnumMessage::LocalEnum localStepChildEnum READ localStepChildEnum WRITE setLocalStepChildEnum SCRIPTABLE true) @@ -632,7 +623,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class A_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT A : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(a) Q_PROPERTY(qtprotobufnamespace::tests::B::BEnum val READ val WRITE setVal SCRIPTABLE true) @@ -685,7 +675,6 @@ using AEnumRepeated = QList; class B_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT B : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(b) Q_PROPERTY(qtprotobufnamespace::tests::A::AEnum val READ val WRITE setVal SCRIPTABLE true) diff --git a/tests/auto/protobufgen/data/expected_result/qmlgen/oneofmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/qmlgen/oneofmessages.qpb.h index 28f44531..c9624f0d 100644 --- a/tests/auto/protobufgen/data/expected_result/qmlgen/oneofmessages.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/qmlgen/oneofmessages.qpb.h @@ -44,7 +44,6 @@ enum class SecondOneofFields; class OneofSimpleMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT OneofSimpleMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(oneofSimpleMessage) Q_PROPERTY(QtProtobuf::int32 testOneofFieldInt READ testOneofFieldInt_p WRITE setTestOneofFieldInt_p) @@ -111,7 +110,6 @@ Q_ENUM_NS(TestOneofFields) class OneofComplexMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT OneofComplexMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(oneofComplexMessage) Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true) diff --git a/tests/auto/protobufgen/data/expected_result/qmlgen/repeatedmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/qmlgen/repeatedmessages.qpb.h index 7971c3ac..14d15aa2 100644 --- a/tests/auto/protobufgen/data/expected_result/qmlgen/repeatedmessages.qpb.h +++ b/tests/auto/protobufgen/data/expected_result/qmlgen/repeatedmessages.qpb.h @@ -124,7 +124,6 @@ enum class QtProtobufFieldEnum; class RepeatedStringMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedStringMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(repeatedStringMessage) Q_PROPERTY(QStringList testRepeatedString READ testRepeatedString WRITE setTestRepeatedString SCRIPTABLE true) @@ -169,7 +168,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedDoubleMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedDoubleMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(repeatedDoubleMessage) Q_PROPERTY(QtProtobuf::doubleList testRepeatedDouble READ testRepeatedDouble WRITE setTestRepeatedDouble SCRIPTABLE true) @@ -214,7 +212,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedBytesMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedBytesMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(repeatedBytesMessage) Q_PROPERTY(QByteArrayList testRepeatedBytes READ testRepeatedBytes WRITE setTestRepeatedBytes SCRIPTABLE true) @@ -259,7 +256,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedFloatMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedFloatMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(repeatedFloatMessage) Q_PROPERTY(QtProtobuf::floatList testRepeatedFloat READ testRepeatedFloat WRITE setTestRepeatedFloat SCRIPTABLE true) @@ -304,7 +300,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedComplexMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedComplexMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(repeatedComplexMessage) Q_PROPERTY(qtprotobufnamespace::tests::ComplexMessageRepeated testRepeatedComplexData READ testRepeatedComplex WRITE setTestRepeatedComplex SCRIPTABLE true) @@ -349,7 +344,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedSIntMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedSIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(repeatedSIntMessage) Q_PROPERTY(QtProtobuf::sint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -394,7 +388,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedIntMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(repeatedIntMessage) Q_PROPERTY(QtProtobuf::int32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -439,7 +432,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedUIntMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedUIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(repeatedUIntMessage) Q_PROPERTY(QtProtobuf::uint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -484,7 +476,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedSInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedSInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(repeatedSInt64Message) Q_PROPERTY(QtProtobuf::sint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -529,7 +520,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(repeatedInt64Message) Q_PROPERTY(QtProtobuf::int64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -574,7 +564,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedUInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedUInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(repeatedUInt64Message) Q_PROPERTY(QtProtobuf::uint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -619,7 +608,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedFixedIntMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedFixedIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(repeatedFixedIntMessage) Q_PROPERTY(QtProtobuf::fixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -664,7 +652,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedSFixedIntMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedSFixedIntMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(repeatedSFixedIntMessage) Q_PROPERTY(QtProtobuf::sfixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -709,7 +696,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedFixedInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(repeatedFixedInt64Message) Q_PROPERTY(QtProtobuf::fixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -754,7 +740,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedSFixedInt64Message_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedSFixedInt64Message : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(repeatedSFixedInt64Message) Q_PROPERTY(QtProtobuf::sfixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true) @@ -799,7 +784,6 @@ Q_ENUM_NS(QtProtobufFieldEnum) class RepeatedBoolMessage_QtProtobufData; class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedBoolMessage : public QProtobufMessage { - Q_GADGET Q_PROTOBUF_OBJECT QML_VALUE_TYPE(repeatedBoolMessage) Q_PROPERTY(QtProtobuf::boolList testRepeatedBool READ testRepeatedBool WRITE setTestRepeatedBool SCRIPTABLE true)