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

Remove the redundant Q_DECLARE_METATYPE for protobuf messages 

"Some types are registered automatically and do not need this macro:
  ...
  - Classes that have a Q_GADGET macro
" (c)

Pick-to: 6.8
Task-number: QTBUG-123626
Change-Id: I5c73d61a51341328d37e71290633f484a3cbdfb8
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Alexey Edelev 2024-07-21 13:33:17 +02:00
parent 77c0825e5f
commit b16b399c00
32 changed files with 0 additions and 418 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/qtprotobufgen/messagedeclarationprinter.cpp
View File

@ -187,16 +187,6 @@ void MessageDeclarationPrinter::printClassDeclarationBegin()
}
}
void MessageDeclarationPrinter::printMetaTypesDeclaration()
{
m_printer->Print(m_typeMap, CommonTemplates::DeclareMetaTypeTemplate());
common::iterateNestedMessages(m_descriptor, [&](const Descriptor *nestedMessage) {
MessageDeclarationPrinter nestedPrinter(nestedMessage, m_printer);
nestedPrinter.printMetaTypesDeclaration();
});
}
void MessageDeclarationPrinter::printProperties()
{
assert(m_descriptor != nullptr);

1
src/tools/qtprotobufgen/messagedeclarationprinter.h
View File

@ -20,7 +20,6 @@ public:
void printClassDeclaration();
void printClassForwardDeclaration();
void printMetaTypesDeclaration();
private:
void printCopyFunctionality();
void printMoveSemantic();

1
src/tools/qtprotobufgen/qprotobufgenerator.cpp
View File

@ -243,7 +243,6 @@ void QProtobufGenerator::GenerateHeader(const FileDescriptor *file,
common::iterateMessages(file, [&headerPrinter](const Descriptor *message) {
MessageDeclarationPrinter messageDef(message, headerPrinter);
messageDef.printMetaTypesDeclaration();
});
headerPrinter->Print({{"filename", fileNameToUpper}}, CommonTemplates::FooterTemplate());

3
tests/auto/grpcgen/data/expected_result/folder/qtgrpc/tests/testservice.qpb.h
View File

@ -160,7 +160,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace BlobMessage_QtProtobufNested
} // namespace qtgrpc::tests
Q_DECLARE_METATYPE(qtgrpc::tests::SimpleStringMessage)
Q_DECLARE_METATYPE(qtgrpc::tests::SimpleIntMessage)
Q_DECLARE_METATYPE(qtgrpc::tests::BlobMessage)
#endif // QPROTOBUF_TESTSERVICE_H

3
tests/auto/grpcgen/data/expected_result/separate/protobuf/qtgrpc/tests/testservice.qpb.h
View File

@ -161,7 +161,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace BlobMessage_QtProtobufNested
} // namespace qtgrpc::tests
Q_DECLARE_METATYPE(qtgrpc::tests::SimpleStringMessage)
Q_DECLARE_METATYPE(qtgrpc::tests::SimpleIntMessage)
Q_DECLARE_METATYPE(qtgrpc::tests::BlobMessage)
#endif // QPROTOBUF_TESTSERVICE_H

9
tests/auto/protobufgen/data/expected_result/comments/annotation.qpb.h
View File

@ -473,13 +473,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace AnnotatedMessage9_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage1)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage2)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage3)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage4)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage5)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage6)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage7)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage8)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage9)
#endif // QPROTOBUF_ANNOTATION_H

17
tests/auto/protobufgen/data/expected_result/custom-exports/basicmessages.qpb.h
View File

@ -820,21 +820,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace ComplexMessage_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::EmptyMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleBoolMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFloatMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleDoubleMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleBytesMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixedInt32Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixedInt32Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::ComplexMessage)
#endif // QPROTOBUF_BASICMESSAGES_H

3
tests/auto/protobufgen/data/expected_result/extra-namespace/extranamespace.qpb.h
View File

@ -161,7 +161,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace ComplexMessage_QtProtobufNested
} // namespace MyTopLevelNamespace::qtprotobufnamespace::tests
Q_DECLARE_METATYPE(MyTopLevelNamespace::qtprotobufnamespace::tests::EmptyMessage)
Q_DECLARE_METATYPE(MyTopLevelNamespace::qtprotobufnamespace::tests::SimpleStringMessage)
Q_DECLARE_METATYPE(MyTopLevelNamespace::qtprotobufnamespace::tests::ComplexMessage)
#endif // QPROTOBUF_EXTRANAMESPACE_H

4
tests/auto/protobufgen/data/expected_result/fieldenum/fieldindexrange.qpb.h
View File

@ -207,8 +207,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace FieldIndexTest4Message_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::FieldIndexTest1Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::FieldIndexTest2Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::FieldIndexTest3Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::FieldIndexTest4Message)
#endif // QPROTOBUF_FIELDINDEXRANGE_H

2
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/optional/tests/optional.qpb.h
View File

@ -191,6 +191,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace OptionalMessage_QtProtobufNested
} // namespace qtprotobufnamespace::optional::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::optional::tests::TestStringMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::optional::tests::OptionalMessage)
#endif // QPROTOBUF_OPTIONAL_H

17
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/basicmessages.qpb.h
View File

@ -820,21 +820,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace ComplexMessage_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::EmptyMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleBoolMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFloatMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleDoubleMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleBytesMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixedInt32Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixedInt32Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::ComplexMessage)
#endif // QPROTOBUF_BASICMESSAGES_H

88
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/mapmessages.qpb.h
View File

@ -4333,92 +4333,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace SimpleStringComplexMessageMapMessage_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt32StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt32StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed32StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed64StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed32StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed64StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringStringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt32SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt32SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed32SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed64SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed32SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed64SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringSInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt32SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt32SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed32SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed64SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed32SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed64SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringSInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt32UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt32UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed32UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed64UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed32UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed64UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringUInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt32UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt32UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed32UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed64UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed32UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed64UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringUInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt32Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt32Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed32Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed64Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed32Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed64Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt32Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt32Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed32Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed64Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed32Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed64Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt32ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt32ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed32ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed64ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed32ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed64ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringComplexMessageMapMessage)
#endif // QPROTOBUF_MAPMESSAGES_H

2
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/oneofmessages.qpb.h
View File

@ -228,6 +228,4 @@ Q_ENUM_NS(SecondOneofFields)
} // namespace OneofComplexMessage_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::OneofSimpleMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::OneofComplexMessage)
#endif // QPROTOBUF_ONEOFMESSAGES_H

16
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/repeatedmessages.qpb.h
View File

@ -789,20 +789,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace RepeatedBoolMessage_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedStringMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedDoubleMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedBytesMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedFloatMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedComplexMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedSIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedUIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedSInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedUInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedFixedIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedSFixedIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedSFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedBoolMessage)
#endif // QPROTOBUF_REPEATEDMESSAGES_H

17
tests/auto/protobufgen/data/expected_result/no-exports/basicmessages.qpb.h
View File

@ -819,21 +819,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace ComplexMessage_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::EmptyMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleBoolMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFloatMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleDoubleMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleBytesMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixedInt32Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixedInt32Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::ComplexMessage)
#endif // QPROTOBUF_BASICMESSAGES_H

9
tests/auto/protobufgen/data/expected_result/no-options/annotation.qpb.h
View File

@ -442,13 +442,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace AnnotatedMessage9_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage1)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage2)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage3)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage4)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage5)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage6)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage7)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage8)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage9)
#endif // QPROTOBUF_ANNOTATION_H

5
tests/auto/protobufgen/data/expected_result/no-options/anymessages.qpb.h
View File

@ -281,9 +281,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace SimpleMessage_QtProtobufNested
} // namespace qtproto::tests
Q_DECLARE_METATYPE(qtproto::tests::AnyMessage)
Q_DECLARE_METATYPE(qtproto::tests::RepeatedAnyMessage)
Q_DECLARE_METATYPE(qtproto::tests::TwoAnyMessage)
Q_DECLARE_METATYPE(qtproto::tests::Example)
Q_DECLARE_METATYPE(qtproto::tests::SimpleMessage)
#endif // QPROTOBUF_ANYMESSAGES_H

17
tests/auto/protobufgen/data/expected_result/no-options/basicmessages.qpb.h
View File

@ -819,21 +819,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace ComplexMessage_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::EmptyMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleBoolMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFloatMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleDoubleMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleBytesMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixedInt32Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixedInt32Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::ComplexMessage)
#endif // QPROTOBUF_BASICMESSAGES_H

3
tests/auto/protobufgen/data/expected_result/no-options/extranamespace.qpb.h
View File

@ -161,7 +161,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace ComplexMessage_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::EmptyMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::ComplexMessage)
#endif // QPROTOBUF_EXTRANAMESPACE_H

4
tests/auto/protobufgen/data/expected_result/no-options/fieldindexrange.qpb.h
View File

@ -207,8 +207,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace FieldIndexTest4Message_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::FieldIndexTest1Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::FieldIndexTest2Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::FieldIndexTest3Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::FieldIndexTest4Message)
#endif // QPROTOBUF_FIELDINDEXRANGE_H

88
tests/auto/protobufgen/data/expected_result/no-options/mapmessages.qpb.h
View File

@ -4332,92 +4332,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace SimpleStringComplexMessageMapMessage_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt32StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt32StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed32StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed64StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed32StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed64StringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringStringMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt32SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt32SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed32SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed64SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed32SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed64SInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringSInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt32SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt32SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed32SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed64SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed32SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed64SInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringSInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt32UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt32UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed32UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed64UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed32UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed64UInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringUInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt32UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt32UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed32UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed64UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed32UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed64UInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringUInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt32Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt32Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed32Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed64Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed32Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed64Int32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringInt32MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt32Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt32Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed32Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed64Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed32Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed64Int64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringInt64MapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt32ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt32ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed32ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixed64ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed32ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixed64ComplexMessageMapMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringComplexMessageMapMessage)
#endif // QPROTOBUF_MAPMESSAGES_H

2
tests/auto/protobufgen/data/expected_result/no-options/oneofmessages.qpb.h
View File

@ -227,6 +227,4 @@ Q_ENUM_NS(SecondOneofFields)
} // namespace OneofComplexMessage_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::OneofSimpleMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::OneofComplexMessage)
#endif // QPROTOBUF_ONEOFMESSAGES_H

2
tests/auto/protobufgen/data/expected_result/no-options/optional.qpb.h
View File

@ -190,6 +190,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace OptionalMessage_QtProtobufNested
} // namespace qtprotobufnamespace::optional::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::optional::tests::TestStringMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::optional::tests::OptionalMessage)
#endif // QPROTOBUF_OPTIONAL_H

16
tests/auto/protobufgen/data/expected_result/no-options/repeatedmessages.qpb.h
View File

@ -788,20 +788,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace RepeatedBoolMessage_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedStringMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedDoubleMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedBytesMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedFloatMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedComplexMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedSIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedUIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedSInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedUInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedFixedIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedSFixedIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedSFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedBoolMessage)
#endif // QPROTOBUF_REPEATEDMESSAGES_H

14
tests/auto/protobufgen/data/expected_result/no-options/repeatednonpackedmessages.qpb.h
View File

@ -696,18 +696,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace NonPackedIntMessageWithExtraMember_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedSIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedUIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedSInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedUInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedFixedIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedSFixedIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedSFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedBoolMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedDoubleMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedFloatMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::NonPackedIntMessageWithExtraMember)
#endif // QPROTOBUF_REPEATEDNONPACKEDMESSAGES_H

14
tests/auto/protobufgen/data/expected_result/packed/repeatednonpackedmessages.qpb.h
View File

@ -696,18 +696,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace NonPackedIntMessageWithExtraMember_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedSIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedUIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedSInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedUInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedFixedIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedSFixedIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedSFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedBoolMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedDoubleMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedFloatMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::NonPackedIntMessageWithExtraMember)
#endif // QPROTOBUF_REPEATEDNONPACKEDMESSAGES_H

4
tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.h
View File

@ -237,8 +237,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace NoPackageMessage_QtProtobufNested
Q_DECLARE_METATYPE(EmptyMessage)
Q_DECLARE_METATYPE(SimpleIntMessage)
Q_DECLARE_METATYPE(NoPackageExternalMessage)
Q_DECLARE_METATYPE(NoPackageMessage)
#endif // QPROTOBUF_NOPACKAGE_H

1
tests/auto/protobufgen/data/expected_result/qml-no-package/nopackageexternal.qpb.h
View File

@ -70,5 +70,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace SimpleIntMessageExt_QtProtobufNested
Q_DECLARE_METATYPE(SimpleIntMessageExt)
#endif // QPROTOBUF_NOPACKAGEEXTERNAL_H

17
tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.h
View File

@ -858,21 +858,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace ComplexMessage_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::EmptyMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleBoolMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleUInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleStringMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFloatMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleDoubleMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleBytesMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixedInt32Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixedInt32Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::ComplexMessage)
#endif // QPROTOBUF_BASICMESSAGES_H

11
tests/auto/protobufgen/data/expected_result/qmlgen/enummessages.qpb.h
View File

@ -723,15 +723,4 @@ using BEnumRepeated = QList<BEnum>;
} // namespace B_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleEnumMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedEnumMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::MixedEnumUsageMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::MixedEnumUsageMessage::NestedEnumHolder)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::MixedEnumUsageMessage::NestedEnumHolderLevel1)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::MixedEnumUsageMessage::NestedEnumHolderLevel1::NestedEnumHolderLevel2)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::MixedEnumUsageMessage::NestedEnumMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFileEnumMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::StepChildEnumMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::A)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::B)
#endif // QPROTOBUF_ENUMMESSAGES_H

2
tests/auto/protobufgen/data/expected_result/qmlgen/oneofmessages.qpb.h
View File

@ -239,6 +239,4 @@ Q_ENUM_NS(SecondOneofFields)
} // namespace OneofComplexMessage_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::OneofSimpleMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::OneofComplexMessage)
#endif // QPROTOBUF_ONEOFMESSAGES_H

16
tests/auto/protobufgen/data/expected_result/qmlgen/repeatedmessages.qpb.h
View File

@ -824,20 +824,4 @@ Q_ENUM_NS(QtProtobufFieldEnum)
} // namespace RepeatedBoolMessage_QtProtobufNested
} // namespace qtprotobufnamespace::tests
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedStringMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedDoubleMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedBytesMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedFloatMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedComplexMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedSIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedUIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedSInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedUInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedFixedIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedSFixedIntMessage)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedSFixedInt64Message)
Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedBoolMessage)
#endif // QPROTOBUF_REPEATEDMESSAGES_H