diff --git a/src/protobuf/doc/src/qt_add_protobuf.qdoc b/src/protobuf/doc/src/qt_add_protobuf.qdoc
index 617d14fc..d7150315 100644
--- a/src/protobuf/doc/src/qt_add_protobuf.qdoc
+++ b/src/protobuf/doc/src/qt_add_protobuf.qdoc
@@ -16,7 +16,7 @@ Usually \c{qtprotobufgen} would be invoked through \c cmake using the
 
 \badcode
     qt_add_protobuf(<target>
-        [COMMENTS] [FOLDER] [FIELD_ENUM]
+        [COMMENTS] [FOLDER]
         [OUTPUT_DIRECTORY ""]
         [EXTRA_NAMESPACE ""]
         [OUT_GENERATED_HEADERS <var>]
diff --git a/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake b/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake
index baf83327..c5adab32 100644
--- a/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake
+++ b/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake
@@ -10,7 +10,7 @@ set(__qt_protobuf_macros_module_base_dir "${CMAKE_CURRENT_LIST_DIR}" CACHE INTER
 # This function is currently in Technical Preview
 # Its signature and behavior might change.
 function(qt6_add_protobuf target)
-    set(options COMMENTS FOLDER FIELD_ENUM)
+    set(options COMMENTS FOLDER)
     set(oneValueArgs
         OUTPUT_DIRECTORY
         EXTRA_NAMESPACE
@@ -60,10 +60,6 @@ function(qt6_add_protobuf target)
         list(APPEND extra_pre_parse_options "FOLDER")
     endif()
 
-    if(arg_FIELD_ENUM)
-        list(APPEND generation_options "FIELD_ENUM")
-    endif()
-
     if(arg_EXTRA_NAMESPACE)
         list(APPEND generation_options "EXTRA_NAMESPACE=${arg_EXTRA_NAMESPACE}")
     endif()
diff --git a/src/tools/qtprotobufgen/doc/src/qtprotobufgen-options.qdocinc b/src/tools/qtprotobufgen/doc/src/qtprotobufgen-options.qdocinc
index 2861da60..cb01b94f 100644
--- a/src/tools/qtprotobufgen/doc/src/qtprotobufgen-options.qdocinc
+++ b/src/tools/qtprotobufgen/doc/src/qtprotobufgen-options.qdocinc
@@ -4,9 +4,6 @@ generated header files.
 \li \c{FOLDER} generates a folder structure for the generated files matching
 the \c{.proto} file's package name. For example \c{package io.qt.test;}
 would put the generated files into \c{io/qt/test/}.
-\li \c{FIELD_ENUM} generates an enum for the fields in the generated
-classes. The values of the entries correspond to the field number in the
-\c{.proto} file.
 \li \c{EXTRA_NAMESPACE} is an optional namespace that will be used for the
 generated classes. The classes are always generated in a namespace whose
 name is the same as the package name specified in the \c{.proto} file.
diff --git a/src/tools/qtprotobufgen/messagedeclarationprinter.cpp b/src/tools/qtprotobufgen/messagedeclarationprinter.cpp
index 20aa261d..48d55428 100644
--- a/src/tools/qtprotobufgen/messagedeclarationprinter.cpp
+++ b/src/tools/qtprotobufgen/messagedeclarationprinter.cpp
@@ -280,10 +280,6 @@ void MessageDeclarationPrinter::printQEnums()
 {
     if (Options::instance().generateFieldEnum()) {
         printFieldEnum();
-        Indent();
-        m_printer->Print({ { "type", Templates::QtProtobufFieldEnum() } }, Templates::QEnumTemplate());
-        Outdent();
-        m_printer->Print("\n");
     }
 
     if (m_descriptor->enum_type_count() <= 0)
@@ -372,14 +368,18 @@ void MessageDeclarationPrinter::printDestructor()
 
 void MessageDeclarationPrinter::printFieldEnum()
 {
-    Indent();
-    m_printer->Print(Templates::FieldEnumTemplate());
-    Indent();
-    common::iterateMessageFields(m_descriptor,
-                                 [&](const FieldDescriptor *, const PropertyMap &propertyMap) {
-                                     m_printer->Print(propertyMap, Templates::FieldNumberTemplate());
-                                 });
-    Outdent();
-    m_printer->Print(Templates::SemicolonBlockEnclosureTemplate());
-    Outdent();
+    if (m_descriptor->field_count() > 0) {
+        Indent();
+        m_printer->Print(Templates::FieldEnumTemplate());
+        Indent();
+        common::iterateMessageFields(m_descriptor,
+                                    [&](const FieldDescriptor *, const PropertyMap &propertyMap) {
+                                        m_printer->Print(propertyMap, Templates::FieldNumberTemplate());
+                                    });
+        Outdent();
+        m_printer->Print(Templates::SemicolonBlockEnclosureTemplate());
+        m_printer->Print({ { "type", Templates::QtProtobufFieldEnum() } }, Templates::QEnumTemplate());
+        Outdent();
+        m_printer->Print("\n");
+    }
 }
diff --git a/src/tools/qtprotobufgen/options.cpp b/src/tools/qtprotobufgen/options.cpp
index 63d9d7be..f1adb14d 100644
--- a/src/tools/qtprotobufgen/options.cpp
+++ b/src/tools/qtprotobufgen/options.cpp
@@ -16,7 +16,7 @@ static const char ExtraNamespaceGenerationOption[] = "EXTRA_NAMESPACE";
 static const char ExportMacroGenerationOption[] = "EXPORT_MACRO";
 
 Options::Options()
-    : m_hasQml(false), m_generateComments(false), m_isFolder(false), m_generateFieldEnum(false)
+    : m_hasQml(false), m_generateComments(false), m_isFolder(false), m_generateFieldEnum(true)
 {
 }
 
@@ -61,8 +61,10 @@ void Options::setFromString(const std::string &options)
             QT_PROTOBUF_DEBUG("set m_isFolder: true");
             instance.m_isFolder = true;
         } else if (option == FieldEnumGenerationOption) {
-            QT_PROTOBUF_DEBUG("set m_generateFieldEnum: true");
-            instance.m_generateFieldEnum = true;
+            // TODO: Opt in this option by default since it's required for
+            // OneOf fields.
+            // QT_PROTOBUF_DEBUG("set m_generateFieldEnum: true");
+            // instance.m_generateFieldEnum = true;
         } else if (option.find(ExtraNamespaceGenerationOption) == 0) {
             instance.m_extraNamespace = extractCompositeOptionValue(option);
             QT_PROTOBUF_DEBUG("set m_extraNamespace: " << instance.m_extraNamespace);
diff --git a/tests/auto/protobuf/basic/CMakeLists.txt b/tests/auto/protobuf/basic/CMakeLists.txt
index 8424f0ae..784aeef9 100644
--- a/tests/auto/protobuf/basic/CMakeLists.txt
+++ b/tests/auto/protobuf/basic/CMakeLists.txt
@@ -4,7 +4,6 @@
 qt6_add_protobuf(tst_protobuf_basictypes_gen
     PROTO_FILES
         proto/basicmessages.proto
-    FIELD_ENUM
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/qt_protobuf_generated"
 )
 qt_autogen_tools_initial_setup(tst_protobuf_basictypes_gen)
@@ -23,7 +22,6 @@ qt_internal_add_test(tst_protobuf_basictypes
 qt6_add_protobuf(tst_protobuf_repeatedtypes_gen
     PROTO_FILES
         proto/repeatedmessages.proto
-    FIELD_ENUM
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/qt_protobuf_generated"
 )
 qt_autogen_tools_initial_setup(tst_protobuf_repeatedtypes_gen)
@@ -50,7 +48,6 @@ qt_internal_add_test(tst_protobuf_repeatedtypes
 qt6_add_protobuf(tst_protobuf_maptypes_gen
     PROTO_FILES
         proto/mapmessages.proto
-    FIELD_ENUM
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/qt_protobuf_generated"
 )
 qt_autogen_tools_initial_setup(tst_protobuf_maptypes_gen)
@@ -77,7 +74,6 @@ qt_internal_add_test(tst_protobuf_maptypes
 qt6_add_protobuf(tst_protobuf_fieldindexrange_gen
     PROTO_FILES
         proto/fieldindexrange.proto
-    FIELD_ENUM
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/qt_protobuf_generated"
 )
 qt_autogen_tools_initial_setup(tst_protobuf_fieldindexrange_gen)
@@ -156,7 +152,6 @@ qt_internal_add_test(tst_protobuf_non_packed_repeatedtypes
 qt6_add_protobuf(tst_protobuf_non_packed_repeatedtypes
     PROTO_FILES
         proto/repeatednonpackedmessages.proto
-    FIELD_ENUM
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/qt_protobuf_generated"
 )
 qt_autogen_tools_initial_setup(tst_protobuf_non_packed_repeatedtypes)
diff --git a/tests/auto/protobuf/duplicated_metatypes/CMakeLists.txt b/tests/auto/protobuf/duplicated_metatypes/CMakeLists.txt
index 9d70a0b4..a8793b95 100644
--- a/tests/auto/protobuf/duplicated_metatypes/CMakeLists.txt
+++ b/tests/auto/protobuf/duplicated_metatypes/CMakeLists.txt
@@ -15,7 +15,6 @@ qt6_add_protobuf(tst_protobuf_duplicatedmetatypes
     PROTO_FILES
         proto/duplicated_metatypes.proto
         proto/duplicated_metatypes_external.proto
-    FIELD_ENUM
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/qt_protobuf_generated"
 )
 qt_autogen_tools_initial_setup(tst_protobuf_duplicatedmetatypes)
diff --git a/tests/auto/protobuf/enums/CMakeLists.txt b/tests/auto/protobuf/enums/CMakeLists.txt
index b88db4de..842d3044 100644
--- a/tests/auto/protobuf/enums/CMakeLists.txt
+++ b/tests/auto/protobuf/enums/CMakeLists.txt
@@ -4,7 +4,6 @@
 qt6_add_protobuf(tst_protobuf_enumtypes_gen
     PROTO_FILES
         enummessages.proto
-    FIELD_ENUM
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/qt_protobuf_generated"
 )
 qt_autogen_tools_initial_setup(tst_protobuf_enumtypes_gen)
diff --git a/tests/auto/protobuf/externalpackage/CMakeLists.txt b/tests/auto/protobuf/externalpackage/CMakeLists.txt
index 8eae3134..56cd24ae 100644
--- a/tests/auto/protobuf/externalpackage/CMakeLists.txt
+++ b/tests/auto/protobuf/externalpackage/CMakeLists.txt
@@ -15,7 +15,6 @@ qt6_add_protobuf(tst_protobuf_externalpackage
     PROTO_FILES
         proto/externalpackage.proto
         proto/externalpackageconsumer.proto
-    FIELD_ENUM
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/qt_protobuf_generated"
 )
 qt_autogen_tools_initial_setup(tst_protobuf_externalpackage)
diff --git a/tests/auto/protobuf/extranamespace/CMakeLists.txt b/tests/auto/protobuf/extranamespace/CMakeLists.txt
index eccb3140..160af3e5 100644
--- a/tests/auto/protobuf/extranamespace/CMakeLists.txt
+++ b/tests/auto/protobuf/extranamespace/CMakeLists.txt
@@ -5,7 +5,6 @@ qt6_add_protobuf(tst_protobuf_extranamespace_qtprotobuf_gen
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/qt_protobuf_generated"
     PROTO_FILES proto/extranamespace.proto
     EXTRA_NAMESPACE "MyTestNamespace"
-    FIELD_ENUM
 )
 qt_autogen_tools_initial_setup(tst_protobuf_extranamespace_qtprotobuf_gen)
 
diff --git a/tests/auto/protobuf/nested/CMakeLists.txt b/tests/auto/protobuf/nested/CMakeLists.txt
index d56d9f6a..45e1cc4b 100644
--- a/tests/auto/protobuf/nested/CMakeLists.txt
+++ b/tests/auto/protobuf/nested/CMakeLists.txt
@@ -5,7 +5,6 @@ qt6_add_protobuf(tst_protobuf_nestedtypes_qtprotobuf_gen
     PROTO_FILES
         proto/nestedmessages.proto
         proto/externalpackage.proto
-    FIELD_ENUM
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/qt_protobuf_generated"
 )
 qt_autogen_tools_initial_setup(tst_protobuf_nestedtypes_qtprotobuf_gen)
diff --git a/tests/auto/protobuf/nopackage/CMakeLists.txt b/tests/auto/protobuf/nopackage/CMakeLists.txt
index 93c961d4..a985d17c 100644
--- a/tests/auto/protobuf/nopackage/CMakeLists.txt
+++ b/tests/auto/protobuf/nopackage/CMakeLists.txt
@@ -5,7 +5,6 @@ qt6_add_protobuf(tst_protobuf_nopackagetypes_qtprotobuf_gen
     PROTO_FILES
         proto/nopackage.proto
         proto/nopackageexternal.proto
-    FIELD_ENUM
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/qt_protobuf_generated"
 )
 qt_autogen_tools_initial_setup(tst_protobuf_nopackagetypes_qtprotobuf_gen)
diff --git a/tests/auto/protobuf/sequence/CMakeLists.txt b/tests/auto/protobuf/sequence/CMakeLists.txt
index 57235c3e..0d7280d4 100644
--- a/tests/auto/protobuf/sequence/CMakeLists.txt
+++ b/tests/auto/protobuf/sequence/CMakeLists.txt
@@ -14,7 +14,6 @@ qt_internal_add_test(tst_protobuf_sequence
 qt6_add_protobuf(tst_protobuf_sequence
     PROTO_FILES
         proto/sequence.proto
-    FIELD_ENUM
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/qt_protobuf_generated"
 )
 qt_autogen_tools_initial_setup(tst_protobuf_sequence)
diff --git a/tests/auto/protobuf/syntax/CMakeLists.txt b/tests/auto/protobuf/syntax/CMakeLists.txt
index f748403d..866789e2 100644
--- a/tests/auto/protobuf/syntax/CMakeLists.txt
+++ b/tests/auto/protobuf/syntax/CMakeLists.txt
@@ -4,7 +4,6 @@
 qt6_add_protobuf(tst_protobuf_syntax_qtprotobuf_gen
     PROTO_FILES
         syntax.proto
-    FIELD_ENUM
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/qt_protobuf_generated"
 )
 qt_autogen_tools_initial_setup(tst_protobuf_syntax_qtprotobuf_gen)
diff --git a/tests/auto/protobufgen/CMakeLists.txt b/tests/auto/protobufgen/CMakeLists.txt
index 1a6535dd..fe0cd41d 100644
--- a/tests/auto/protobufgen/CMakeLists.txt
+++ b/tests/auto/protobufgen/CMakeLists.txt
@@ -21,7 +21,6 @@ qt_add_protobuf(tst_qtprotobufgen
 qt_add_protobuf(tst_qtprotobufgen
     PROTO_FILES
         ../shared/data/proto/fieldindexrange.proto
-    FIELD_ENUM
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/qt_protobuf_generated/fieldenum"
 )
 
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 c5fe67b5..1a5cbfb8 100644
--- a/tests/auto/protobufgen/data/expected_result/comments/annotation.qpb.h
+++ b/tests/auto/protobufgen/data/expected_result/comments/annotation.qpb.h
@@ -45,6 +45,11 @@ class  AnnotatedMessage1 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage1();
     ~AnnotatedMessage1() override;
     AnnotatedMessage1(const AnnotatedMessage1 &other);
@@ -82,6 +87,11 @@ class  AnnotatedMessage2 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage2();
     ~AnnotatedMessage2() override;
     AnnotatedMessage2(const AnnotatedMessage2 &other);
@@ -119,6 +129,11 @@ class  AnnotatedMessage3 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage3();
     ~AnnotatedMessage3() override;
     AnnotatedMessage3(const AnnotatedMessage3 &other);
@@ -157,6 +172,11 @@ class  AnnotatedMessage4 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage4();
     ~AnnotatedMessage4() override;
     AnnotatedMessage4(const AnnotatedMessage4 &other);
@@ -191,6 +211,11 @@ class  AnnotatedMessage5 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage5();
     ~AnnotatedMessage5() override;
     AnnotatedMessage5(const AnnotatedMessage5 &other);
@@ -226,6 +251,11 @@ class  AnnotatedMessage6 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage6();
     ~AnnotatedMessage6() override;
     AnnotatedMessage6(const AnnotatedMessage6 &other);
@@ -263,6 +293,11 @@ class  AnnotatedMessage7 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage7();
     ~AnnotatedMessage7() override;
     AnnotatedMessage7(const AnnotatedMessage7 &other);
@@ -300,6 +335,11 @@ class  AnnotatedMessage8 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage8();
     ~AnnotatedMessage8() override;
     AnnotatedMessage8(const AnnotatedMessage8 &other);
@@ -338,6 +378,11 @@ class  AnnotatedMessage9 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage9();
     ~AnnotatedMessage9() override;
     AnnotatedMessage9(const AnnotatedMessage9 &other);
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 eeae55cf..ebe2869f 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
@@ -53,6 +53,11 @@ class  SimpleStringMessage : public QProtobufMessage
     Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldStringProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleStringMessage();
     ~SimpleStringMessage() override;
     SimpleStringMessage(const SimpleStringMessage &other);
@@ -83,6 +88,12 @@ class  ComplexMessage : public QProtobufMessage
     Q_PROPERTY(MyTopLevelNamespace::qtprotobufnamespace::tests::SimpleStringMessage *testComplexField READ testComplexField_p WRITE setTestComplexField_p)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldIntProtoFieldNumber = 1,
+        TestComplexFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     ComplexMessage();
     ~ComplexMessage() override;
     ComplexMessage(const ComplexMessage &other);
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 0aa5022f..3121ecdc 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
@@ -81,6 +81,11 @@ class  SimpleBoolMessage : public QProtobufMessage
     Q_PROPERTY(bool testFieldBool READ testFieldBool WRITE setTestFieldBool SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldBoolProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleBoolMessage();
     ~SimpleBoolMessage() override;
     SimpleBoolMessage(const SimpleBoolMessage &other);
@@ -114,6 +119,11 @@ class  SimpleIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleIntMessage();
     ~SimpleIntMessage() override;
     SimpleIntMessage(const SimpleIntMessage &other);
@@ -147,6 +157,11 @@ class  SimpleSIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleSIntMessage();
     ~SimpleSIntMessage() override;
     SimpleSIntMessage(const SimpleSIntMessage &other);
@@ -180,6 +195,11 @@ class  SimpleUIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleUIntMessage();
     ~SimpleUIntMessage() override;
     SimpleUIntMessage(const SimpleUIntMessage &other);
@@ -213,6 +233,11 @@ class  SimpleInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleInt64Message();
     ~SimpleInt64Message() override;
     SimpleInt64Message(const SimpleInt64Message &other);
@@ -246,6 +271,11 @@ class  SimpleSInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleSInt64Message();
     ~SimpleSInt64Message() override;
     SimpleSInt64Message(const SimpleSInt64Message &other);
@@ -279,6 +309,11 @@ class  SimpleUInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleUInt64Message();
     ~SimpleUInt64Message() override;
     SimpleUInt64Message(const SimpleUInt64Message &other);
@@ -312,6 +347,11 @@ class  SimpleStringMessage : public QProtobufMessage
     Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldStringProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleStringMessage();
     ~SimpleStringMessage() override;
     SimpleStringMessage(const SimpleStringMessage &other);
@@ -341,6 +381,11 @@ class  SimpleFloatMessage : public QProtobufMessage
     Q_PROPERTY(float testFieldFloat READ testFieldFloat WRITE setTestFieldFloat SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldFloatProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleFloatMessage();
     ~SimpleFloatMessage() override;
     SimpleFloatMessage(const SimpleFloatMessage &other);
@@ -374,6 +419,11 @@ class  SimpleDoubleMessage : public QProtobufMessage
     Q_PROPERTY(double testFieldDouble READ testFieldDouble WRITE setTestFieldDouble SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldDoubleProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleDoubleMessage();
     ~SimpleDoubleMessage() override;
     SimpleDoubleMessage(const SimpleDoubleMessage &other);
@@ -407,6 +457,11 @@ class  SimpleBytesMessage : public QProtobufMessage
     Q_PROPERTY(QByteArray testFieldBytes READ testFieldBytes WRITE setTestFieldBytes SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldBytesProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleBytesMessage();
     ~SimpleBytesMessage() override;
     SimpleBytesMessage(const SimpleBytesMessage &other);
@@ -436,6 +491,11 @@ class  SimpleFixedInt32Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldFixedInt32ProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleFixedInt32Message();
     ~SimpleFixedInt32Message() override;
     SimpleFixedInt32Message(const SimpleFixedInt32Message &other);
@@ -469,6 +529,11 @@ class  SimpleFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldFixedInt64ProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleFixedInt64Message();
     ~SimpleFixedInt64Message() override;
     SimpleFixedInt64Message(const SimpleFixedInt64Message &other);
@@ -502,6 +567,11 @@ class  SimpleSFixedInt32Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldFixedInt32ProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleSFixedInt32Message();
     ~SimpleSFixedInt32Message() override;
     SimpleSFixedInt32Message(const SimpleSFixedInt32Message &other);
@@ -535,6 +605,11 @@ class  SimpleSFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldFixedInt64ProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleSFixedInt64Message();
     ~SimpleSFixedInt64Message() override;
     SimpleSFixedInt64Message(const SimpleSFixedInt64Message &other);
@@ -569,6 +644,12 @@ class  ComplexMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringMessage *testComplexField READ testComplexField_p WRITE setTestComplexField_p)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldIntProtoFieldNumber = 1,
+        TestComplexFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     ComplexMessage();
     ~ComplexMessage() override;
     ComplexMessage(const ComplexMessage &other);
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 e86d9e77..6b4aba2b 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
@@ -203,6 +203,11 @@ class  SimpleSInt32StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint32, QString>;
     SimpleSInt32StringMapMessage();
     ~SimpleSInt32StringMapMessage() override;
@@ -237,6 +242,11 @@ class  SimpleSInt64StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint64, QString>;
     SimpleSInt64StringMapMessage();
     ~SimpleSInt64StringMapMessage() override;
@@ -271,6 +281,11 @@ class  SimpleInt32StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 3,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int32, QString>;
     SimpleInt32StringMapMessage();
     ~SimpleInt32StringMapMessage() override;
@@ -305,6 +320,11 @@ class  SimpleInt64StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 4,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int64, QString>;
     SimpleInt64StringMapMessage();
     ~SimpleInt64StringMapMessage() override;
@@ -339,6 +359,11 @@ class  SimpleUInt32StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 5,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint32, QString>;
     SimpleUInt32StringMapMessage();
     ~SimpleUInt32StringMapMessage() override;
@@ -373,6 +398,11 @@ class  SimpleUInt64StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint64, QString>;
     SimpleUInt64StringMapMessage();
     ~SimpleUInt64StringMapMessage() override;
@@ -407,6 +437,11 @@ class  SimpleFixed32StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QString>;
     SimpleFixed32StringMapMessage();
     ~SimpleFixed32StringMapMessage() override;
@@ -441,6 +476,11 @@ class  SimpleFixed64StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QString>;
     SimpleFixed64StringMapMessage();
     ~SimpleFixed64StringMapMessage() override;
@@ -475,6 +515,11 @@ class  SimpleSFixed32StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 9,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QString>;
     SimpleSFixed32StringMapMessage();
     ~SimpleSFixed32StringMapMessage() override;
@@ -509,6 +554,11 @@ class  SimpleSFixed64StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 10,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QString>;
     SimpleSFixed64StringMapMessage();
     ~SimpleSFixed64StringMapMessage() override;
@@ -543,6 +593,11 @@ class  SimpleStringStringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringStringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 13,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QString, QString>;
     SimpleStringStringMapMessage();
     ~SimpleStringStringMapMessage() override;
@@ -577,6 +632,11 @@ class  SimpleSInt32SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::sint32>;
     SimpleSInt32SInt32MapMessage();
     ~SimpleSInt32SInt32MapMessage() override;
@@ -611,6 +671,11 @@ class  SimpleSInt64SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::sint32>;
     SimpleSInt64SInt32MapMessage();
     ~SimpleSInt64SInt32MapMessage() override;
@@ -645,6 +710,11 @@ class  SimpleInt32SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 3,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::sint32>;
     SimpleInt32SInt32MapMessage();
     ~SimpleInt32SInt32MapMessage() override;
@@ -679,6 +749,11 @@ class  SimpleInt64SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 4,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::sint32>;
     SimpleInt64SInt32MapMessage();
     ~SimpleInt64SInt32MapMessage() override;
@@ -713,6 +788,11 @@ class  SimpleUInt32SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 5,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::sint32>;
     SimpleUInt32SInt32MapMessage();
     ~SimpleUInt32SInt32MapMessage() override;
@@ -747,6 +827,11 @@ class  SimpleUInt64SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::sint32>;
     SimpleUInt64SInt32MapMessage();
     ~SimpleUInt64SInt32MapMessage() override;
@@ -781,6 +866,11 @@ class  SimpleFixed32SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::sint32>;
     SimpleFixed32SInt32MapMessage();
     ~SimpleFixed32SInt32MapMessage() override;
@@ -815,6 +905,11 @@ class  SimpleFixed64SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::sint32>;
     SimpleFixed64SInt32MapMessage();
     ~SimpleFixed64SInt32MapMessage() override;
@@ -849,6 +944,11 @@ class  SimpleSFixed32SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 9,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::sint32>;
     SimpleSFixed32SInt32MapMessage();
     ~SimpleSFixed32SInt32MapMessage() override;
@@ -883,6 +983,11 @@ class  SimpleSFixed64SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 10,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::sint32>;
     SimpleSFixed64SInt32MapMessage();
     ~SimpleSFixed64SInt32MapMessage() override;
@@ -917,6 +1022,11 @@ class  SimpleStringSInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringSInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 13,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QString, QtProtobuf::sint32>;
     SimpleStringSInt32MapMessage();
     ~SimpleStringSInt32MapMessage() override;
@@ -951,6 +1061,11 @@ class  SimpleSInt32SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::sint64>;
     SimpleSInt32SInt64MapMessage();
     ~SimpleSInt32SInt64MapMessage() override;
@@ -985,6 +1100,11 @@ class  SimpleSInt64SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::sint64>;
     SimpleSInt64SInt64MapMessage();
     ~SimpleSInt64SInt64MapMessage() override;
@@ -1019,6 +1139,11 @@ class  SimpleInt32SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 3,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::sint64>;
     SimpleInt32SInt64MapMessage();
     ~SimpleInt32SInt64MapMessage() override;
@@ -1053,6 +1178,11 @@ class  SimpleInt64SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 4,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::sint64>;
     SimpleInt64SInt64MapMessage();
     ~SimpleInt64SInt64MapMessage() override;
@@ -1087,6 +1217,11 @@ class  SimpleUInt32SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 5,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::sint64>;
     SimpleUInt32SInt64MapMessage();
     ~SimpleUInt32SInt64MapMessage() override;
@@ -1121,6 +1256,11 @@ class  SimpleUInt64SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::sint64>;
     SimpleUInt64SInt64MapMessage();
     ~SimpleUInt64SInt64MapMessage() override;
@@ -1155,6 +1295,11 @@ class  SimpleFixed32SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::sint64>;
     SimpleFixed32SInt64MapMessage();
     ~SimpleFixed32SInt64MapMessage() override;
@@ -1189,6 +1334,11 @@ class  SimpleFixed64SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::sint64>;
     SimpleFixed64SInt64MapMessage();
     ~SimpleFixed64SInt64MapMessage() override;
@@ -1223,6 +1373,11 @@ class  SimpleSFixed32SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 9,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::sint64>;
     SimpleSFixed32SInt64MapMessage();
     ~SimpleSFixed32SInt64MapMessage() override;
@@ -1257,6 +1412,11 @@ class  SimpleSFixed64SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 10,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::sint64>;
     SimpleSFixed64SInt64MapMessage();
     ~SimpleSFixed64SInt64MapMessage() override;
@@ -1291,6 +1451,11 @@ class  SimpleStringSInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringSInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 13,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QString, QtProtobuf::sint64>;
     SimpleStringSInt64MapMessage();
     ~SimpleStringSInt64MapMessage() override;
@@ -1325,6 +1490,11 @@ class  SimpleSInt32UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::uint32>;
     SimpleSInt32UInt32MapMessage();
     ~SimpleSInt32UInt32MapMessage() override;
@@ -1359,6 +1529,11 @@ class  SimpleSInt64UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::uint32>;
     SimpleSInt64UInt32MapMessage();
     ~SimpleSInt64UInt32MapMessage() override;
@@ -1393,6 +1568,11 @@ class  SimpleInt32UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 3,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::uint32>;
     SimpleInt32UInt32MapMessage();
     ~SimpleInt32UInt32MapMessage() override;
@@ -1427,6 +1607,11 @@ class  SimpleInt64UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 4,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::uint32>;
     SimpleInt64UInt32MapMessage();
     ~SimpleInt64UInt32MapMessage() override;
@@ -1461,6 +1646,11 @@ class  SimpleUInt32UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 5,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::uint32>;
     SimpleUInt32UInt32MapMessage();
     ~SimpleUInt32UInt32MapMessage() override;
@@ -1495,6 +1685,11 @@ class  SimpleUInt64UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::uint32>;
     SimpleUInt64UInt32MapMessage();
     ~SimpleUInt64UInt32MapMessage() override;
@@ -1529,6 +1724,11 @@ class  SimpleFixed32UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::uint32>;
     SimpleFixed32UInt32MapMessage();
     ~SimpleFixed32UInt32MapMessage() override;
@@ -1563,6 +1763,11 @@ class  SimpleFixed64UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::uint32>;
     SimpleFixed64UInt32MapMessage();
     ~SimpleFixed64UInt32MapMessage() override;
@@ -1597,6 +1802,11 @@ class  SimpleSFixed32UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 9,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::uint32>;
     SimpleSFixed32UInt32MapMessage();
     ~SimpleSFixed32UInt32MapMessage() override;
@@ -1631,6 +1841,11 @@ class  SimpleSFixed64UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 10,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::uint32>;
     SimpleSFixed64UInt32MapMessage();
     ~SimpleSFixed64UInt32MapMessage() override;
@@ -1665,6 +1880,11 @@ class  SimpleStringUInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringUInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 13,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QString, QtProtobuf::uint32>;
     SimpleStringUInt32MapMessage();
     ~SimpleStringUInt32MapMessage() override;
@@ -1699,6 +1919,11 @@ class  SimpleSInt32UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::uint64>;
     SimpleSInt32UInt64MapMessage();
     ~SimpleSInt32UInt64MapMessage() override;
@@ -1733,6 +1958,11 @@ class  SimpleSInt64UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::uint64>;
     SimpleSInt64UInt64MapMessage();
     ~SimpleSInt64UInt64MapMessage() override;
@@ -1767,6 +1997,11 @@ class  SimpleInt32UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 3,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::uint64>;
     SimpleInt32UInt64MapMessage();
     ~SimpleInt32UInt64MapMessage() override;
@@ -1801,6 +2036,11 @@ class  SimpleInt64UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 4,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::uint64>;
     SimpleInt64UInt64MapMessage();
     ~SimpleInt64UInt64MapMessage() override;
@@ -1835,6 +2075,11 @@ class  SimpleUInt32UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 5,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::uint64>;
     SimpleUInt32UInt64MapMessage();
     ~SimpleUInt32UInt64MapMessage() override;
@@ -1869,6 +2114,11 @@ class  SimpleUInt64UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::uint64>;
     SimpleUInt64UInt64MapMessage();
     ~SimpleUInt64UInt64MapMessage() override;
@@ -1903,6 +2153,11 @@ class  SimpleFixed32UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::uint64>;
     SimpleFixed32UInt64MapMessage();
     ~SimpleFixed32UInt64MapMessage() override;
@@ -1937,6 +2192,11 @@ class  SimpleFixed64UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::uint64>;
     SimpleFixed64UInt64MapMessage();
     ~SimpleFixed64UInt64MapMessage() override;
@@ -1971,6 +2231,11 @@ class  SimpleSFixed32UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 9,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::uint64>;
     SimpleSFixed32UInt64MapMessage();
     ~SimpleSFixed32UInt64MapMessage() override;
@@ -2005,6 +2270,11 @@ class  SimpleSFixed64UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 10,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::uint64>;
     SimpleSFixed64UInt64MapMessage();
     ~SimpleSFixed64UInt64MapMessage() override;
@@ -2039,6 +2309,11 @@ class  SimpleStringUInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringUInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 13,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QString, QtProtobuf::uint64>;
     SimpleStringUInt64MapMessage();
     ~SimpleStringUInt64MapMessage() override;
@@ -2073,6 +2348,11 @@ class  SimpleSInt32Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::int32>;
     SimpleSInt32Int32MapMessage();
     ~SimpleSInt32Int32MapMessage() override;
@@ -2107,6 +2387,11 @@ class  SimpleSInt64Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::int32>;
     SimpleSInt64Int32MapMessage();
     ~SimpleSInt64Int32MapMessage() override;
@@ -2141,6 +2426,11 @@ class  SimpleInt32Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 3,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::int32>;
     SimpleInt32Int32MapMessage();
     ~SimpleInt32Int32MapMessage() override;
@@ -2175,6 +2465,11 @@ class  SimpleInt64Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 4,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::int32>;
     SimpleInt64Int32MapMessage();
     ~SimpleInt64Int32MapMessage() override;
@@ -2209,6 +2504,11 @@ class  SimpleUInt32Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 5,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::int32>;
     SimpleUInt32Int32MapMessage();
     ~SimpleUInt32Int32MapMessage() override;
@@ -2243,6 +2543,11 @@ class  SimpleUInt64Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::int32>;
     SimpleUInt64Int32MapMessage();
     ~SimpleUInt64Int32MapMessage() override;
@@ -2277,6 +2582,11 @@ class  SimpleFixed32Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::int32>;
     SimpleFixed32Int32MapMessage();
     ~SimpleFixed32Int32MapMessage() override;
@@ -2311,6 +2621,11 @@ class  SimpleFixed64Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::int32>;
     SimpleFixed64Int32MapMessage();
     ~SimpleFixed64Int32MapMessage() override;
@@ -2345,6 +2660,11 @@ class  SimpleSFixed32Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 9,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::int32>;
     SimpleSFixed32Int32MapMessage();
     ~SimpleSFixed32Int32MapMessage() override;
@@ -2379,6 +2699,11 @@ class  SimpleSFixed64Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 10,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::int32>;
     SimpleSFixed64Int32MapMessage();
     ~SimpleSFixed64Int32MapMessage() override;
@@ -2413,6 +2738,11 @@ class  SimpleStringInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 13,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QString, QtProtobuf::int32>;
     SimpleStringInt32MapMessage();
     ~SimpleStringInt32MapMessage() override;
@@ -2447,6 +2777,11 @@ class  SimpleSInt32Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::int64>;
     SimpleSInt32Int64MapMessage();
     ~SimpleSInt32Int64MapMessage() override;
@@ -2481,6 +2816,11 @@ class  SimpleSInt64Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::int64>;
     SimpleSInt64Int64MapMessage();
     ~SimpleSInt64Int64MapMessage() override;
@@ -2515,6 +2855,11 @@ class  SimpleInt32Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 3,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::int64>;
     SimpleInt32Int64MapMessage();
     ~SimpleInt32Int64MapMessage() override;
@@ -2549,6 +2894,11 @@ class  SimpleInt64Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 4,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::int64>;
     SimpleInt64Int64MapMessage();
     ~SimpleInt64Int64MapMessage() override;
@@ -2583,6 +2933,11 @@ class  SimpleUInt32Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 5,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::int64>;
     SimpleUInt32Int64MapMessage();
     ~SimpleUInt32Int64MapMessage() override;
@@ -2617,6 +2972,11 @@ class  SimpleUInt64Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::int64>;
     SimpleUInt64Int64MapMessage();
     ~SimpleUInt64Int64MapMessage() override;
@@ -2651,6 +3011,11 @@ class  SimpleFixed32Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::int64>;
     SimpleFixed32Int64MapMessage();
     ~SimpleFixed32Int64MapMessage() override;
@@ -2685,6 +3050,11 @@ class  SimpleFixed64Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::int64>;
     SimpleFixed64Int64MapMessage();
     ~SimpleFixed64Int64MapMessage() override;
@@ -2719,6 +3089,11 @@ class  SimpleSFixed32Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 9,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::int64>;
     SimpleSFixed32Int64MapMessage();
     ~SimpleSFixed32Int64MapMessage() override;
@@ -2753,6 +3128,11 @@ class  SimpleSFixed64Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 10,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::int64>;
     SimpleSFixed64Int64MapMessage();
     ~SimpleSFixed64Int64MapMessage() override;
@@ -2787,6 +3167,11 @@ class  SimpleStringInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 13,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QString, QtProtobuf::int64>;
     SimpleStringInt64MapMessage();
     ~SimpleStringInt64MapMessage() override;
@@ -2821,6 +3206,11 @@ class  SimpleSInt32ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint32, std::shared_ptr<ComplexMessage>>;
     SimpleSInt32ComplexMessageMapMessage();
     ~SimpleSInt32ComplexMessageMapMessage() override;
@@ -2855,6 +3245,11 @@ class  SimpleSInt64ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint64, std::shared_ptr<ComplexMessage>>;
     SimpleSInt64ComplexMessageMapMessage();
     ~SimpleSInt64ComplexMessageMapMessage() override;
@@ -2889,6 +3284,11 @@ class  SimpleInt32ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 3,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int32, std::shared_ptr<ComplexMessage>>;
     SimpleInt32ComplexMessageMapMessage();
     ~SimpleInt32ComplexMessageMapMessage() override;
@@ -2923,6 +3323,11 @@ class  SimpleInt64ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 4,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int64, std::shared_ptr<ComplexMessage>>;
     SimpleInt64ComplexMessageMapMessage();
     ~SimpleInt64ComplexMessageMapMessage() override;
@@ -2957,6 +3362,11 @@ class  SimpleUInt32ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 5,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint32, std::shared_ptr<ComplexMessage>>;
     SimpleUInt32ComplexMessageMapMessage();
     ~SimpleUInt32ComplexMessageMapMessage() override;
@@ -2991,6 +3401,11 @@ class  SimpleUInt64ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint64, std::shared_ptr<ComplexMessage>>;
     SimpleUInt64ComplexMessageMapMessage();
     ~SimpleUInt64ComplexMessageMapMessage() override;
@@ -3025,6 +3440,11 @@ class  SimpleFixed32ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed32, std::shared_ptr<ComplexMessage>>;
     SimpleFixed32ComplexMessageMapMessage();
     ~SimpleFixed32ComplexMessageMapMessage() override;
@@ -3059,6 +3479,11 @@ class  SimpleFixed64ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed64, std::shared_ptr<ComplexMessage>>;
     SimpleFixed64ComplexMessageMapMessage();
     ~SimpleFixed64ComplexMessageMapMessage() override;
@@ -3093,6 +3518,11 @@ class  SimpleSFixed32ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 9,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, std::shared_ptr<ComplexMessage>>;
     SimpleSFixed32ComplexMessageMapMessage();
     ~SimpleSFixed32ComplexMessageMapMessage() override;
@@ -3127,6 +3557,11 @@ class  SimpleSFixed64ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 10,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, std::shared_ptr<ComplexMessage>>;
     SimpleSFixed64ComplexMessageMapMessage();
     ~SimpleSFixed64ComplexMessageMapMessage() override;
@@ -3161,6 +3596,11 @@ class  SimpleStringComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 13,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QString, std::shared_ptr<ComplexMessage>>;
     SimpleStringComplexMessageMapMessage();
     ~SimpleStringComplexMessageMapMessage() override;
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 d0d7ba33..fc8ed45a 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
@@ -59,6 +59,11 @@ class  RepeatedStringMessage : public QProtobufMessage
     Q_PROPERTY(QStringList testRepeatedString READ testRepeatedString WRITE setTestRepeatedString SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedStringProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedStringMessage();
     ~RepeatedStringMessage() override;
     RepeatedStringMessage(const RepeatedStringMessage &other);
@@ -92,6 +97,11 @@ class  RepeatedDoubleMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::doubleList testRepeatedDouble READ testRepeatedDouble WRITE setTestRepeatedDouble SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedDoubleProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedDoubleMessage();
     ~RepeatedDoubleMessage() override;
     RepeatedDoubleMessage(const RepeatedDoubleMessage &other);
@@ -129,6 +139,11 @@ class  RepeatedBytesMessage : public QProtobufMessage
     Q_PROPERTY(QByteArrayList testRepeatedBytes READ testRepeatedBytes WRITE setTestRepeatedBytes SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedBytesProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedBytesMessage();
     ~RepeatedBytesMessage() override;
     RepeatedBytesMessage(const RepeatedBytesMessage &other);
@@ -162,6 +177,11 @@ class  RepeatedFloatMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::floatList testRepeatedFloat READ testRepeatedFloat WRITE setTestRepeatedFloat SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedFloatProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedFloatMessage();
     ~RepeatedFloatMessage() override;
     RepeatedFloatMessage(const RepeatedFloatMessage &other);
@@ -199,6 +219,11 @@ class  RepeatedComplexMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::ComplexMessageRepeated testRepeatedComplexData READ testRepeatedComplex WRITE setTestRepeatedComplex SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedComplexProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedComplexMessage();
     ~RepeatedComplexMessage() override;
     RepeatedComplexMessage(const RepeatedComplexMessage &other);
@@ -232,6 +257,11 @@ class  RepeatedSIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedSIntMessage();
     ~RepeatedSIntMessage() override;
     RepeatedSIntMessage(const RepeatedSIntMessage &other);
@@ -269,6 +299,11 @@ class  RepeatedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedIntMessage();
     ~RepeatedIntMessage() override;
     RepeatedIntMessage(const RepeatedIntMessage &other);
@@ -306,6 +341,11 @@ class  RepeatedUIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedUIntMessage();
     ~RepeatedUIntMessage() override;
     RepeatedUIntMessage(const RepeatedUIntMessage &other);
@@ -343,6 +383,11 @@ class  RepeatedSInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedSInt64Message();
     ~RepeatedSInt64Message() override;
     RepeatedSInt64Message(const RepeatedSInt64Message &other);
@@ -380,6 +425,11 @@ class  RepeatedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedInt64Message();
     ~RepeatedInt64Message() override;
     RepeatedInt64Message(const RepeatedInt64Message &other);
@@ -417,6 +467,11 @@ class  RepeatedUInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedUInt64Message();
     ~RepeatedUInt64Message() override;
     RepeatedUInt64Message(const RepeatedUInt64Message &other);
@@ -454,6 +509,11 @@ class  RepeatedFixedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedFixedIntMessage();
     ~RepeatedFixedIntMessage() override;
     RepeatedFixedIntMessage(const RepeatedFixedIntMessage &other);
@@ -491,6 +551,11 @@ class  RepeatedSFixedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedSFixedIntMessage();
     ~RepeatedSFixedIntMessage() override;
     RepeatedSFixedIntMessage(const RepeatedSFixedIntMessage &other);
@@ -528,6 +593,11 @@ class  RepeatedFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedFixedInt64Message();
     ~RepeatedFixedInt64Message() override;
     RepeatedFixedInt64Message(const RepeatedFixedInt64Message &other);
@@ -565,6 +635,11 @@ class  RepeatedSFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedSFixedInt64Message();
     ~RepeatedSFixedInt64Message() override;
     RepeatedSFixedInt64Message(const RepeatedSFixedInt64Message &other);
@@ -602,6 +677,11 @@ class  RepeatedBoolMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::boolList testRepeatedBool READ testRepeatedBool WRITE setTestRepeatedBool SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedBoolProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedBoolMessage();
     ~RepeatedBoolMessage() override;
     RepeatedBoolMessage(const RepeatedBoolMessage &other);
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 594542c0..d88edc35 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
@@ -44,6 +44,11 @@ class  AnnotatedMessage1 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage1();
     ~AnnotatedMessage1() override;
     AnnotatedMessage1(const AnnotatedMessage1 &other);
@@ -77,6 +82,11 @@ class  AnnotatedMessage2 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage2();
     ~AnnotatedMessage2() override;
     AnnotatedMessage2(const AnnotatedMessage2 &other);
@@ -110,6 +120,11 @@ class  AnnotatedMessage3 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage3();
     ~AnnotatedMessage3() override;
     AnnotatedMessage3(const AnnotatedMessage3 &other);
@@ -143,6 +158,11 @@ class  AnnotatedMessage4 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage4();
     ~AnnotatedMessage4() override;
     AnnotatedMessage4(const AnnotatedMessage4 &other);
@@ -176,6 +196,11 @@ class  AnnotatedMessage5 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage5();
     ~AnnotatedMessage5() override;
     AnnotatedMessage5(const AnnotatedMessage5 &other);
@@ -209,6 +234,11 @@ class  AnnotatedMessage6 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage6();
     ~AnnotatedMessage6() override;
     AnnotatedMessage6(const AnnotatedMessage6 &other);
@@ -242,6 +272,11 @@ class  AnnotatedMessage7 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage7();
     ~AnnotatedMessage7() override;
     AnnotatedMessage7(const AnnotatedMessage7 &other);
@@ -275,6 +310,11 @@ class  AnnotatedMessage8 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage8();
     ~AnnotatedMessage8() override;
     AnnotatedMessage8(const AnnotatedMessage8 &other);
@@ -308,6 +348,11 @@ class  AnnotatedMessage9 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     AnnotatedMessage9();
     ~AnnotatedMessage9() override;
     AnnotatedMessage9(const AnnotatedMessage9 &other);
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 0aa5022f..3121ecdc 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
@@ -81,6 +81,11 @@ class  SimpleBoolMessage : public QProtobufMessage
     Q_PROPERTY(bool testFieldBool READ testFieldBool WRITE setTestFieldBool SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldBoolProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleBoolMessage();
     ~SimpleBoolMessage() override;
     SimpleBoolMessage(const SimpleBoolMessage &other);
@@ -114,6 +119,11 @@ class  SimpleIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleIntMessage();
     ~SimpleIntMessage() override;
     SimpleIntMessage(const SimpleIntMessage &other);
@@ -147,6 +157,11 @@ class  SimpleSIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleSIntMessage();
     ~SimpleSIntMessage() override;
     SimpleSIntMessage(const SimpleSIntMessage &other);
@@ -180,6 +195,11 @@ class  SimpleUIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleUIntMessage();
     ~SimpleUIntMessage() override;
     SimpleUIntMessage(const SimpleUIntMessage &other);
@@ -213,6 +233,11 @@ class  SimpleInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleInt64Message();
     ~SimpleInt64Message() override;
     SimpleInt64Message(const SimpleInt64Message &other);
@@ -246,6 +271,11 @@ class  SimpleSInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleSInt64Message();
     ~SimpleSInt64Message() override;
     SimpleSInt64Message(const SimpleSInt64Message &other);
@@ -279,6 +309,11 @@ class  SimpleUInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleUInt64Message();
     ~SimpleUInt64Message() override;
     SimpleUInt64Message(const SimpleUInt64Message &other);
@@ -312,6 +347,11 @@ class  SimpleStringMessage : public QProtobufMessage
     Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldStringProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleStringMessage();
     ~SimpleStringMessage() override;
     SimpleStringMessage(const SimpleStringMessage &other);
@@ -341,6 +381,11 @@ class  SimpleFloatMessage : public QProtobufMessage
     Q_PROPERTY(float testFieldFloat READ testFieldFloat WRITE setTestFieldFloat SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldFloatProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleFloatMessage();
     ~SimpleFloatMessage() override;
     SimpleFloatMessage(const SimpleFloatMessage &other);
@@ -374,6 +419,11 @@ class  SimpleDoubleMessage : public QProtobufMessage
     Q_PROPERTY(double testFieldDouble READ testFieldDouble WRITE setTestFieldDouble SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldDoubleProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleDoubleMessage();
     ~SimpleDoubleMessage() override;
     SimpleDoubleMessage(const SimpleDoubleMessage &other);
@@ -407,6 +457,11 @@ class  SimpleBytesMessage : public QProtobufMessage
     Q_PROPERTY(QByteArray testFieldBytes READ testFieldBytes WRITE setTestFieldBytes SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldBytesProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleBytesMessage();
     ~SimpleBytesMessage() override;
     SimpleBytesMessage(const SimpleBytesMessage &other);
@@ -436,6 +491,11 @@ class  SimpleFixedInt32Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldFixedInt32ProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleFixedInt32Message();
     ~SimpleFixedInt32Message() override;
     SimpleFixedInt32Message(const SimpleFixedInt32Message &other);
@@ -469,6 +529,11 @@ class  SimpleFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldFixedInt64ProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleFixedInt64Message();
     ~SimpleFixedInt64Message() override;
     SimpleFixedInt64Message(const SimpleFixedInt64Message &other);
@@ -502,6 +567,11 @@ class  SimpleSFixedInt32Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldFixedInt32ProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleSFixedInt32Message();
     ~SimpleSFixedInt32Message() override;
     SimpleSFixedInt32Message(const SimpleSFixedInt32Message &other);
@@ -535,6 +605,11 @@ class  SimpleSFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldFixedInt64ProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleSFixedInt64Message();
     ~SimpleSFixedInt64Message() override;
     SimpleSFixedInt64Message(const SimpleSFixedInt64Message &other);
@@ -569,6 +644,12 @@ class  ComplexMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringMessage *testComplexField READ testComplexField_p WRITE setTestComplexField_p)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldIntProtoFieldNumber = 1,
+        TestComplexFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     ComplexMessage();
     ~ComplexMessage() override;
     ComplexMessage(const ComplexMessage &other);
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 54937c0e..0894832c 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
@@ -53,6 +53,11 @@ class  SimpleStringMessage : public QProtobufMessage
     Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldStringProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     SimpleStringMessage();
     ~SimpleStringMessage() override;
     SimpleStringMessage(const SimpleStringMessage &other);
@@ -83,6 +88,12 @@ class  ComplexMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringMessage *testComplexField READ testComplexField_p WRITE setTestComplexField_p)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldIntProtoFieldNumber = 1,
+        TestComplexFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     ComplexMessage();
     ~ComplexMessage() override;
     ComplexMessage(const ComplexMessage &other);
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 f0d7b116..c6999335 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
@@ -34,6 +34,11 @@ class  FieldIndexTest1Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 31,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     FieldIndexTest1Message();
     ~FieldIndexTest1Message() override;
     FieldIndexTest1Message(const FieldIndexTest1Message &other);
@@ -67,6 +72,11 @@ class  FieldIndexTest2Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 8191,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     FieldIndexTest2Message();
     ~FieldIndexTest2Message() override;
     FieldIndexTest2Message(const FieldIndexTest2Message &other);
@@ -100,6 +110,11 @@ class  FieldIndexTest3Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 2097151,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     FieldIndexTest3Message();
     ~FieldIndexTest3Message() override;
     FieldIndexTest3Message(const FieldIndexTest3Message &other);
@@ -133,6 +148,11 @@ class  FieldIndexTest4Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestFieldProtoFieldNumber = 536870911,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     FieldIndexTest4Message();
     ~FieldIndexTest4Message() override;
     FieldIndexTest4Message(const FieldIndexTest4Message &other);
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 e86d9e77..6b4aba2b 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
@@ -203,6 +203,11 @@ class  SimpleSInt32StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint32, QString>;
     SimpleSInt32StringMapMessage();
     ~SimpleSInt32StringMapMessage() override;
@@ -237,6 +242,11 @@ class  SimpleSInt64StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint64, QString>;
     SimpleSInt64StringMapMessage();
     ~SimpleSInt64StringMapMessage() override;
@@ -271,6 +281,11 @@ class  SimpleInt32StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 3,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int32, QString>;
     SimpleInt32StringMapMessage();
     ~SimpleInt32StringMapMessage() override;
@@ -305,6 +320,11 @@ class  SimpleInt64StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 4,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int64, QString>;
     SimpleInt64StringMapMessage();
     ~SimpleInt64StringMapMessage() override;
@@ -339,6 +359,11 @@ class  SimpleUInt32StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 5,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint32, QString>;
     SimpleUInt32StringMapMessage();
     ~SimpleUInt32StringMapMessage() override;
@@ -373,6 +398,11 @@ class  SimpleUInt64StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint64, QString>;
     SimpleUInt64StringMapMessage();
     ~SimpleUInt64StringMapMessage() override;
@@ -407,6 +437,11 @@ class  SimpleFixed32StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QString>;
     SimpleFixed32StringMapMessage();
     ~SimpleFixed32StringMapMessage() override;
@@ -441,6 +476,11 @@ class  SimpleFixed64StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QString>;
     SimpleFixed64StringMapMessage();
     ~SimpleFixed64StringMapMessage() override;
@@ -475,6 +515,11 @@ class  SimpleSFixed32StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 9,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QString>;
     SimpleSFixed32StringMapMessage();
     ~SimpleSFixed32StringMapMessage() override;
@@ -509,6 +554,11 @@ class  SimpleSFixed64StringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64StringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 10,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QString>;
     SimpleSFixed64StringMapMessage();
     ~SimpleSFixed64StringMapMessage() override;
@@ -543,6 +593,11 @@ class  SimpleStringStringMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringStringMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 13,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QString, QString>;
     SimpleStringStringMapMessage();
     ~SimpleStringStringMapMessage() override;
@@ -577,6 +632,11 @@ class  SimpleSInt32SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::sint32>;
     SimpleSInt32SInt32MapMessage();
     ~SimpleSInt32SInt32MapMessage() override;
@@ -611,6 +671,11 @@ class  SimpleSInt64SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::sint32>;
     SimpleSInt64SInt32MapMessage();
     ~SimpleSInt64SInt32MapMessage() override;
@@ -645,6 +710,11 @@ class  SimpleInt32SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 3,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::sint32>;
     SimpleInt32SInt32MapMessage();
     ~SimpleInt32SInt32MapMessage() override;
@@ -679,6 +749,11 @@ class  SimpleInt64SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 4,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::sint32>;
     SimpleInt64SInt32MapMessage();
     ~SimpleInt64SInt32MapMessage() override;
@@ -713,6 +788,11 @@ class  SimpleUInt32SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 5,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::sint32>;
     SimpleUInt32SInt32MapMessage();
     ~SimpleUInt32SInt32MapMessage() override;
@@ -747,6 +827,11 @@ class  SimpleUInt64SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::sint32>;
     SimpleUInt64SInt32MapMessage();
     ~SimpleUInt64SInt32MapMessage() override;
@@ -781,6 +866,11 @@ class  SimpleFixed32SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::sint32>;
     SimpleFixed32SInt32MapMessage();
     ~SimpleFixed32SInt32MapMessage() override;
@@ -815,6 +905,11 @@ class  SimpleFixed64SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::sint32>;
     SimpleFixed64SInt32MapMessage();
     ~SimpleFixed64SInt32MapMessage() override;
@@ -849,6 +944,11 @@ class  SimpleSFixed32SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 9,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::sint32>;
     SimpleSFixed32SInt32MapMessage();
     ~SimpleSFixed32SInt32MapMessage() override;
@@ -883,6 +983,11 @@ class  SimpleSFixed64SInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64SInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 10,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::sint32>;
     SimpleSFixed64SInt32MapMessage();
     ~SimpleSFixed64SInt32MapMessage() override;
@@ -917,6 +1022,11 @@ class  SimpleStringSInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringSInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 13,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QString, QtProtobuf::sint32>;
     SimpleStringSInt32MapMessage();
     ~SimpleStringSInt32MapMessage() override;
@@ -951,6 +1061,11 @@ class  SimpleSInt32SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::sint64>;
     SimpleSInt32SInt64MapMessage();
     ~SimpleSInt32SInt64MapMessage() override;
@@ -985,6 +1100,11 @@ class  SimpleSInt64SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::sint64>;
     SimpleSInt64SInt64MapMessage();
     ~SimpleSInt64SInt64MapMessage() override;
@@ -1019,6 +1139,11 @@ class  SimpleInt32SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 3,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::sint64>;
     SimpleInt32SInt64MapMessage();
     ~SimpleInt32SInt64MapMessage() override;
@@ -1053,6 +1178,11 @@ class  SimpleInt64SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 4,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::sint64>;
     SimpleInt64SInt64MapMessage();
     ~SimpleInt64SInt64MapMessage() override;
@@ -1087,6 +1217,11 @@ class  SimpleUInt32SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 5,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::sint64>;
     SimpleUInt32SInt64MapMessage();
     ~SimpleUInt32SInt64MapMessage() override;
@@ -1121,6 +1256,11 @@ class  SimpleUInt64SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::sint64>;
     SimpleUInt64SInt64MapMessage();
     ~SimpleUInt64SInt64MapMessage() override;
@@ -1155,6 +1295,11 @@ class  SimpleFixed32SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::sint64>;
     SimpleFixed32SInt64MapMessage();
     ~SimpleFixed32SInt64MapMessage() override;
@@ -1189,6 +1334,11 @@ class  SimpleFixed64SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::sint64>;
     SimpleFixed64SInt64MapMessage();
     ~SimpleFixed64SInt64MapMessage() override;
@@ -1223,6 +1373,11 @@ class  SimpleSFixed32SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 9,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::sint64>;
     SimpleSFixed32SInt64MapMessage();
     ~SimpleSFixed32SInt64MapMessage() override;
@@ -1257,6 +1412,11 @@ class  SimpleSFixed64SInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64SInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 10,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::sint64>;
     SimpleSFixed64SInt64MapMessage();
     ~SimpleSFixed64SInt64MapMessage() override;
@@ -1291,6 +1451,11 @@ class  SimpleStringSInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringSInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 13,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QString, QtProtobuf::sint64>;
     SimpleStringSInt64MapMessage();
     ~SimpleStringSInt64MapMessage() override;
@@ -1325,6 +1490,11 @@ class  SimpleSInt32UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::uint32>;
     SimpleSInt32UInt32MapMessage();
     ~SimpleSInt32UInt32MapMessage() override;
@@ -1359,6 +1529,11 @@ class  SimpleSInt64UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::uint32>;
     SimpleSInt64UInt32MapMessage();
     ~SimpleSInt64UInt32MapMessage() override;
@@ -1393,6 +1568,11 @@ class  SimpleInt32UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 3,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::uint32>;
     SimpleInt32UInt32MapMessage();
     ~SimpleInt32UInt32MapMessage() override;
@@ -1427,6 +1607,11 @@ class  SimpleInt64UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 4,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::uint32>;
     SimpleInt64UInt32MapMessage();
     ~SimpleInt64UInt32MapMessage() override;
@@ -1461,6 +1646,11 @@ class  SimpleUInt32UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 5,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::uint32>;
     SimpleUInt32UInt32MapMessage();
     ~SimpleUInt32UInt32MapMessage() override;
@@ -1495,6 +1685,11 @@ class  SimpleUInt64UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::uint32>;
     SimpleUInt64UInt32MapMessage();
     ~SimpleUInt64UInt32MapMessage() override;
@@ -1529,6 +1724,11 @@ class  SimpleFixed32UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::uint32>;
     SimpleFixed32UInt32MapMessage();
     ~SimpleFixed32UInt32MapMessage() override;
@@ -1563,6 +1763,11 @@ class  SimpleFixed64UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::uint32>;
     SimpleFixed64UInt32MapMessage();
     ~SimpleFixed64UInt32MapMessage() override;
@@ -1597,6 +1802,11 @@ class  SimpleSFixed32UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 9,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::uint32>;
     SimpleSFixed32UInt32MapMessage();
     ~SimpleSFixed32UInt32MapMessage() override;
@@ -1631,6 +1841,11 @@ class  SimpleSFixed64UInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64UInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 10,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::uint32>;
     SimpleSFixed64UInt32MapMessage();
     ~SimpleSFixed64UInt32MapMessage() override;
@@ -1665,6 +1880,11 @@ class  SimpleStringUInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringUInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 13,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QString, QtProtobuf::uint32>;
     SimpleStringUInt32MapMessage();
     ~SimpleStringUInt32MapMessage() override;
@@ -1699,6 +1919,11 @@ class  SimpleSInt32UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::uint64>;
     SimpleSInt32UInt64MapMessage();
     ~SimpleSInt32UInt64MapMessage() override;
@@ -1733,6 +1958,11 @@ class  SimpleSInt64UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::uint64>;
     SimpleSInt64UInt64MapMessage();
     ~SimpleSInt64UInt64MapMessage() override;
@@ -1767,6 +1997,11 @@ class  SimpleInt32UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 3,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::uint64>;
     SimpleInt32UInt64MapMessage();
     ~SimpleInt32UInt64MapMessage() override;
@@ -1801,6 +2036,11 @@ class  SimpleInt64UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 4,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::uint64>;
     SimpleInt64UInt64MapMessage();
     ~SimpleInt64UInt64MapMessage() override;
@@ -1835,6 +2075,11 @@ class  SimpleUInt32UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 5,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::uint64>;
     SimpleUInt32UInt64MapMessage();
     ~SimpleUInt32UInt64MapMessage() override;
@@ -1869,6 +2114,11 @@ class  SimpleUInt64UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::uint64>;
     SimpleUInt64UInt64MapMessage();
     ~SimpleUInt64UInt64MapMessage() override;
@@ -1903,6 +2153,11 @@ class  SimpleFixed32UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::uint64>;
     SimpleFixed32UInt64MapMessage();
     ~SimpleFixed32UInt64MapMessage() override;
@@ -1937,6 +2192,11 @@ class  SimpleFixed64UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::uint64>;
     SimpleFixed64UInt64MapMessage();
     ~SimpleFixed64UInt64MapMessage() override;
@@ -1971,6 +2231,11 @@ class  SimpleSFixed32UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 9,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::uint64>;
     SimpleSFixed32UInt64MapMessage();
     ~SimpleSFixed32UInt64MapMessage() override;
@@ -2005,6 +2270,11 @@ class  SimpleSFixed64UInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64UInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 10,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::uint64>;
     SimpleSFixed64UInt64MapMessage();
     ~SimpleSFixed64UInt64MapMessage() override;
@@ -2039,6 +2309,11 @@ class  SimpleStringUInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringUInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 13,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QString, QtProtobuf::uint64>;
     SimpleStringUInt64MapMessage();
     ~SimpleStringUInt64MapMessage() override;
@@ -2073,6 +2348,11 @@ class  SimpleSInt32Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::int32>;
     SimpleSInt32Int32MapMessage();
     ~SimpleSInt32Int32MapMessage() override;
@@ -2107,6 +2387,11 @@ class  SimpleSInt64Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::int32>;
     SimpleSInt64Int32MapMessage();
     ~SimpleSInt64Int32MapMessage() override;
@@ -2141,6 +2426,11 @@ class  SimpleInt32Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 3,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::int32>;
     SimpleInt32Int32MapMessage();
     ~SimpleInt32Int32MapMessage() override;
@@ -2175,6 +2465,11 @@ class  SimpleInt64Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 4,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::int32>;
     SimpleInt64Int32MapMessage();
     ~SimpleInt64Int32MapMessage() override;
@@ -2209,6 +2504,11 @@ class  SimpleUInt32Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 5,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::int32>;
     SimpleUInt32Int32MapMessage();
     ~SimpleUInt32Int32MapMessage() override;
@@ -2243,6 +2543,11 @@ class  SimpleUInt64Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::int32>;
     SimpleUInt64Int32MapMessage();
     ~SimpleUInt64Int32MapMessage() override;
@@ -2277,6 +2582,11 @@ class  SimpleFixed32Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::int32>;
     SimpleFixed32Int32MapMessage();
     ~SimpleFixed32Int32MapMessage() override;
@@ -2311,6 +2621,11 @@ class  SimpleFixed64Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::int32>;
     SimpleFixed64Int32MapMessage();
     ~SimpleFixed64Int32MapMessage() override;
@@ -2345,6 +2660,11 @@ class  SimpleSFixed32Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 9,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::int32>;
     SimpleSFixed32Int32MapMessage();
     ~SimpleSFixed32Int32MapMessage() override;
@@ -2379,6 +2699,11 @@ class  SimpleSFixed64Int32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64Int32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 10,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::int32>;
     SimpleSFixed64Int32MapMessage();
     ~SimpleSFixed64Int32MapMessage() override;
@@ -2413,6 +2738,11 @@ class  SimpleStringInt32MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringInt32MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 13,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QString, QtProtobuf::int32>;
     SimpleStringInt32MapMessage();
     ~SimpleStringInt32MapMessage() override;
@@ -2447,6 +2777,11 @@ class  SimpleSInt32Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::int64>;
     SimpleSInt32Int64MapMessage();
     ~SimpleSInt32Int64MapMessage() override;
@@ -2481,6 +2816,11 @@ class  SimpleSInt64Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::int64>;
     SimpleSInt64Int64MapMessage();
     ~SimpleSInt64Int64MapMessage() override;
@@ -2515,6 +2855,11 @@ class  SimpleInt32Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 3,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::int64>;
     SimpleInt32Int64MapMessage();
     ~SimpleInt32Int64MapMessage() override;
@@ -2549,6 +2894,11 @@ class  SimpleInt64Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 4,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::int64>;
     SimpleInt64Int64MapMessage();
     ~SimpleInt64Int64MapMessage() override;
@@ -2583,6 +2933,11 @@ class  SimpleUInt32Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 5,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::int64>;
     SimpleUInt32Int64MapMessage();
     ~SimpleUInt32Int64MapMessage() override;
@@ -2617,6 +2972,11 @@ class  SimpleUInt64Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::int64>;
     SimpleUInt64Int64MapMessage();
     ~SimpleUInt64Int64MapMessage() override;
@@ -2651,6 +3011,11 @@ class  SimpleFixed32Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::int64>;
     SimpleFixed32Int64MapMessage();
     ~SimpleFixed32Int64MapMessage() override;
@@ -2685,6 +3050,11 @@ class  SimpleFixed64Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::int64>;
     SimpleFixed64Int64MapMessage();
     ~SimpleFixed64Int64MapMessage() override;
@@ -2719,6 +3089,11 @@ class  SimpleSFixed32Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 9,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::int64>;
     SimpleSFixed32Int64MapMessage();
     ~SimpleSFixed32Int64MapMessage() override;
@@ -2753,6 +3128,11 @@ class  SimpleSFixed64Int64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64Int64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 10,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::int64>;
     SimpleSFixed64Int64MapMessage();
     ~SimpleSFixed64Int64MapMessage() override;
@@ -2787,6 +3167,11 @@ class  SimpleStringInt64MapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringInt64MapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 13,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QString, QtProtobuf::int64>;
     SimpleStringInt64MapMessage();
     ~SimpleStringInt64MapMessage() override;
@@ -2821,6 +3206,11 @@ class  SimpleSInt32ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint32, std::shared_ptr<ComplexMessage>>;
     SimpleSInt32ComplexMessageMapMessage();
     ~SimpleSInt32ComplexMessageMapMessage() override;
@@ -2855,6 +3245,11 @@ class  SimpleSInt64ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSInt64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sint64, std::shared_ptr<ComplexMessage>>;
     SimpleSInt64ComplexMessageMapMessage();
     ~SimpleSInt64ComplexMessageMapMessage() override;
@@ -2889,6 +3284,11 @@ class  SimpleInt32ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 3,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int32, std::shared_ptr<ComplexMessage>>;
     SimpleInt32ComplexMessageMapMessage();
     ~SimpleInt32ComplexMessageMapMessage() override;
@@ -2923,6 +3323,11 @@ class  SimpleInt64ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleInt64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 4,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::int64, std::shared_ptr<ComplexMessage>>;
     SimpleInt64ComplexMessageMapMessage();
     ~SimpleInt64ComplexMessageMapMessage() override;
@@ -2957,6 +3362,11 @@ class  SimpleUInt32ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 5,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint32, std::shared_ptr<ComplexMessage>>;
     SimpleUInt32ComplexMessageMapMessage();
     ~SimpleUInt32ComplexMessageMapMessage() override;
@@ -2991,6 +3401,11 @@ class  SimpleUInt64ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleUInt64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 6,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::uint64, std::shared_ptr<ComplexMessage>>;
     SimpleUInt64ComplexMessageMapMessage();
     ~SimpleUInt64ComplexMessageMapMessage() override;
@@ -3025,6 +3440,11 @@ class  SimpleFixed32ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 7,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed32, std::shared_ptr<ComplexMessage>>;
     SimpleFixed32ComplexMessageMapMessage();
     ~SimpleFixed32ComplexMessageMapMessage() override;
@@ -3059,6 +3479,11 @@ class  SimpleFixed64ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleFixed64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 8,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::fixed64, std::shared_ptr<ComplexMessage>>;
     SimpleFixed64ComplexMessageMapMessage();
     ~SimpleFixed64ComplexMessageMapMessage() override;
@@ -3093,6 +3518,11 @@ class  SimpleSFixed32ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed32ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 9,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, std::shared_ptr<ComplexMessage>>;
     SimpleSFixed32ComplexMessageMapMessage();
     ~SimpleSFixed32ComplexMessageMapMessage() override;
@@ -3127,6 +3557,11 @@ class  SimpleSFixed64ComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleSFixed64ComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 10,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, std::shared_ptr<ComplexMessage>>;
     SimpleSFixed64ComplexMessageMapMessage();
     ~SimpleSFixed64ComplexMessageMapMessage() override;
@@ -3161,6 +3596,11 @@ class  SimpleStringComplexMessageMapMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringComplexMessageMapMessage::MapFieldEntry mapField READ mapField WRITE setMapField SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        MapFieldProtoFieldNumber = 13,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     using MapFieldEntry = QHash<QString, std::shared_ptr<ComplexMessage>>;
     SimpleStringComplexMessageMapMessage();
     ~SimpleStringComplexMessageMapMessage() override;
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 d0d7ba33..fc8ed45a 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
@@ -59,6 +59,11 @@ class  RepeatedStringMessage : public QProtobufMessage
     Q_PROPERTY(QStringList testRepeatedString READ testRepeatedString WRITE setTestRepeatedString SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedStringProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedStringMessage();
     ~RepeatedStringMessage() override;
     RepeatedStringMessage(const RepeatedStringMessage &other);
@@ -92,6 +97,11 @@ class  RepeatedDoubleMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::doubleList testRepeatedDouble READ testRepeatedDouble WRITE setTestRepeatedDouble SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedDoubleProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedDoubleMessage();
     ~RepeatedDoubleMessage() override;
     RepeatedDoubleMessage(const RepeatedDoubleMessage &other);
@@ -129,6 +139,11 @@ class  RepeatedBytesMessage : public QProtobufMessage
     Q_PROPERTY(QByteArrayList testRepeatedBytes READ testRepeatedBytes WRITE setTestRepeatedBytes SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedBytesProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedBytesMessage();
     ~RepeatedBytesMessage() override;
     RepeatedBytesMessage(const RepeatedBytesMessage &other);
@@ -162,6 +177,11 @@ class  RepeatedFloatMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::floatList testRepeatedFloat READ testRepeatedFloat WRITE setTestRepeatedFloat SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedFloatProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedFloatMessage();
     ~RepeatedFloatMessage() override;
     RepeatedFloatMessage(const RepeatedFloatMessage &other);
@@ -199,6 +219,11 @@ class  RepeatedComplexMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::ComplexMessageRepeated testRepeatedComplexData READ testRepeatedComplex WRITE setTestRepeatedComplex SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedComplexProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedComplexMessage();
     ~RepeatedComplexMessage() override;
     RepeatedComplexMessage(const RepeatedComplexMessage &other);
@@ -232,6 +257,11 @@ class  RepeatedSIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedSIntMessage();
     ~RepeatedSIntMessage() override;
     RepeatedSIntMessage(const RepeatedSIntMessage &other);
@@ -269,6 +299,11 @@ class  RepeatedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedIntMessage();
     ~RepeatedIntMessage() override;
     RepeatedIntMessage(const RepeatedIntMessage &other);
@@ -306,6 +341,11 @@ class  RepeatedUIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedUIntMessage();
     ~RepeatedUIntMessage() override;
     RepeatedUIntMessage(const RepeatedUIntMessage &other);
@@ -343,6 +383,11 @@ class  RepeatedSInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedSInt64Message();
     ~RepeatedSInt64Message() override;
     RepeatedSInt64Message(const RepeatedSInt64Message &other);
@@ -380,6 +425,11 @@ class  RepeatedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedInt64Message();
     ~RepeatedInt64Message() override;
     RepeatedInt64Message(const RepeatedInt64Message &other);
@@ -417,6 +467,11 @@ class  RepeatedUInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedUInt64Message();
     ~RepeatedUInt64Message() override;
     RepeatedUInt64Message(const RepeatedUInt64Message &other);
@@ -454,6 +509,11 @@ class  RepeatedFixedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedFixedIntMessage();
     ~RepeatedFixedIntMessage() override;
     RepeatedFixedIntMessage(const RepeatedFixedIntMessage &other);
@@ -491,6 +551,11 @@ class  RepeatedSFixedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedSFixedIntMessage();
     ~RepeatedSFixedIntMessage() override;
     RepeatedSFixedIntMessage(const RepeatedSFixedIntMessage &other);
@@ -528,6 +593,11 @@ class  RepeatedFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedFixedInt64Message();
     ~RepeatedFixedInt64Message() override;
     RepeatedFixedInt64Message(const RepeatedFixedInt64Message &other);
@@ -565,6 +635,11 @@ class  RepeatedSFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedSFixedInt64Message();
     ~RepeatedSFixedInt64Message() override;
     RepeatedSFixedInt64Message(const RepeatedSFixedInt64Message &other);
@@ -602,6 +677,11 @@ class  RepeatedBoolMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::boolList testRepeatedBool READ testRepeatedBool WRITE setTestRepeatedBool SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedBoolProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedBoolMessage();
     ~RepeatedBoolMessage() override;
     RepeatedBoolMessage(const RepeatedBoolMessage &other);
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 11ceada1..38e6b300 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
@@ -54,6 +54,11 @@ class  RepeatedNonPackedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedIntMessage();
     ~RepeatedNonPackedIntMessage() override;
     RepeatedNonPackedIntMessage(const RepeatedNonPackedIntMessage &other);
@@ -91,6 +96,11 @@ class  RepeatedNonPackedSIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedSIntMessage();
     ~RepeatedNonPackedSIntMessage() override;
     RepeatedNonPackedSIntMessage(const RepeatedNonPackedSIntMessage &other);
@@ -128,6 +138,11 @@ class  RepeatedNonPackedUIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedUIntMessage();
     ~RepeatedNonPackedUIntMessage() override;
     RepeatedNonPackedUIntMessage(const RepeatedNonPackedUIntMessage &other);
@@ -165,6 +180,11 @@ class  RepeatedNonPackedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedInt64Message();
     ~RepeatedNonPackedInt64Message() override;
     RepeatedNonPackedInt64Message(const RepeatedNonPackedInt64Message &other);
@@ -202,6 +222,11 @@ class  RepeatedNonPackedSInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedSInt64Message();
     ~RepeatedNonPackedSInt64Message() override;
     RepeatedNonPackedSInt64Message(const RepeatedNonPackedSInt64Message &other);
@@ -239,6 +264,11 @@ class  RepeatedNonPackedUInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedUInt64Message();
     ~RepeatedNonPackedUInt64Message() override;
     RepeatedNonPackedUInt64Message(const RepeatedNonPackedUInt64Message &other);
@@ -276,6 +306,11 @@ class  RepeatedNonPackedFixedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedFixedIntMessage();
     ~RepeatedNonPackedFixedIntMessage() override;
     RepeatedNonPackedFixedIntMessage(const RepeatedNonPackedFixedIntMessage &other);
@@ -313,6 +348,11 @@ class  RepeatedNonPackedSFixedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedSFixedIntMessage();
     ~RepeatedNonPackedSFixedIntMessage() override;
     RepeatedNonPackedSFixedIntMessage(const RepeatedNonPackedSFixedIntMessage &other);
@@ -350,6 +390,11 @@ class  RepeatedNonPackedFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedFixedInt64Message();
     ~RepeatedNonPackedFixedInt64Message() override;
     RepeatedNonPackedFixedInt64Message(const RepeatedNonPackedFixedInt64Message &other);
@@ -387,6 +432,11 @@ class  RepeatedNonPackedSFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedSFixedInt64Message();
     ~RepeatedNonPackedSFixedInt64Message() override;
     RepeatedNonPackedSFixedInt64Message(const RepeatedNonPackedSFixedInt64Message &other);
@@ -424,6 +474,11 @@ class  RepeatedNonPackedBoolMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::boolList testRepeatedBool READ testRepeatedBool WRITE setTestRepeatedBool SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedBoolProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedBoolMessage();
     ~RepeatedNonPackedBoolMessage() override;
     RepeatedNonPackedBoolMessage(const RepeatedNonPackedBoolMessage &other);
@@ -461,6 +516,11 @@ class  RepeatedNonPackedDoubleMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::doubleList testRepeatedDouble READ testRepeatedDouble WRITE setTestRepeatedDouble SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedDoubleProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedDoubleMessage();
     ~RepeatedNonPackedDoubleMessage() override;
     RepeatedNonPackedDoubleMessage(const RepeatedNonPackedDoubleMessage &other);
@@ -498,6 +558,11 @@ class  RepeatedNonPackedFloatMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::floatList testRepeatedFloat READ testRepeatedFloat WRITE setTestRepeatedFloat SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedFloatProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedFloatMessage();
     ~RepeatedNonPackedFloatMessage() override;
     RepeatedNonPackedFloatMessage(const RepeatedNonPackedFloatMessage &other);
@@ -536,6 +601,12 @@ class  NonPackedIntMessageWithExtraMember : public QProtobufMessage
     Q_PROPERTY(QString extra READ extra WRITE setExtra SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+        ExtraProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     NonPackedIntMessageWithExtraMember();
     ~NonPackedIntMessageWithExtraMember() override;
     NonPackedIntMessageWithExtraMember(const NonPackedIntMessageWithExtraMember &other);
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 11ceada1..38e6b300 100644
--- a/tests/auto/protobufgen/data/expected_result/packed/repeatednonpackedmessages.qpb.h
+++ b/tests/auto/protobufgen/data/expected_result/packed/repeatednonpackedmessages.qpb.h
@@ -54,6 +54,11 @@ class  RepeatedNonPackedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedIntMessage();
     ~RepeatedNonPackedIntMessage() override;
     RepeatedNonPackedIntMessage(const RepeatedNonPackedIntMessage &other);
@@ -91,6 +96,11 @@ class  RepeatedNonPackedSIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedSIntMessage();
     ~RepeatedNonPackedSIntMessage() override;
     RepeatedNonPackedSIntMessage(const RepeatedNonPackedSIntMessage &other);
@@ -128,6 +138,11 @@ class  RepeatedNonPackedUIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedUIntMessage();
     ~RepeatedNonPackedUIntMessage() override;
     RepeatedNonPackedUIntMessage(const RepeatedNonPackedUIntMessage &other);
@@ -165,6 +180,11 @@ class  RepeatedNonPackedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedInt64Message();
     ~RepeatedNonPackedInt64Message() override;
     RepeatedNonPackedInt64Message(const RepeatedNonPackedInt64Message &other);
@@ -202,6 +222,11 @@ class  RepeatedNonPackedSInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedSInt64Message();
     ~RepeatedNonPackedSInt64Message() override;
     RepeatedNonPackedSInt64Message(const RepeatedNonPackedSInt64Message &other);
@@ -239,6 +264,11 @@ class  RepeatedNonPackedUInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedUInt64Message();
     ~RepeatedNonPackedUInt64Message() override;
     RepeatedNonPackedUInt64Message(const RepeatedNonPackedUInt64Message &other);
@@ -276,6 +306,11 @@ class  RepeatedNonPackedFixedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedFixedIntMessage();
     ~RepeatedNonPackedFixedIntMessage() override;
     RepeatedNonPackedFixedIntMessage(const RepeatedNonPackedFixedIntMessage &other);
@@ -313,6 +348,11 @@ class  RepeatedNonPackedSFixedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedSFixedIntMessage();
     ~RepeatedNonPackedSFixedIntMessage() override;
     RepeatedNonPackedSFixedIntMessage(const RepeatedNonPackedSFixedIntMessage &other);
@@ -350,6 +390,11 @@ class  RepeatedNonPackedFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedFixedInt64Message();
     ~RepeatedNonPackedFixedInt64Message() override;
     RepeatedNonPackedFixedInt64Message(const RepeatedNonPackedFixedInt64Message &other);
@@ -387,6 +432,11 @@ class  RepeatedNonPackedSFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedSFixedInt64Message();
     ~RepeatedNonPackedSFixedInt64Message() override;
     RepeatedNonPackedSFixedInt64Message(const RepeatedNonPackedSFixedInt64Message &other);
@@ -424,6 +474,11 @@ class  RepeatedNonPackedBoolMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::boolList testRepeatedBool READ testRepeatedBool WRITE setTestRepeatedBool SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedBoolProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedBoolMessage();
     ~RepeatedNonPackedBoolMessage() override;
     RepeatedNonPackedBoolMessage(const RepeatedNonPackedBoolMessage &other);
@@ -461,6 +516,11 @@ class  RepeatedNonPackedDoubleMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::doubleList testRepeatedDouble READ testRepeatedDouble WRITE setTestRepeatedDouble SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedDoubleProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedDoubleMessage();
     ~RepeatedNonPackedDoubleMessage() override;
     RepeatedNonPackedDoubleMessage(const RepeatedNonPackedDoubleMessage &other);
@@ -498,6 +558,11 @@ class  RepeatedNonPackedFloatMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::floatList testRepeatedFloat READ testRepeatedFloat WRITE setTestRepeatedFloat SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedFloatProtoFieldNumber = 1,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     RepeatedNonPackedFloatMessage();
     ~RepeatedNonPackedFloatMessage() override;
     RepeatedNonPackedFloatMessage(const RepeatedNonPackedFloatMessage &other);
@@ -536,6 +601,12 @@ class  NonPackedIntMessageWithExtraMember : public QProtobufMessage
     Q_PROPERTY(QString extra READ extra WRITE setExtra SCRIPTABLE true)
 
 public:
+    enum QtProtobufFieldEnum {
+        TestRepeatedIntProtoFieldNumber = 1,
+        ExtraProtoFieldNumber = 2,
+    };
+    Q_ENUM(QtProtobufFieldEnum)
+
     NonPackedIntMessageWithExtraMember();
     ~NonPackedIntMessageWithExtraMember() override;
     NonPackedIntMessageWithExtraMember(const NonPackedIntMessageWithExtraMember &other);
diff --git a/tests/auto/protobufgen/tst_qtprotobufgen.cpp b/tests/auto/protobufgen/tst_qtprotobufgen.cpp
index e4174697..c2de0215 100644
--- a/tests/auto/protobufgen/tst_qtprotobufgen.cpp
+++ b/tests/auto/protobufgen/tst_qtprotobufgen.cpp
@@ -313,7 +313,7 @@ void tst_qtprotobufgen::cmdLineGeneratedFile_data()
 
         QTest::addRow("fieldindexrange%s", extension.data())
                 << "fieldindexrange"
-                << "FIELD_ENUM"
+                << ""
                 << "/fieldenum/"
                 << QString(extension)
                 << "";