Move enums to the nested namespace out of class

Protobuf allows the following construction: message A { enum AEnum { AVal0 = 0; } B.BEnum val = 1; } message B { enum BEnum { BVal0 = 0; } A.AEnum val = 1; } This requires forward declaration of nested enums, that is not possible in C++. To solve this problem we may do the same trick that we do for nested messages already. This patch moves the nested enum type out of class to the _QtProtobufNested namespace. The solution require the enum name specification when using enums from this moment, since the owning messages only contain type aliases now. So from example above to access the AVal0 you need to use the full qualifier: A::AEnum::AVal0 The new generated code structure registrates Qml types using the built-in macros, that unlocks direct linking of backing library without the need of Qml plugin usage. [ChangeLog][Protobuf] Nested enums moved out of message classes to the nested namespace, same as the nested messages. [ChangeLog][Protobuf][Qml] The geneated protobuf Qml modules do not require the use of Qml plugins. Fixes: QTBUG-115800 Change-Id: Ia67fcbecf492c3fd41350eada4d62fc9e5ea4dab Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io> Reviewed-by: Konrad Kujawa <konrad.kujawa@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
author: Alexey Edelev <alexey.edelev@qt.io> 2023-08-05 17:10:53 +0200
committer: Alexey Edelev <alexey.edelev@qt.io> 2023-08-18 19:01:25 +0200
commit: b089a773e9a9af6f06d1a18cb8776f4a5fedcd1c (patch)
tree: 12c6afbbb82c20e69cdde1a64ea3c26d658e9f73
parent: b839d2d7573f2d53164b47e198dcf70dfeb55c1f (diff)
51 files changed, 5900 insertions, 2337 deletions
diff --git a/examples/grpc/chat/client/chatmessagemodel.cpp b/examples/grpc/chat/client/chatmessagemodel.cpp
index d4db74e..d89432d 100644
--- a/examples/grpc/chat/client/chatmessagemodel.cpp
+++ b/examples/grpc/chat/client/chatmessagemodel.cpp
@@ -59,7 +59,7 @@ QVariant ChatMessageModel::data(const QModelIndex &index, int role) const
 
     switch (role) {
     case Content:
-        if (data.type() == qtgrpc::examples::chat::ChatMessage::Image)
+        if (data.type() == qtgrpc::examples::chat::ChatMessage::ContentType::Image)
             return QVariant::fromValue(getImageScaled(data.content()));
         else
             return QVariant::fromValue(getText(data.content()));
diff --git a/examples/grpc/chat/client/simplechatengine.cpp b/examples/grpc/chat/client/simplechatengine.cpp
index 1c77f8b..73c3c3f 100644
--- a/examples/grpc/chat/client/simplechatengine.cpp
+++ b/examples/grpc/chat/client/simplechatengine.cpp
@@ -86,7 +86,7 @@ void SimpleChatEngine::sendMessage(const QString &content)
     // ![2]
     qtgrpc::examples::chat::ChatMessage msg;
     msg.setContent(content.toUtf8());
-    msg.setType(qtgrpc::examples::chat::ChatMessage::Text);
+    msg.setType(qtgrpc::examples::chat::ChatMessage::ContentType::Text);
     msg.setTimestamp(QDateTime::currentMSecsSinceEpoch());
     msg.setFrom(m_userName);
     m_client->sendMessage(msg);
@@ -146,7 +146,7 @@ void SimpleChatEngine::sendImageFromClipboard()
 
     qtgrpc::examples::chat::ChatMessage msg;
     msg.setContent(imgData);
-    msg.setType(qtgrpc::examples::chat::ChatMessage::Image);
+    msg.setType(qtgrpc::examples::chat::ChatMessage::ContentType::Image);
     msg.setTimestamp(QDateTime::currentMSecsSinceEpoch());
     msg.setFrom(m_userName);
     m_client->sendMessage(msg);
diff --git a/examples/protobuf/sensors/client/clientconsole.cpp b/examples/protobuf/sensors/client/clientconsole.cpp
index 2fe9a62..fa82adb 100644
--- a/examples/protobuf/sensors/client/clientconsole.cpp
+++ b/examples/protobuf/sensors/client/clientconsole.cpp
@@ -27,7 +27,8 @@ void ClientConsole::onTemperatureUpdated(const qt::examples::sensors::Temperatur
     ui->temperature->setText(
             QString("%1 %2")
                     .arg(QString::number(temp.value()))
-                    .arg(temp.units() == qt::examples::sensors::Temperature::Celsius ? 'C' : 'F'));
+                    .arg(temp.units() == qt::examples::sensors::Temperature::Unit::Celsius ? 'C'
+                                                                                           : 'F'));
 }
 
 void ClientConsole::onWarning(const qt::examples::sensors::WarningNotification &warn)
diff --git a/examples/protobuf/sensors/emulator/emulatorconsole.cpp b/examples/protobuf/sensors/emulator/emulatorconsole.cpp
index 99eb87f..4c64fed 100644
--- a/examples/protobuf/sensors/emulator/emulatorconsole.cpp
+++ b/examples/protobuf/sensors/emulator/emulatorconsole.cpp
@@ -38,8 +38,8 @@ EmulatorConsole::EmulatorConsole(QWidget *parent) : QWidget(parent), ui(new Ui::
         qt::examples::sensors::Temperature temp;
         temp.setValue(ui->temperatureValue->text().toInt());
         temp.setUnits(ui->celciusRadio->isChecked()
-                              ? qt::examples::sensors::Temperature::Celsius
-                              : qt::examples::sensors::Temperature::Farenheit);
+                              ? qt::examples::sensors::Temperature::Unit::Celsius
+                              : qt::examples::sensors::Temperature::Unit::Farenheit);
         emit temperatureUpdated(temp);
     });
 
diff --git a/src/protobufqttypes/protobufqtcoretypes/qtprotobufqtcoretypes.cpp b/src/protobufqttypes/protobufqtcoretypes/qtprotobufqtcoretypes.cpp
index 69f6c03..b5ebe93 100644
--- a/src/protobufqttypes/protobufqtcoretypes/qtprotobufqtcoretypes.cpp
+++ b/src/protobufqttypes/protobufqtcoretypes/qtprotobufqtcoretypes.cpp
@@ -107,7 +107,7 @@ static std::optional<QtProtobufPrivate::QtCore::QDate> convert(const QDate &from
 static QTimeZone::Initialization getTimeZoneInitialization(
         QtProtobufPrivate::QtCore::QTimeZone::TimeSpec protoSpec)
 {
-    return protoSpec == QtProtobufPrivate::QtCore::QTimeZone::LocalTime
+    return protoSpec == QtProtobufPrivate::QtCore::QTimeZone::TimeSpec::LocalTime
             ? QTimeZone::LocalTime : QTimeZone::UTC;
 }
 
@@ -149,14 +149,14 @@ static std::optional<QtProtobufPrivate::QtCore::QTimeZone> convert(const QTimeZo
         result.setIanaId(from.id());
 #else
         qInfo() << "Result will be treated like UTC.";
-        result.setTimeSpec(QtProtobufPrivate::QtCore::QTimeZone::UTC);
+        result.setTimeSpec(QtProtobufPrivate::QtCore::QTimeZone::TimeSpec::UTC);
 #endif // QT_CONFIG(timezone)
         break;
     case Qt::LocalTime:
-        result.setTimeSpec(QtProtobufPrivate::QtCore::QTimeZone::LocalTime);
+        result.setTimeSpec(QtProtobufPrivate::QtCore::QTimeZone::TimeSpec::LocalTime);
         break;
     case Qt::UTC:
-        result.setTimeSpec(QtProtobufPrivate::QtCore::QTimeZone::UTC);
+        result.setTimeSpec(QtProtobufPrivate::QtCore::QTimeZone::TimeSpec::UTC);
         break;
     case Qt::OffsetFromUTC:
         result.setOffsetSeconds(from.fixedSecondsAheadOfUtc());
diff --git a/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake b/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake
index 70bf43c..fa2a646 100644
--- a/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake
+++ b/src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake
@@ -315,10 +315,6 @@ function(qt6_add_protobuf target)
             )
         endif()
         list(APPEND generation_options "QML_URI=${qml_uri}")
-
-        string(REPLACE "." "_" qml_plugin_base_name "${qml_uri}")
-        list(APPEND qml_sources
-            "${output_directory}/${qml_plugin_base_name}plugin.cpp")
     endif()
 
     if(arg_PROTO_INCLUDES)
@@ -437,14 +433,10 @@ function(qt6_add_protobuf target)
         qt_policy(SET QTP0001 NEW)
         qt6_add_qml_module(${target}
             URI ${qml_uri}
-            NO_GENERATE_PLUGIN_SOURCE
-            NO_PLUGIN_OPTIONAL
             PLUGIN_TARGET "${target}plugin"
             VERSION 1.0
             OUTPUT_DIRECTORY "${qml_module_output_full_path}"
         )
-        target_sources(${target}plugin PRIVATE
-            "${output_directory}/${qml_plugin_base_name}plugin.cpp")
         set_target_properties(${target}plugin
             PROPERTIES
                 AUTOMOC ON
diff --git a/src/tools/qtprotobufgen/enumdeclarationprinter.cpp b/src/tools/qtprotobufgen/enumdeclarationprinter.cpp
index b378e64..83a1330 100644
--- a/src/tools/qtprotobufgen/enumdeclarationprinter.cpp
+++ b/src/tools/qtprotobufgen/enumdeclarationprinter.cpp
@@ -22,18 +22,22 @@ EnumDeclarationPrinter::~EnumDeclarationPrinter() = default;
 
 void EnumDeclarationPrinter::startEnum()
 {
-    printEnumClass();
+    m_printer->Print(m_typeMap, CommonTemplates::EnumGadgetDeclarationTemplate());
+
     if (!m_typeMap["export_macro"].empty())
-        m_printer->Print(m_typeMap, CommonTemplates::EnumRegistrationDeclaration());
+        m_printer->Print(m_typeMap, CommonTemplates::QNamespaceDeclarationTemplate());
     else
-        m_printer->Print(m_typeMap, CommonTemplates::EnumRegistrationDeclarationNoExport());
+        m_printer->Print(m_typeMap, CommonTemplates::QNamespaceDeclarationNoExportTemplate());
+
+    if (Options::instance().hasQml())
+        m_printer->Print(m_typeMap, CommonTemplates::QmlNamedElement());
+
+    m_printer->Print("\n");
 }
 
 void EnumDeclarationPrinter::printEnum()
 {
-    auto typeMap = common::produceEnumTypeMap(m_descriptor, nullptr);
-
-    m_printer->Print(typeMap, CommonTemplates::EnumDefinitionTemplate());
+    m_printer->Print(m_typeMap, CommonTemplates::EnumDefinitionTemplate());
 
     Indent();
     int numValues = m_descriptor->value_count();
@@ -44,15 +48,19 @@ void EnumDeclarationPrinter::printEnum()
                          CommonTemplates::EnumFieldTemplate());
     }
     Outdent();
+
     m_printer->Print(CommonTemplates::SemicolonBlockEnclosureTemplate());
-    m_printer->Print(typeMap, CommonTemplates::QEnumNSTemplate());
-    m_printer->Print(typeMap, CommonTemplates::UsingRepeatedEnumTemplate());
-}
+    m_printer->Print(m_typeMap, CommonTemplates::QEnumNSTemplate());
+    m_printer->Print(m_typeMap, CommonTemplates::UsingRepeatedEnumTemplate());
 
-void EnumDeclarationPrinter::printEnumClass()
-{
     if (!m_typeMap["export_macro"].empty())
-        m_printer->Print(m_typeMap, CommonTemplates::EnumDeclarationTemplate());
+        m_printer->Print(m_typeMap, CommonTemplates::EnumRegistrationDeclaration());
     else
-        m_printer->Print(m_typeMap, CommonTemplates::EnumDeclarationNoExportTemplate());
+        m_printer->Print(m_typeMap, CommonTemplates::EnumRegistrationDeclarationNoExport());
+}
+
+void EnumDeclarationPrinter::encloseEnum()
+{
+    m_printer->Print({ { "scope_namespaces", m_typeMap["enum_gadget"] } },
+                     CommonTemplates::NamespaceClosingTemplate());
 }
diff --git a/src/tools/qtprotobufgen/enumdeclarationprinter.h b/src/tools/qtprotobufgen/enumdeclarationprinter.h
index 0b8bdad..9dc3f7b 100644
--- a/src/tools/qtprotobufgen/enumdeclarationprinter.h
+++ b/src/tools/qtprotobufgen/enumdeclarationprinter.h
@@ -27,8 +27,7 @@ public:
 private:
     void startEnum();
     void printEnum();
-    void encloseEnum() { encloseClass(); }
-    void printEnumClass();
+    void encloseEnum();
 };
 
 } // namespace QtProtobuf
diff --git a/src/tools/qtprotobufgen/messagedeclarationprinter.cpp b/src/tools/qtprotobufgen/messagedeclarationprinter.cpp
index baea6ab..b4d3264 100644
--- a/src/tools/qtprotobufgen/messagedeclarationprinter.cpp
+++ b/src/tools/qtprotobufgen/messagedeclarationprinter.cpp
@@ -33,14 +33,31 @@ void MessageDeclarationPrinter::printClassForwardDeclarationPrivate()
     m_printer->Print(m_typeMap, CommonTemplates::ClassMessageForwardDeclarationTemplate());
     m_printer->Print(m_typeMap, CommonTemplates::UsingMessageTemplate());
 
-    if (common::hasNestedMessages(m_descriptor)) {
+    if (common::hasNestedTypes(m_descriptor)) {
         auto scopeNamespaces = common::getNestedScopeNamespace(m_typeMap["classname"]);
         m_printer->Print(scopeNamespaces, CommonTemplates::NamespaceTemplate());
+
+        m_printer->Print({ { "type", CommonTemplates::QtProtobufFieldEnum() } },
+                         CommonTemplates::EnumClassForwardDeclarationTemplate());
+
+        for (int i = 0; i < m_descriptor->enum_type_count(); ++i) {
+            m_printer->Print(common::produceEnumTypeMap(m_descriptor->enum_type(i), nullptr),
+                             CommonTemplates::EnumForwardDeclarationTemplate());
+        }
+
+        common::iterateOneofFields(
+                m_descriptor, [this](const OneofDescriptor *, PropertyMap typeMap) {
+                    m_printer->Print(typeMap,
+                                     CommonTemplates::EnumClassForwardDeclarationTemplate());
+                });
+
         common::iterateNestedMessages(m_descriptor, [this](const Descriptor *nestedMessage) {
             MessageDeclarationPrinter nesterPrinter(nestedMessage, m_printer);
             nesterPrinter.printClassForwardDeclarationPrivate();
         });
+
         m_printer->Print(scopeNamespaces, CommonTemplates::NamespaceClosingTemplate());
+        m_printer->Print("\n");
     }
 }
 
@@ -61,9 +78,22 @@ void MessageDeclarationPrinter::printClassDeclarationPrivate()
     printClassBody();
     encloseClass();
 
-    if (common::hasNestedMessages(m_descriptor)) {
+    if (common::hasNestedTypes(m_descriptor)) {
         auto scopeNamespaces = common::getNestedScopeNamespace(m_typeMap["classname"]);
         m_printer->Print(scopeNamespaces, CommonTemplates::NamespaceTemplate());
+
+        if (!m_typeMap["export_macro"].empty())
+            m_printer->Print(m_typeMap, CommonTemplates::QNamespaceDeclarationTemplate());
+        else
+            m_printer->Print(m_typeMap, CommonTemplates::QNamespaceDeclarationNoExportTemplate());
+
+        if (Options::instance().hasQml())
+            m_printer->Print(m_typeMap, CommonTemplates::QmlNamedElement());
+
+        m_printer->Print("\n");
+
+        printEnums();
+
         common::iterateNestedMessages(m_descriptor, [this](const Descriptor *nestedMessage) {
             MessageDeclarationPrinter nesterPrinter(nestedMessage, m_printer);
             nesterPrinter.printClassDeclarationPrivate();
@@ -118,10 +148,29 @@ void MessageDeclarationPrinter::printMaps()
 void MessageDeclarationPrinter::printNested()
 {
     Indent();
+    m_printer->Print({ { "type", CommonTemplates::QtProtobufFieldEnum() },
+                       { "scope_namespaces",
+                         m_typeMap["classname"] + CommonTemplates::QtProtobufNestedNamespace() } },
+                     CommonTemplates::UsingEnumTemplate());
+
+    for (int i = 0; i < m_descriptor->enum_type_count(); ++i) {
+        const auto *enumDescr = m_descriptor->enum_type(i);
+        auto typeMap = common::produceEnumTypeMap(enumDescr, m_descriptor);
+        m_printer->Print(typeMap, CommonTemplates::UsingEnumTemplate());
+        m_printer->Print(typeMap, CommonTemplates::UsingRepeatedEnumTemplate());
+    }
+
+    common::iterateOneofFields(m_descriptor, [this](const OneofDescriptor *, PropertyMap typeMap) {
+        typeMap["scope_namespaces"] =
+                m_typeMap["classname"] + CommonTemplates::QtProtobufNestedNamespace();
+        m_printer->Print(typeMap, CommonTemplates::UsingEnumTemplate());
+    });
+
     common::iterateNestedMessages(m_descriptor, [&](const Descriptor *nestedMessage) {
         m_printer->Print(common::produceMessageTypeMap(nestedMessage, m_descriptor),
                         CommonTemplates::UsingNestedMessageTemplate());
     });
+
     Outdent();
 }
 
@@ -329,14 +378,11 @@ void MessageDeclarationPrinter::printPrivateSetters()
 
 void MessageDeclarationPrinter::printEnums()
 {
-    Indent();
     if (Options::instance().generateFieldEnum())
         printFieldEnum();
-    if (m_descriptor->enum_type_count() > 0)
-        printQEnums();
-    if (m_descriptor->oneof_decl_count() > 0)
-        printOneofEnums();
-    Outdent();
+
+    printQEnums();
+    printOneofEnums();
 }
 
 void MessageDeclarationPrinter::printQEnums()
@@ -355,12 +401,7 @@ void MessageDeclarationPrinter::printQEnums()
         }
         Outdent();
         m_printer->Print(CommonTemplates::SemicolonBlockEnclosureTemplate());
-        m_printer->Print(typeMap, CommonTemplates::QEnumTemplate());
-    }
-
-    for (int i = 0; i < m_descriptor->enum_type_count(); ++i) {
-        const auto *enumDescr = m_descriptor->enum_type(i);
-        auto typeMap = common::produceEnumTypeMap(enumDescr, m_descriptor);
+        m_printer->Print(typeMap, CommonTemplates::QEnumNSTemplate());
         m_printer->Print(typeMap, CommonTemplates::UsingRepeatedEnumTemplate());
     }
 }
@@ -368,7 +409,7 @@ void MessageDeclarationPrinter::printQEnums()
 void MessageDeclarationPrinter::printOneofEnums()
 {
     common::iterateOneofFields(
-            m_descriptor, [this](const OneofDescriptor *oneofDescr, PropertyMap &typeMap) {
+            m_descriptor, [this](const OneofDescriptor *oneofDescr, const PropertyMap &typeMap) {
                 m_printer->Print(typeMap, CommonTemplates::EnumClassDefinitionTemplate());
                 Indent();
                 m_printer->Print({ { "enumvalue", "UninitializedField" },
@@ -383,8 +424,7 @@ void MessageDeclarationPrinter::printOneofEnums()
                 }
                 Outdent();
                 m_printer->Print(CommonTemplates::SemicolonBlockEnclosureTemplate());
-                m_printer->Print(typeMap, CommonTemplates::QEnumTemplate());
-                m_printer->Print("\n");
+                m_printer->Print(typeMap, CommonTemplates::QEnumNSTemplate());
             });
 }
 
@@ -401,7 +441,6 @@ void MessageDeclarationPrinter::printClassBody()
     printProperties();
 
     printPublicBlock();
-    printEnums();
     printNested();
     printMaps();
 
@@ -455,7 +494,6 @@ void MessageDeclarationPrinter::printFieldEnum()
         Outdent();
         m_printer->Print(CommonTemplates::SemicolonBlockEnclosureTemplate());
         m_printer->Print({ { "type", CommonTemplates::QtProtobufFieldEnum() } },
-                         CommonTemplates::QEnumTemplate());
-        m_printer->Print("\n");
+                         CommonTemplates::QEnumNSTemplate());
     }
 }
diff --git a/src/tools/qtprotobufgen/qprotobufgenerator.cpp b/src/tools/qtprotobufgen/qprotobufgenerator.cpp
index d03ba47..a215642 100644
--- a/src/tools/qtprotobufgen/qprotobufgenerator.cpp
+++ b/src/tools/qtprotobufgen/qprotobufgenerator.cpp
@@ -124,119 +124,9 @@ bool QProtobufGenerator::GenerateAll(const std::vector<const FileDescriptor *> &
     assert(generatorContext != nullptr);
 
     Options::setFromString(parameter);
-    if (Options::instance().hasQml()) {
-        std::set<std::string> headersContainer;
-        // Collect all required includes
-        std::transform(files.begin(), files.end(), std::inserter(headersContainer,
-                                                                 headersContainer.begin()),
-                       [](const auto &it) {
-                           std::string filename = utils::extractFileBasename(it->name());
-                           return generateBaseName(it, filename);
-                       });
-
-        std::string qmlPackageUri;
-        for (const FileDescriptor *file: files) {
-            assert(file != nullptr);
-            for (int i = 0; i < file->dependency_count(); ++i) {
-                if (file->dependency(i)->name() == "QtCore/QtCore.proto"
-                    || file->dependency(i)->name() == "QtGui/QtGui.proto") {
-                    continue;
-                }
-                if (file->dependency(i)->name() == "google/protobuf/any.proto") {
-                    headersContainer.insert("QtProtobufWellKnownTypes/qprotobufanysupport.h");
-                    continue;
-                }
-                std::string filename = utils::extractFileBasename(file->dependency(i)->name());
-                headersContainer.insert(utils::removeFileSuffix(generateBaseName(file, filename)));
-            }
-        }
-        qmlPackageUri = Options::instance().qmlUri();
-
-        // Fill QML plugin openning
-        std::string pluginFileName = utils::replace(qmlPackageUri, ".", "_");
-        std::unique_ptr<io::ZeroCopyOutputStream> qmlPluginStream(
-                generatorContext->Open(pluginFileName + "plugin.cpp"));
-        std::shared_ptr<Printer> registrationPluginPrinter(new Printer(qmlPluginStream.get(),
-                                                                       '$'));
-        GenerateQmlPluginIntro(registrationPluginPrinter.get(), headersContainer, qmlPackageUri);
-
-        for (const FileDescriptor *file: files) {
-            GenerateQmlPluginSource(file, registrationPluginPrinter);
-        }
-        registrationPluginPrinter->Print(CommonTemplates::QmlRegisterProtobufTypes());
-        registrationPluginPrinter->Indent();
-        registrationPluginPrinter->Indent();
-        registrationPluginPrinter->Print(CommonTemplates::SimpleBlockEnclosureTemplate());
-        registrationPluginPrinter->Outdent();
-        registrationPluginPrinter->Outdent();
-        registrationPluginPrinter->Print(CommonTemplates::SemicolonBlockEnclosureTemplate());
-        // Include the moc file:
-        registrationPluginPrinter->Print({{"source_file", pluginFileName + "plugin.moc"}},
-                                         CommonTemplates::MocIncludeTemplate());
-    }
-
     return CodeGenerator::GenerateAll(files, parameter, generatorContext, error);
 }
 
-void QProtobufGenerator::GenerateQmlPluginIntro(Printer *printer,
-                                                const std::set<std::string> &headersContainer,
-                                                const std::string &qmlPackageUri) const
-{
-    std::vector<std::string> packageNameList = utils::split(qmlPackageUri, ".");
-    std::string pluginClassName;
-    for (std::string name: packageNameList) {
-        pluginClassName += utils::capitalizeAsciiName(name);
-    }
-    printDisclaimer(printer);
-
-    const std::array<std::string, 4> qmlHeaders = {"QtQml/qqmlextensionplugin.h",
-                                                   "QtQml/qqml.h",
-                                                   "QtQml/qqmlengine.h",
-                                                   "QtProtobuf/qtprotobuftypes.h"};
-    for (const auto &header : qmlHeaders) {
-        printer->Print({{"include", header}},
-                       CommonTemplates::ExternalIncludeTemplate());
-    }
-    for (std::string basename: headersContainer) {
-        printer->Print({{"include", basename + CommonTemplates::ProtoFileSuffix()}},
-                       CommonTemplates::InternalIncludeTemplate());
-    }
-    printer->Print("\n");
-    printer->Print(CommonTemplates::QmlPluginExportMacroTemplate());
-
-    std::string qmlPackageEscaped = utils::escapedQmlUri(qmlPackageUri);
-    printer->Print({{"qml_package", qmlPackageUri},
-                    {"qml_package_escaped", qmlPackageEscaped}},
-                CommonTemplates::QmlExtensionPluginPreamble());
-
-    printer->Print({{"plugin_name", pluginClassName}},
-                    CommonTemplates::QmlExtensionPluginClass());
-
-    printer->Print({{"plugin_name", pluginClassName},
-                    {"qml_package", qmlPackageUri},
-                    {"qml_package_escaped", qmlPackageEscaped}},
-                   CommonTemplates::QmlExtensionPluginClassBody());
-}
-
-void QProtobufGenerator::GenerateQmlPluginSource(const FileDescriptor *file,
-                                                 std::shared_ptr<Printer> printer) const
-{
-    assert(file != nullptr);
-
-    common::iterateMessages(file, [&printer](const Descriptor *message) {
-        if (message->enum_type_count() > 0) {
-            MessageDefinitionPrinter messageDefinition(message, printer);
-            messageDefinition.printQmlPluginClassRegistration();
-        }
-    });
-
-    for (int i = 0; i < file->enum_type_count(); ++i) {
-        EnumDefinitionPrinter enumSourceDefinition(file->enum_type(i),
-                                                   printer);
-        enumSourceDefinition.printQmlPluginRegisterBody();
-    }
-}
-
 void QProtobufGenerator::GenerateHeader(const FileDescriptor *file,
                                         GeneratorContext *generatorContext) const
 {
diff --git a/src/tools/qtprotobufgen/qprotobufgenerator.h b/src/tools/qtprotobufgen/qprotobufgenerator.h
index 552f7f2..aebcfcd 100644
--- a/src/tools/qtprotobufgen/qprotobufgenerator.h
+++ b/src/tools/qtprotobufgen/qprotobufgenerator.h
@@ -39,11 +39,6 @@ private:
                         ::google::protobuf::compiler::GeneratorContext *generatorContext) const;
     void GenerateSources(const ::google::protobuf::FileDescriptor *file,
                          ::google::protobuf::compiler::GeneratorContext *generatorContext) const;
-    void GenerateQmlPluginSource(const ::google::protobuf::FileDescriptor *file,
-                                 std::shared_ptr<google::protobuf::io::Printer> printer) const;
-    void GenerateQmlPluginIntro(::google::protobuf::io::Printer *printer,
-                                const std::set<std::string> &headersContainer,
-                                const std::string &packageName) const;
 };
 } // namespace QtProtobuf
 
diff --git a/src/tools/qtprotoccommon/commontemplates.cpp b/src/tools/qtprotoccommon/commontemplates.cpp
index 364f7dc..077814f 100644
--- a/src/tools/qtprotoccommon/commontemplates.cpp
+++ b/src/tools/qtprotoccommon/commontemplates.cpp
@@ -138,7 +138,10 @@ const char *CommonTemplates::UsingNestedMessageTemplate()
     return "using $type$ = $scope_namespaces$::$type$;\n"
            "using $list_type$ = $scope_namespaces$::$list_type$;\n";
 }
-
+const char *CommonTemplates::UsingEnumTemplate()
+{
+    return "using $type$ = $scope_namespaces$::$type$;\n";
+}
 const char *CommonTemplates::UsingRepeatedEnumTemplate()
 {
     return "using $list_type$ = QList<$type$>;\n";
@@ -152,23 +155,34 @@ const char *CommonTemplates::NamespaceClosingTemplate()
 {
     return "} // namespace $scope_namespaces$\n";
 }
-const char *CommonTemplates::EnumDeclarationTemplate()
+const char *CommonTemplates::EnumGadgetDeclarationTemplate()
 {
-    return "\nnamespace $classname$ {\n"
-           "Q_NAMESPACE_EXPORT($export_macro$)\n";
+    return "\nnamespace $enum_gadget$ {\n";
 }
-
-const char *CommonTemplates::EnumDeclarationNoExportTemplate()
+const char *CommonTemplates::QNamespaceDeclarationTemplate()
 {
-    return "\nnamespace $classname$ {\n"
-           "Q_NAMESPACE\n";
+    return "Q_NAMESPACE_EXPORT($export_macro$)\n";
+}
+const char *CommonTemplates::QNamespaceDeclarationNoExportTemplate()
+{
+    return "Q_NAMESPACE\n";
 }
-
 const char *CommonTemplates::ClassMessageForwardDeclarationTemplate()
 {
     return "class $classname$;\n";
 }
 
+const char *CommonTemplates::EnumForwardDeclarationTemplate()
+{
+    return "enum $type$ : int32_t;\n"
+           "using $list_type$ = QList<$type$>;\n";
+}
+
+const char *CommonTemplates::EnumClassForwardDeclarationTemplate()
+{
+    return "enum class $type$;\n";
+}
+
 const char *CommonTemplates::ClassMessageQmlBeginDeclarationTemplate()
 {
     return "    QML_VALUE_TYPE($classname_low_case$)\n";
@@ -890,8 +904,8 @@ const char *CommonTemplates::DeclareMetaTypeTemplate()
 const char *CommonTemplates::MetaTypeRegistrationLocalEnumTemplate()
 {
     return "qRegisterProtobufEnumType<$scope_type$>();\n"
-           "qRegisterMetaType<$scope_type$>();\n"
-           "qRegisterMetaType<$scope_list_type$>();\n";
+           "qRegisterMetaType<$type$>();\n"
+           "qRegisterMetaType<$list_type$>();\n";
 }
 const char *CommonTemplates::MetaTypeRegistrationMapTemplate()
 {
@@ -899,14 +913,9 @@ const char *CommonTemplates::MetaTypeRegistrationMapTemplate()
            "qRegisterProtobufMapType<$key_type$, $value_type$>();\n";
 }
 
-const char *CommonTemplates::QEnumTemplate()
-{
-    return "Q_ENUM($type$)\n";
-}
-
 const char *CommonTemplates::QEnumNSTemplate()
 {
-    return "Q_ENUM_NS($type$)\n";
+    return "Q_ENUM_NS($type$)\n\n";
 }
 
 const char *CommonTemplates::RegisterEnumSerializersTemplate()
@@ -923,6 +932,12 @@ const char *CommonTemplates::RegistrarEnumTemplate()
     return "static QtProtobuf::ProtoTypeRegistrar "
            "ProtoTypeRegistrar$enum_gadget$($enum_gadget$::registerTypes);\n";
 }
+
+const char *CommonTemplates::QmlNamedElement()
+{
+    return "QML_NAMED_ELEMENT($classname$)\n";
+}
+
 const char *CommonTemplates::QmlRegisterTypeTemplate()
 {
     return "qmlRegisterType<$scope_type$>(\"$qml_package$\", 1, 0, \"$type$\");\n";
@@ -1012,7 +1027,7 @@ const char *CommonTemplates::QtProtobufFieldEnum()
 }
 const char *CommonTemplates::FieldEnumTemplate()
 {
-    return "enum QtProtobufFieldEnum {\n";
+    return "enum class QtProtobufFieldEnum {\n";
 }
 const char *CommonTemplates::FieldNumberTemplate()
 {
diff --git a/src/tools/qtprotoccommon/commontemplates.h b/src/tools/qtprotoccommon/commontemplates.h
index 0aa6674..7e26e94 100644
--- a/src/tools/qtprotoccommon/commontemplates.h
+++ b/src/tools/qtprotoccommon/commontemplates.h
@@ -37,11 +37,16 @@ public:
     static const char *UsingMapMessageTemplate();
     static const char *UsingNestedMessageTemplate();
     static const char *UsingRepeatedEnumTemplate();
+    static const char *UsingEnumTemplate();
     static const char *NamespaceTemplate();
     static const char *NamespaceClosingTemplate();
-    static const char *EnumDeclarationTemplate();
-    static const char *EnumDeclarationNoExportTemplate();
+    static const char *EnumGadgetDeclarationTemplate();
+    static const char *EnumGadgetDeclarationNoExportTemplate();
+    static const char *QNamespaceDeclarationTemplate();
+    static const char *QNamespaceDeclarationNoExportTemplate();
     static const char *ClassMessageForwardDeclarationTemplate();
+    static const char *EnumForwardDeclarationTemplate();
+    static const char *EnumClassForwardDeclarationTemplate();
     static const char *ClassMessageBeginDeclarationTemplate();
     static const char *ClassMessageBeginDeclarationTemplateEmptyMacros();
     static const char *ClassMessageQmlBeginDeclarationTemplate();
@@ -175,7 +180,6 @@ public:
     static const char *DeclareMetaTypeMapTemplate();
     static const char *MetaTypeRegistrationLocalEnumTemplate();
     static const char *MetaTypeRegistrationMapTemplate();
-    static const char *QEnumTemplate();
     static const char *QEnumNSTemplate();
     static const char *RegisterEnumSerializersTemplate();
     static const char *RegistrarTemplate();
@@ -203,11 +207,14 @@ public:
 
     static const char *ExportMacroTemplate();
 
+    static const char *QmlNamedElement();
+
     static const char *QmlPluginExportMacroTemplate();
     static const char *QmlExtensionPluginPreamble();
     static const char *QmlExtensionPluginClass();
     static const char *QmlExtensionPluginClassNoExport();
     static const char *QmlExtensionPluginClassBody();
+
     static const char *QObjectConstructorMessageDeclarationTemplate();
     static const char *MocIncludeTemplate();
 };
diff --git a/src/tools/qtprotoccommon/generatorcommon.cpp b/src/tools/qtprotoccommon/generatorcommon.cpp
index a4836a7..8f3b2d7 100644
--- a/src/tools/qtprotoccommon/generatorcommon.cpp
+++ b/src/tools/qtprotoccommon/generatorcommon.cpp
@@ -269,8 +269,8 @@ TypeMap common::produceEnumTypeMap(const EnumDescriptor *type, const Descriptor
     exportMacro = common::buildExportMacro(exportMacro);
 
     std::string initializer = scopeName + "::" + type->value(0)->name();
-    return { { "classname", enumGadget },
-             { "classname_low_case", utils::deCapitalizeAsciiName(enumGadget) },
+    return { { "classname", name },
+             { "classname_low_case", utils::deCapitalizeAsciiName(name) },
              { "type", name },
              { "full_type", fullName },
              { "scope_type", scopeName },
@@ -591,6 +591,12 @@ bool common::hasQmlAlias(const FieldDescriptor *field)
             && Options::instance().hasQml();
 }
 
+bool common::hasNestedTypes(const Descriptor *type)
+{
+    return common::hasNestedMessages(type) || type->enum_type_count() > 0
+            || Options::instance().generateFieldEnum() || type->oneof_decl_count() > 0;
+}
+
 void common::iterateMessages(const FileDescriptor *file,
                              const std::function<void(const Descriptor *)> &callback)
 {
diff --git a/src/tools/qtprotoccommon/generatorcommon.h b/src/tools/qtprotoccommon/generatorcommon.h
index 6b097ce..9c2bd73 100644
--- a/src/tools/qtprotoccommon/generatorcommon.h
+++ b/src/tools/qtprotoccommon/generatorcommon.h
@@ -71,6 +71,8 @@ struct common {
         std::string suffix;
         if constexpr (std::is_same<T, Descriptor>::value)
             suffix = !isMap(type) ? CommonTemplates::QtProtobufNestedNamespace() : "";
+        else if constexpr (std::is_same<T, EnumDescriptor>::value)
+            suffix = CommonTemplates::QtProtobufNestedNamespace();
 
         const Descriptor *containingType = type->containing_type();
         std::string nestingNamespaces;
@@ -111,6 +113,7 @@ struct common {
     static bool isLocalEnum(const EnumDescriptor *type, const google::protobuf::Descriptor *scope);
     static EnumVisibility enumVisibility(const EnumDescriptor *type, const Descriptor *scope);
     static bool hasQmlAlias(const FieldDescriptor *field);
+    static bool hasNestedTypes(const Descriptor *type);
     static bool isQtType(const FieldDescriptor *field);
     static bool isOverridden(const FieldDescriptor *field);
     static bool isPureMessage(const FieldDescriptor *field);
diff --git a/tests/auto/grpcgen/data/expected_result/folder/qtgrpc/tests/testservice.qpb.h b/tests/auto/grpcgen/data/expected_result/folder/qtgrpc/tests/testservice.qpb.h
index 92394a7..8535562 100644
--- a/tests/auto/grpcgen/data/expected_result/folder/qtgrpc/tests/testservice.qpb.h
+++ b/tests/auto/grpcgen/data/expected_result/folder/qtgrpc/tests/testservice.qpb.h
@@ -20,10 +20,22 @@
 namespace qtgrpc::tests {
 class SimpleStringMessage;
 using SimpleStringMessageRepeated = QList<SimpleStringMessage>;
+namespace SimpleStringMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringMessage_QtProtobufNested
+
 class SimpleIntMessage;
 using SimpleIntMessageRepeated = QList<SimpleIntMessage>;
+namespace SimpleIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleIntMessage_QtProtobufNested
+
 class BlobMessage;
 using BlobMessageRepeated = QList<BlobMessage>;
+namespace BlobMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace BlobMessage_QtProtobufNested
+
 
 class SimpleStringMessage_QtProtobufData;
 class SimpleStringMessage : public QProtobufMessage
@@ -34,11 +46,7 @@ class SimpleStringMessage : public QProtobufMessage
     Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldStringProtoFieldNumber = 6,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleStringMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleStringMessage();
     ~SimpleStringMessage();
     SimpleStringMessage(const SimpleStringMessage &other);
@@ -55,6 +63,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldStringProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringMessage_QtProtobufNested
 
 class SimpleIntMessage_QtProtobufData;
 class SimpleIntMessage : public QProtobufMessage
@@ -65,11 +82,7 @@ class SimpleIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleIntMessage();
     ~SimpleIntMessage();
     SimpleIntMessage(const SimpleIntMessage &other);
@@ -86,6 +99,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleIntMessage_QtProtobufData> dptr;
 };
+namespace SimpleIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleIntMessage_QtProtobufNested
 
 class BlobMessage_QtProtobufData;
 class BlobMessage : public QProtobufMessage
@@ -96,11 +118,7 @@ class BlobMessage : public QProtobufMessage
     Q_PROPERTY(QByteArray testBytes READ testBytes WRITE setTestBytes SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestBytesProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = BlobMessage_QtProtobufNested::QtProtobufFieldEnum;
     BlobMessage();
     ~BlobMessage();
     BlobMessage(const BlobMessage &other);
@@ -117,6 +135,15 @@ public:
 private:
     QExplicitlySharedDataPointer<BlobMessage_QtProtobufData> dptr;
 };
+namespace BlobMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestBytesProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace BlobMessage_QtProtobufNested
 } // namespace qtgrpc::tests
 
 Q_DECLARE_METATYPE(qtgrpc::tests::SimpleStringMessage)
diff --git a/tests/auto/protobuf/basic/tst_protobuf_basictypes.cpp b/tests/auto/protobuf/basic/tst_protobuf_basictypes.cpp
index 83d3c6e..047e763 100644
--- a/tests/auto/protobuf/basic/tst_protobuf_basictypes.cpp
+++ b/tests/auto/protobuf/basic/tst_protobuf_basictypes.cpp
@@ -74,7 +74,7 @@ void QtProtobufTypesGenerationTest::BoolMessageTest()
     QCOMPARE(test.property(propertyName).value<bool>(), true);
     QCOMPARE(test.testFieldBool(), true);
 
-    QCOMPARE(SimpleBoolMessage::TestFieldBoolProtoFieldNumber, 1);
+    QCOMPARE(int(SimpleBoolMessage::QtProtobufFieldEnum::TestFieldBoolProtoFieldNumber), 1);
     QCOMPARE(test.propertyOrdering.getMessageFullName(),
              "qtprotobufnamespace.tests.SimpleBoolMessage");
 }
@@ -89,7 +89,9 @@ void QtProtobufTypesGenerationTest::IntMessageTest()
     QCOMPARE(test.property(propertyName).value<QtProtobuf::int32>(), 1);
     QCOMPARE(test.testFieldInt(), 1);
 
-    QCOMPARE(qtprotobufnamespace::tests::SimpleIntMessage::TestFieldIntProtoFieldNumber, 1);
+    QCOMPARE(int(qtprotobufnamespace::tests::SimpleIntMessage::QtProtobufFieldEnum::
+                         TestFieldIntProtoFieldNumber),
+             1);
     QCOMPARE(test.propertyOrdering.getMessageFullName(),
              "qtprotobufnamespace.tests.SimpleIntMessage");
 }
@@ -104,7 +106,7 @@ void QtProtobufTypesGenerationTest::SIntMessageTest()
     QCOMPARE(test.property(propertyName).value<QtProtobuf::sint32>(), 1);
     QCOMPARE(test.testFieldInt(), 1);
 
-    QCOMPARE(SimpleSIntMessage::TestFieldIntProtoFieldNumber, 1);
+    QCOMPARE(int(SimpleSIntMessage::QtProtobufFieldEnum::TestFieldIntProtoFieldNumber), 1);
     QCOMPARE(test.propertyOrdering.getMessageFullName(),
              "qtprotobufnamespace.tests.SimpleSIntMessage");
 }
@@ -119,7 +121,7 @@ void QtProtobufTypesGenerationTest::UIntMessageTest()
     QCOMPARE(test.property(propertyName).value<QtProtobuf::uint32>(), (uint32_t)1);
     QCOMPARE(test.testFieldInt(), 1u);
 
-    QCOMPARE(SimpleUIntMessage::TestFieldIntProtoFieldNumber, 1);
+    QCOMPARE(int(SimpleUIntMessage::QtProtobufFieldEnum::TestFieldIntProtoFieldNumber), 1);
     QCOMPARE(test.propertyOrdering.getMessageFullName(),
              "qtprotobufnamespace.tests.SimpleUIntMessage");
 }
@@ -134,7 +136,7 @@ void QtProtobufTypesGenerationTest::Int64MessageTest()
     QCOMPARE(test.property(propertyName).value<QtProtobuf::int64>(), 1);
     QCOMPARE(test.testFieldInt(), 1);
 
-    QCOMPARE(SimpleInt64Message::TestFieldIntProtoFieldNumber, 1);
+    QCOMPARE(int(SimpleInt64Message::QtProtobufFieldEnum::TestFieldIntProtoFieldNumber), 1);
     QCOMPARE(test.propertyOrdering.getMessageFullName(),
              "qtprotobufnamespace.tests.SimpleInt64Message");
 }
@@ -149,7 +151,7 @@ void QtProtobufTypesGenerationTest::SInt64MessageTest()
     QCOMPARE(test.property(propertyName).value<QtProtobuf::sint64>(), 1);
     QCOMPARE(test.testFieldInt(), 1);
 
-    QCOMPARE(SimpleSInt64Message::TestFieldIntProtoFieldNumber, 1);
+    QCOMPARE(int(SimpleSInt64Message::QtProtobufFieldEnum::TestFieldIntProtoFieldNumber), 1);
     QCOMPARE(test.propertyOrdering.getMessageFullName(),
              "qtprotobufnamespace.tests.SimpleSInt64Message");
 }
@@ -164,7 +166,7 @@ void QtProtobufTypesGenerationTest::UInt64MessageTest()
     QCOMPARE(test.property(propertyName).value<QtProtobuf::uint64>(), 1u);
     QCOMPARE(test.testFieldInt(), 1u);
 
-    QCOMPARE(SimpleUInt64Message::TestFieldIntProtoFieldNumber, 1u);
+    QCOMPARE(uint(SimpleUInt64Message::QtProtobufFieldEnum::TestFieldIntProtoFieldNumber), 1u);
     QCOMPARE(test.propertyOrdering.getMessageFullName(),
              "qtprotobufnamespace.tests.SimpleUInt64Message");
 }
@@ -179,7 +181,9 @@ void QtProtobufTypesGenerationTest::FixedInt32MessageTest()
     QCOMPARE(test.property(propertyName).value<QtProtobuf::fixed32>(), 1u);
     QCOMPARE(test.testFieldFixedInt32(), 1u);
 
-    QCOMPARE(SimpleFixedInt32Message::TestFieldFixedInt32ProtoFieldNumber, 1u);
+    QCOMPARE(
+            uint(SimpleFixedInt32Message::QtProtobufFieldEnum::TestFieldFixedInt32ProtoFieldNumber),
+            1u);
     QCOMPARE(test.propertyOrdering.getMessageFullName(),
              "qtprotobufnamespace.tests.SimpleFixedInt32Message");
 }
@@ -194,7 +198,9 @@ void QtProtobufTypesGenerationTest::FixedInt64MessageTest()
     QCOMPARE(test.property(propertyName).value<QtProtobuf::fixed64>(), 1u);
     QCOMPARE(test.testFieldFixedInt64(), 1u);
 
-    QCOMPARE(SimpleFixedInt64Message::TestFieldFixedInt64ProtoFieldNumber, 1u);
+    QCOMPARE(
+            uint(SimpleFixedInt64Message::QtProtobufFieldEnum::TestFieldFixedInt64ProtoFieldNumber),
+            1u);
     QCOMPARE(test.propertyOrdering.getMessageFullName(),
              "qtprotobufnamespace.tests.SimpleFixedInt64Message");
 }
@@ -209,7 +215,9 @@ void QtProtobufTypesGenerationTest::SFixedInt32MessageTest()
     QCOMPARE(test.property(propertyName).value<QtProtobuf::sfixed32>(), 1);
     QCOMPARE(test.testFieldFixedInt32(), 1);
 
-    QCOMPARE(SimpleSFixedInt32Message::TestFieldFixedInt32ProtoFieldNumber, 1);
+    QCOMPARE(
+            int(SimpleSFixedInt32Message::QtProtobufFieldEnum::TestFieldFixedInt32ProtoFieldNumber),
+            1);
     QCOMPARE(test.propertyOrdering.getMessageFullName(),
              "qtprotobufnamespace.tests.SimpleSFixedInt32Message");
 }
@@ -224,7 +232,9 @@ void QtProtobufTypesGenerationTest::SFixedInt64MessageTest()
     QCOMPARE(test.property(propertyName).value<QtProtobuf::sfixed64>(), 1);
     QCOMPARE(test.testFieldFixedInt64(), 1);
 
-    QCOMPARE(SimpleSFixedInt64Message::TestFieldFixedInt64ProtoFieldNumber, 1);
+    QCOMPARE(
+            int(SimpleSFixedInt64Message::QtProtobufFieldEnum::TestFieldFixedInt64ProtoFieldNumber),
+            1);
     QCOMPARE(test.propertyOrdering.getMessageFullName(),
              "qtprotobufnamespace.tests.SimpleSFixedInt64Message");
 }
@@ -241,7 +251,7 @@ void QtProtobufTypesGenerationTest::StringMessageTest()
     QCOMPARE(test.property(propertyName).toString(), "test1"_L1);
     QCOMPARE(test.testFieldString(), "test1"_L1);
 
-    QCOMPARE(SimpleStringMessage::TestFieldStringProtoFieldNumber, 6);
+    QCOMPARE(int(SimpleStringMessage::QtProtobufFieldEnum::TestFieldStringProtoFieldNumber), 6);
     QCOMPARE(test.propertyOrdering.getMessageFullName(),
              "qtprotobufnamespace.tests.SimpleStringMessage");
 }
@@ -261,7 +271,7 @@ void QtProtobufTypesGenerationTest::FloatMessageTest()
     QCOMPARE(test.property(propertyName).toFloat(), assignedValue);
     QCOMPARE(test.testFieldFloat(), assignedValue);
 
-    QCOMPARE(SimpleFloatMessage::TestFieldFloatProtoFieldNumber, 7);
+    QCOMPARE(int(SimpleFloatMessage::QtProtobufFieldEnum::TestFieldFloatProtoFieldNumber), 7);
     QCOMPARE(test.propertyOrdering.getMessageFullName(),
              "qtprotobufnamespace.tests.SimpleFloatMessage");
 }
@@ -280,7 +290,7 @@ void QtProtobufTypesGenerationTest::DoubleMessageTest()
     QCOMPARE(test.property(propertyName).toDouble(), assignedValue);
     QCOMPARE(test.testFieldDouble(), assignedValue);
 
-    QCOMPARE(SimpleDoubleMessage::TestFieldDoubleProtoFieldNumber, 8);
+    QCOMPARE(int(SimpleDoubleMessage::QtProtobufFieldEnum::TestFieldDoubleProtoFieldNumber), 8);
     QCOMPARE(test.propertyOrdering.getMessageFullName(),
              "qtprotobufnamespace.tests.SimpleDoubleMessage");
 }
diff --git a/tests/auto/protobuf/enums/enummessages.proto b/tests/auto/protobuf/enums/enummessages.proto
index f3d709f..561fe89 100644
--- a/tests/auto/protobuf/enums/enummessages.proto
+++ b/tests/auto/protobuf/enums/enummessages.proto
@@ -94,3 +94,19 @@ enum TestEnumSecondInFile {
     TEST_ENUM_SIF_VALUE1 = 1;
     TEST_ENUM_SIF_VALUE2 = 2;
 }
+
+message A {
+    enum AEnum {
+        AVal0 = 0;
+        AVal1 = 1;
+    }
+    B.BEnum val = 1;
+}
+
+message B {
+    enum BEnum {
+        BVal0 = 0;
+        BVal1 = 1;
+    }
+    A.AEnum val = 1;
+}
diff --git a/tests/auto/protobuf/enums/tst_protobuf_deserialization_enumtypes.cpp b/tests/auto/protobuf/enums/tst_protobuf_deserialization_enumtypes.cpp
index 51f9d12..4a2f41d 100644
--- a/tests/auto/protobuf/enums/tst_protobuf_deserialization_enumtypes.cpp
+++ b/tests/auto/protobuf/enums/tst_protobuf_deserialization_enumtypes.cpp
@@ -27,7 +27,7 @@ void QtProtobufEnumTypesDeserializationTest::SimpleEnumMessageDeserializeTest()
 {
     SimpleEnumMessage test;
     test.deserialize(m_serializer.get(), QByteArray::fromHex("0803"));
-    QCOMPARE(test.localEnum(), SimpleEnumMessage::LOCAL_ENUM_VALUE3);
+    QCOMPARE(test.localEnum(), SimpleEnumMessage::LocalEnum::LOCAL_ENUM_VALUE3);
 }
 
 void QtProtobufEnumTypesDeserializationTest::RepeatedEnumMessageTest()
@@ -38,12 +38,12 @@ void QtProtobufEnumTypesDeserializationTest::RepeatedEnumMessageTest()
     QVERIFY(msg.localEnumList().isEmpty());
 
     msg.deserialize(m_serializer.get(), QByteArray::fromHex("0a06000102010203"));
-    QVERIFY((msg.localEnumList() == RepeatedEnumMessage::LocalEnumRepeated {RepeatedEnumMessage::LOCAL_ENUM_VALUE0,
-                RepeatedEnumMessage::LOCAL_ENUM_VALUE1,
-                RepeatedEnumMessage::LOCAL_ENUM_VALUE2,
-                RepeatedEnumMessage::LOCAL_ENUM_VALUE1,
-                RepeatedEnumMessage::LOCAL_ENUM_VALUE2,
-                RepeatedEnumMessage::LOCAL_ENUM_VALUE3}));
+    QVERIFY((msg.localEnumList() == RepeatedEnumMessage::LocalEnumRepeated {RepeatedEnumMessage::LocalEnum::LOCAL_ENUM_VALUE0,
+                RepeatedEnumMessage::LocalEnum::LOCAL_ENUM_VALUE1,
+                RepeatedEnumMessage::LocalEnum::LOCAL_ENUM_VALUE2,
+                RepeatedEnumMessage::LocalEnum::LOCAL_ENUM_VALUE1,
+                RepeatedEnumMessage::LocalEnum::LOCAL_ENUM_VALUE2,
+                RepeatedEnumMessage::LocalEnum::LOCAL_ENUM_VALUE3}));
 }
 
 QTEST_MAIN(QtProtobufEnumTypesDeserializationTest)
diff --git a/tests/auto/protobuf/enums/tst_protobuf_enumtypes.cpp b/tests/auto/protobuf/enums/tst_protobuf_enumtypes.cpp
index 203455d..deba9f4 100644
--- a/tests/auto/protobuf/enums/tst_protobuf_enumtypes.cpp
+++ b/tests/auto/protobuf/enums/tst_protobuf_enumtypes.cpp
@@ -69,10 +69,12 @@ void QtProtobufEnumTypesGenerationTest::BasicTest()
 
 void QtProtobufEnumTypesGenerationTest::LocalEnumTest()
 {
-    QVERIFY(SimpleEnumMessage::staticMetaObject.enumeratorCount() > 0);
+    const auto &metaObject = SimpleEnumMessage_QtProtobufNested::staticMetaObject;
+    QVERIFY(metaObject.enumeratorCount() > 0);
     QMetaEnum simpleEnum;
-    for (int i = 0; i < SimpleEnumMessage::staticMetaObject.enumeratorCount(); i++) {
-        QMetaEnum tmp = SimpleEnumMessage::staticMetaObject.enumerator(i);
+    for (int i = 0; i < metaObject.enumeratorCount(); i++) {
+        QMetaEnum tmp = metaObject.enumerator(i);
+        qDebug() << tmp.name();
         if (QString(tmp.name()) == QString("LocalEnum")) {
             simpleEnum = tmp;
             break;
@@ -92,7 +94,7 @@ void QtProtobufEnumTypesGenerationTest::LocalEnumTest()
 
 void QtProtobufEnumTypesGenerationTest::MixedEnumUsageTest()
 {
-    QVERIFY(MixedEnumUsageMessage::staticMetaObject.enumeratorCount() > 0);
+    QVERIFY(MixedEnumUsageMessage_QtProtobufNested::staticMetaObject.enumeratorCount() > 0);
 
     const char *propertyName = "localEnumMap";
     qProtobufAssertMessagePropertyRegistered<MixedEnumUsageMessage,
@@ -100,10 +102,10 @@ void QtProtobufEnumTypesGenerationTest::MixedEnumUsageTest()
             3, "MixedEnumUsageMessage::LocalEnumMapEntry", propertyName);
 
     MixedEnumUsageMessage::LocalEnumMapEntry value(
-            { { "value1", MixedEnumUsageMessage::LOCAL_ENUM_VALUE2 },
-              { "value2", MixedEnumUsageMessage::LOCAL_ENUM_VALUE2 },
-              { "value3", MixedEnumUsageMessage::LOCAL_ENUM_VALUE1 },
-              { "value4", MixedEnumUsageMessage::LOCAL_ENUM_VALUE3 } });
+            { { "value1", MixedEnumUsageMessage::LocalEnum::LOCAL_ENUM_VALUE2 },
+              { "value2", MixedEnumUsageMessage::LocalEnum::LOCAL_ENUM_VALUE2 },
+              { "value3", MixedEnumUsageMessage::LocalEnum::LOCAL_ENUM_VALUE1 },
+              { "value4", MixedEnumUsageMessage::LocalEnum::LOCAL_ENUM_VALUE3 } });
 
     MixedEnumUsageMessage test;
     QVERIFY(test.setProperty(propertyName,
@@ -114,15 +116,15 @@ void QtProtobufEnumTypesGenerationTest::MixedEnumUsageTest()
 
 void QtProtobufEnumTypesGenerationTest::LocalEnumListTest()
 {
-    QVERIFY(RepeatedEnumMessage::staticMetaObject.enumeratorCount() > 0);
+    QVERIFY(RepeatedEnumMessage_QtProtobufNested::staticMetaObject.enumeratorCount() > 0);
 
     const char *propertyName = "localEnumList";
     qProtobufAssertMessagePropertyRegistered<RepeatedEnumMessage, RepeatedEnumMessage::LocalEnumRepeated>(1,  "RepeatedEnumMessage::LocalEnumRepeated", propertyName);
 
-    RepeatedEnumMessage::LocalEnumRepeated value({RepeatedEnumMessage::LOCAL_ENUM_VALUE2,
-                                                RepeatedEnumMessage::LOCAL_ENUM_VALUE2,
-                                                RepeatedEnumMessage::LOCAL_ENUM_VALUE1,
-                                                RepeatedEnumMessage::LOCAL_ENUM_VALUE3});
+    RepeatedEnumMessage::LocalEnumRepeated value({RepeatedEnumMessage::LocalEnum::LOCAL_ENUM_VALUE2,
+                                                RepeatedEnumMessage::LocalEnum::LOCAL_ENUM_VALUE2,
+                                                RepeatedEnumMessage::LocalEnum::LOCAL_ENUM_VALUE1,
+                                                RepeatedEnumMessage::LocalEnum::LOCAL_ENUM_VALUE3});
 
     RepeatedEnumMessage test;
     QVERIFY(test.setProperty(propertyName, QVariant::fromValue<RepeatedEnumMessage::LocalEnumRepeated>(value)));
@@ -135,11 +137,11 @@ void QtProtobufEnumTypesGenerationTest::FileEnumsTest()
     const char *propertyName = "globalEnumList";
     qProtobufAssertMessagePropertyRegistered<SimpleFileEnumMessage, TestEnumGadget::TestEnumRepeated>(2, "TestEnumGadget::TestEnumRepeated", propertyName);
 
-    TestEnumGadget::TestEnumRepeated value{TestEnumGadget::TEST_ENUM_VALUE1,
-                                     TestEnumGadget::TEST_ENUM_VALUE3,
-                                     TestEnumGadget::TEST_ENUM_VALUE4,
-                                     TestEnumGadget::TEST_ENUM_VALUE2,
-                                     TestEnumGadget::TEST_ENUM_VALUE1};
+    TestEnumGadget::TestEnumRepeated value{TestEnumGadget::TestEnum::TEST_ENUM_VALUE1,
+                                     TestEnumGadget::TestEnum::TEST_ENUM_VALUE3,
+                                     TestEnumGadget::TestEnum::TEST_ENUM_VALUE4,
+                                     TestEnumGadget::TestEnum::TEST_ENUM_VALUE2,
+                                     TestEnumGadget::TestEnum::TEST_ENUM_VALUE1};
     SimpleFileEnumMessage test;
     QVERIFY(test.setProperty(propertyName, QVariant::fromValue<TestEnumGadget::TestEnumRepeated>(value)));
     QCOMPARE(test.property(propertyName).value<TestEnumGadget::TestEnumRepeated>(), value);
@@ -162,10 +164,10 @@ void QtProtobufEnumTypesGenerationTest::StepChildEnumListMessageTest()
     const char *propertyName = "localStepChildList";
     qProtobufAssertMessagePropertyRegistered<StepChildEnumMessage, SimpleEnumMessage::LocalEnumRepeated>(2, "SimpleEnumMessage::LocalEnumRepeated", propertyName);
 
-    SimpleEnumMessage::LocalEnumRepeated value({SimpleEnumMessage::LOCAL_ENUM_VALUE2,
-                                            SimpleEnumMessage::LOCAL_ENUM_VALUE2,
-                                            SimpleEnumMessage::LOCAL_ENUM_VALUE1,
-                                            SimpleEnumMessage::LOCAL_ENUM_VALUE3});
+    SimpleEnumMessage::LocalEnumRepeated value({SimpleEnumMessage::LocalEnum::LOCAL_ENUM_VALUE2,
+                                            SimpleEnumMessage::LocalEnum::LOCAL_ENUM_VALUE2,
+                                            SimpleEnumMessage::LocalEnum::LOCAL_ENUM_VALUE1,
+                                            SimpleEnumMessage::LocalEnum::LOCAL_ENUM_VALUE3});
     StepChildEnumMessage test;
     QVERIFY(test.setProperty(propertyName, QVariant::fromValue<SimpleEnumMessage::LocalEnumRepeated>(value)));
     QCOMPARE(test.property(propertyName).value<SimpleEnumMessage::LocalEnumRepeated>(), value);
diff --git a/tests/auto/protobuf/enums/tst_protobuf_serialization_enumtypes.cpp b/tests/auto/protobuf/enums/tst_protobuf_serialization_enumtypes.cpp
index d34c2da..fc94ce4 100644
--- a/tests/auto/protobuf/enums/tst_protobuf_serialization_enumtypes.cpp
+++ b/tests/auto/protobuf/enums/tst_protobuf_serialization_enumtypes.cpp
@@ -27,7 +27,7 @@ using namespace qtprotobufnamespace::tests;
 void QtProtobufEnumTypesSerializationTest::SimpleEnumMessageSerializeTest()
 {
     SimpleEnumMessage test;
-    test.setLocalEnum(SimpleEnumMessage::LOCAL_ENUM_VALUE2);
+    test.setLocalEnum(SimpleEnumMessage::LocalEnum::LOCAL_ENUM_VALUE2);
     QByteArray result = test.serialize(m_serializer.get());
     QCOMPARE(result.size(), 2);
     QCOMPARE(result.toHex().toStdString().c_str(), "0802");
@@ -37,12 +37,12 @@ void QtProtobufEnumTypesSerializationTest::RepeatedEnumMessageTest()
 {
     RepeatedEnumMessage msg;
 
-    msg.setLocalEnumList({RepeatedEnumMessage::LOCAL_ENUM_VALUE0,
-                          RepeatedEnumMessage::LOCAL_ENUM_VALUE1,
-                          RepeatedEnumMessage::LOCAL_ENUM_VALUE2,
-                          RepeatedEnumMessage::LOCAL_ENUM_VALUE1,
-                          RepeatedEnumMessage::LOCAL_ENUM_VALUE2,
-                          RepeatedEnumMessage::LOCAL_ENUM_VALUE3});
+    msg.setLocalEnumList({RepeatedEnumMessage::LocalEnum::LOCAL_ENUM_VALUE0,
+                          RepeatedEnumMessage::LocalEnum::LOCAL_ENUM_VALUE1,
+                          RepeatedEnumMessage::LocalEnum::LOCAL_ENUM_VALUE2,
+                          RepeatedEnumMessage::LocalEnum::LOCAL_ENUM_VALUE1,
+                          RepeatedEnumMessage::LocalEnum::LOCAL_ENUM_VALUE2,
+                          RepeatedEnumMessage::LocalEnum::LOCAL_ENUM_VALUE3});
     QByteArray result = msg.serialize(m_serializer.get());
     QCOMPARE(result.toHex().toStdString().c_str(),
                  "0a06000102010203");
diff --git a/tests/auto/protobuf/nopackage/tst_protobuf_nopackagetypes.cpp b/tests/auto/protobuf/nopackage/tst_protobuf_nopackagetypes.cpp
index 6855b57..3d0ad02 100644
--- a/tests/auto/protobuf/nopackage/tst_protobuf_nopackagetypes.cpp
+++ b/tests/auto/protobuf/nopackage/tst_protobuf_nopackagetypes.cpp
@@ -38,7 +38,7 @@ void QtProtobufNoPackageTypesGenerationTest::NoPackageSimpleIntMessageTest()
     QCOMPARE(test.property(propertyName).value<QtProtobuf::int32>(), 1);
     QCOMPARE(test.testFieldInt(), 1);
 
-    QCOMPARE(::SimpleIntMessage::TestFieldIntProtoFieldNumber, 1);
+    QCOMPARE(int(::SimpleIntMessage::QtProtobufFieldEnum::TestFieldIntProtoFieldNumber), 1);
     QCOMPARE(test.propertyOrdering.getMessageFullName(), "SimpleIntMessage");
 }
 
diff --git a/tests/auto/protobuf/syntax/tst_protobuf_syntax.cpp b/tests/auto/protobuf/syntax/tst_protobuf_syntax.cpp
index e3ce997..d5aaa1f 100644
--- a/tests/auto/protobuf/syntax/tst_protobuf_syntax.cpp
+++ b/tests/auto/protobuf/syntax/tst_protobuf_syntax.cpp
@@ -62,10 +62,11 @@ void QtProtobufSyntaxTest::ReservedUpperCaseTest()
 
 void QtProtobufSyntaxTest::ReservedEnumTest()
 {
-    QVERIFY(MessageEnumReserved::staticMetaObject.enumeratorCount() > 0);
+    const auto &metaObject = MessageEnumReserved_QtProtobufNested::staticMetaObject;
+    QVERIFY(metaObject.enumeratorCount() > 0);
     QMetaEnum simpleEnum;
-    for (int i = 0; i < MessageEnumReserved::staticMetaObject.enumeratorCount(); i++) {
-        QMetaEnum tmp = MessageEnumReserved::staticMetaObject.enumerator(i);
+    for (int i = 0; i < metaObject.enumeratorCount(); i++) {
+        QMetaEnum tmp = metaObject.enumerator(i);
         if (QString(tmp.name()) == QString("ReservedEnum")) {
             simpleEnum = tmp;
             break;
@@ -83,10 +84,11 @@ void QtProtobufSyntaxTest::ReservedEnumTest()
 
 void QtProtobufSyntaxTest::LowerCaseEnumTest()
 {
-    QVERIFY(MessageEnumReserved::staticMetaObject.enumeratorCount() > 0);
+    const auto &metaObject = MessageEnumReserved_QtProtobufNested::staticMetaObject;
+    QVERIFY(metaObject.enumeratorCount() > 0);
     QMetaEnum simpleEnum;
-    for (int i = 0; i < MessageEnumReserved::staticMetaObject.enumeratorCount(); i++) {
-        QMetaEnum tmp = MessageEnumReserved::staticMetaObject.enumerator(i);
+    for (int i = 0; i < metaObject.enumeratorCount(); i++) {
+        QMetaEnum tmp = metaObject.enumerator(i);
         if (QString(tmp.name()) == QString("LowerCaseEnum")) {
             simpleEnum = tmp;
             break;
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 7ca5f6f..63ab181 100644
--- a/tests/auto/protobufgen/data/expected_result/comments/annotation.qpb.h
+++ b/tests/auto/protobufgen/data/expected_result/comments/annotation.qpb.h
@@ -20,22 +20,58 @@
 namespace qtprotobufnamespace::tests {
 class AnnotatedMessage1;
 using AnnotatedMessage1Repeated = QList<AnnotatedMessage1>;
+namespace AnnotatedMessage1_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage1_QtProtobufNested
+
 class AnnotatedMessage2;
 using AnnotatedMessage2Repeated = QList<AnnotatedMessage2>;
+namespace AnnotatedMessage2_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage2_QtProtobufNested
+
 class AnnotatedMessage3;
 using AnnotatedMessage3Repeated = QList<AnnotatedMessage3>;
+namespace AnnotatedMessage3_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage3_QtProtobufNested
+
 class AnnotatedMessage4;
 using AnnotatedMessage4Repeated = QList<AnnotatedMessage4>;
+namespace AnnotatedMessage4_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage4_QtProtobufNested
+
 class AnnotatedMessage5;
 using AnnotatedMessage5Repeated = QList<AnnotatedMessage5>;
+namespace AnnotatedMessage5_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage5_QtProtobufNested
+
 class AnnotatedMessage6;
 using AnnotatedMessage6Repeated = QList<AnnotatedMessage6>;
+namespace AnnotatedMessage6_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage6_QtProtobufNested
+
 class AnnotatedMessage7;
 using AnnotatedMessage7Repeated = QList<AnnotatedMessage7>;
+namespace AnnotatedMessage7_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage7_QtProtobufNested
+
 class AnnotatedMessage8;
 using AnnotatedMessage8Repeated = QList<AnnotatedMessage8>;
+namespace AnnotatedMessage8_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage8_QtProtobufNested
+
 class AnnotatedMessage9;
 using AnnotatedMessage9Repeated = QList<AnnotatedMessage9>;
+namespace AnnotatedMessage9_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage9_QtProtobufNested
+
 
 /* test annotation */
 class AnnotatedMessage1_QtProtobufData;
@@ -47,11 +83,7 @@ class AnnotatedMessage1 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage1_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage1();
     ~AnnotatedMessage1();
     AnnotatedMessage1(const AnnotatedMessage1 &other);
@@ -71,6 +103,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage1_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage1_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage1_QtProtobufNested
 
 /* test annotation */
 class AnnotatedMessage2_QtProtobufData;
@@ -82,11 +123,7 @@ class AnnotatedMessage2 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage2_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage2();
     ~AnnotatedMessage2();
     AnnotatedMessage2(const AnnotatedMessage2 &other);
@@ -106,6 +143,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage2_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage2_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage2_QtProtobufNested
 
 /* test annotation */
 class AnnotatedMessage3_QtProtobufData;
@@ -117,11 +163,7 @@ class AnnotatedMessage3 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage3_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage3();
     ~AnnotatedMessage3();
     AnnotatedMessage3(const AnnotatedMessage3 &other);
@@ -142,6 +184,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage3_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage3_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage3_QtProtobufNested
 
 /* test annotation */
 class AnnotatedMessage4_QtProtobufData;
@@ -153,11 +204,7 @@ class AnnotatedMessage4 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage4_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage4();
     ~AnnotatedMessage4();
     AnnotatedMessage4(const AnnotatedMessage4 &other);
@@ -174,6 +221,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage4_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage4_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage4_QtProtobufNested
 
 /*! \brief test annotation */
 class AnnotatedMessage5_QtProtobufData;
@@ -185,11 +241,7 @@ class AnnotatedMessage5 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage5_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage5();
     ~AnnotatedMessage5();
     AnnotatedMessage5(const AnnotatedMessage5 &other);
@@ -207,6 +259,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage5_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage5_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage5_QtProtobufNested
 
 /** \brief test annotation */
 class AnnotatedMessage6_QtProtobufData;
@@ -218,11 +279,7 @@ class AnnotatedMessage6 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage6_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage6();
     ~AnnotatedMessage6();
     AnnotatedMessage6(const AnnotatedMessage6 &other);
@@ -240,6 +297,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage6_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage6_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage6_QtProtobufNested
 
 /*!
  * \brief test annotation
@@ -253,11 +319,7 @@ class AnnotatedMessage7 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage7_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage7();
     ~AnnotatedMessage7();
     AnnotatedMessage7(const AnnotatedMessage7 &other);
@@ -275,6 +337,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage7_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage7_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage7_QtProtobufNested
 
 /**
  * \brief test annotation
@@ -288,11 +359,7 @@ class AnnotatedMessage8 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage8_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage8();
     ~AnnotatedMessage8();
     AnnotatedMessage8(const AnnotatedMessage8 &other);
@@ -310,6 +377,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage8_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage8_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage8_QtProtobufNested
 
 /*
  * test annotation
@@ -324,11 +400,7 @@ class AnnotatedMessage9 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage9_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage9();
     ~AnnotatedMessage9();
     AnnotatedMessage9(const AnnotatedMessage9 &other);
@@ -346,6 +418,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage9_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage9_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage9_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage1)
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 195190d..56fbe85 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
@@ -20,10 +20,22 @@
 namespace MyTopLevelNamespace::qtprotobufnamespace::tests {
 class EmptyMessage;
 using EmptyMessageRepeated = QList<EmptyMessage>;
+namespace EmptyMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace EmptyMessage_QtProtobufNested
+
 class SimpleStringMessage;
 using SimpleStringMessageRepeated = QList<SimpleStringMessage>;
+namespace SimpleStringMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringMessage_QtProtobufNested
+
 class ComplexMessage;
 using ComplexMessageRepeated = QList<ComplexMessage>;
+namespace ComplexMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace ComplexMessage_QtProtobufNested
+
 
 class EmptyMessage_QtProtobufData;
 class EmptyMessage : public QProtobufMessage
@@ -33,6 +45,7 @@ class EmptyMessage : public QProtobufMessage
     Q_DECLARE_PROTOBUF_SERIALIZERS(EmptyMessage)
 
 public:
+    using QtProtobufFieldEnum = EmptyMessage_QtProtobufNested::QtProtobufFieldEnum;
     EmptyMessage();
     ~EmptyMessage();
     EmptyMessage(const EmptyMessage &other);
@@ -46,6 +59,10 @@ public:
 private:
     QExplicitlySharedDataPointer<EmptyMessage_QtProtobufData> dptr;
 };
+namespace EmptyMessage_QtProtobufNested {
+Q_NAMESPACE
+
+} // namespace EmptyMessage_QtProtobufNested
 
 class SimpleStringMessage_QtProtobufData;
 class SimpleStringMessage : public QProtobufMessage
@@ -56,11 +73,7 @@ class SimpleStringMessage : public QProtobufMessage
     Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldStringProtoFieldNumber = 6,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleStringMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleStringMessage();
     ~SimpleStringMessage();
     SimpleStringMessage(const SimpleStringMessage &other);
@@ -77,6 +90,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldStringProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringMessage_QtProtobufNested
 
 class ComplexMessage_QtProtobufData;
 class ComplexMessage : public QProtobufMessage
@@ -88,12 +110,7 @@ class ComplexMessage : public QProtobufMessage
     Q_PROPERTY(MyTopLevelNamespace::qtprotobufnamespace::tests::SimpleStringMessage *testComplexField_p READ testComplexField_p WRITE setTestComplexField_p)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-        TestComplexFieldProtoFieldNumber = 2,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = ComplexMessage_QtProtobufNested::QtProtobufFieldEnum;
     ComplexMessage();
     ~ComplexMessage();
     ComplexMessage(const ComplexMessage &other);
@@ -116,6 +133,16 @@ private:
     void setTestComplexField_p(SimpleStringMessage *testComplexField);
     QExplicitlySharedDataPointer<ComplexMessage_QtProtobufData> dptr;
 };
+namespace ComplexMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+    TestComplexFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace ComplexMessage_QtProtobufNested
 } // namespace MyTopLevelNamespace::qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(MyTopLevelNamespace::qtprotobufnamespace::tests::EmptyMessage)
diff --git a/tests/auto/protobufgen/data/expected_result/fieldenum/fieldindexrange.qpb.h b/tests/auto/protobufgen/data/expected_result/fieldenum/fieldindexrange.qpb.h
index c8d237f..43c9218 100644
--- a/tests/auto/protobufgen/data/expected_result/fieldenum/fieldindexrange.qpb.h
+++ b/tests/auto/protobufgen/data/expected_result/fieldenum/fieldindexrange.qpb.h
@@ -20,12 +20,28 @@
 namespace qtprotobufnamespace::tests {
 class FieldIndexTest1Message;
 using FieldIndexTest1MessageRepeated = QList<FieldIndexTest1Message>;
+namespace FieldIndexTest1Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace FieldIndexTest1Message_QtProtobufNested
+
 class FieldIndexTest2Message;
 using FieldIndexTest2MessageRepeated = QList<FieldIndexTest2Message>;
+namespace FieldIndexTest2Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace FieldIndexTest2Message_QtProtobufNested
+
 class FieldIndexTest3Message;
 using FieldIndexTest3MessageRepeated = QList<FieldIndexTest3Message>;
+namespace FieldIndexTest3Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace FieldIndexTest3Message_QtProtobufNested
+
 class FieldIndexTest4Message;
 using FieldIndexTest4MessageRepeated = QList<FieldIndexTest4Message>;
+namespace FieldIndexTest4Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace FieldIndexTest4Message_QtProtobufNested
+
 
 class FieldIndexTest1Message_QtProtobufData;
 class FieldIndexTest1Message : public QProtobufMessage
@@ -36,11 +52,7 @@ class FieldIndexTest1Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 31,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = FieldIndexTest1Message_QtProtobufNested::QtProtobufFieldEnum;
     FieldIndexTest1Message();
     ~FieldIndexTest1Message();
     FieldIndexTest1Message(const FieldIndexTest1Message &other);
@@ -57,6 +69,15 @@ public:
 private:
     QExplicitlySharedDataPointer<FieldIndexTest1Message_QtProtobufData> dptr;
 };
+namespace FieldIndexTest1Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 31,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace FieldIndexTest1Message_QtProtobufNested
 
 class FieldIndexTest2Message_QtProtobufData;
 class FieldIndexTest2Message : public QProtobufMessage
@@ -67,11 +88,7 @@ class FieldIndexTest2Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 8191,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = FieldIndexTest2Message_QtProtobufNested::QtProtobufFieldEnum;
     FieldIndexTest2Message();
     ~FieldIndexTest2Message();
     FieldIndexTest2Message(const FieldIndexTest2Message &other);
@@ -88,6 +105,15 @@ public:
 private:
     QExplicitlySharedDataPointer<FieldIndexTest2Message_QtProtobufData> dptr;
 };
+namespace FieldIndexTest2Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 8191,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace FieldIndexTest2Message_QtProtobufNested
 
 class FieldIndexTest3Message_QtProtobufData;
 class FieldIndexTest3Message : public QProtobufMessage
@@ -98,11 +124,7 @@ class FieldIndexTest3Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 2097151,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = FieldIndexTest3Message_QtProtobufNested::QtProtobufFieldEnum;
     FieldIndexTest3Message();
     ~FieldIndexTest3Message();
     FieldIndexTest3Message(const FieldIndexTest3Message &other);
@@ -119,6 +141,15 @@ public:
 private:
     QExplicitlySharedDataPointer<FieldIndexTest3Message_QtProtobufData> dptr;
 };
+namespace FieldIndexTest3Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 2097151,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace FieldIndexTest3Message_QtProtobufNested
 
 class FieldIndexTest4Message_QtProtobufData;
 class FieldIndexTest4Message : public QProtobufMessage
@@ -129,11 +160,7 @@ class FieldIndexTest4Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 536870911,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = FieldIndexTest4Message_QtProtobufNested::QtProtobufFieldEnum;
     FieldIndexTest4Message();
     ~FieldIndexTest4Message();
     FieldIndexTest4Message(const FieldIndexTest4Message &other);
@@ -150,6 +177,15 @@ public:
 private:
     QExplicitlySharedDataPointer<FieldIndexTest4Message_QtProtobufData> dptr;
 };
+namespace FieldIndexTest4Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 536870911,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace FieldIndexTest4Message_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::FieldIndexTest1Message)
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 c04f1a4..e4b00fd 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
@@ -20,38 +20,106 @@
 namespace qtprotobufnamespace::tests {
 class EmptyMessage;
 using EmptyMessageRepeated = QList<EmptyMessage>;
+namespace EmptyMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace EmptyMessage_QtProtobufNested
+
 class SimpleBoolMessage;
 using SimpleBoolMessageRepeated = QList<SimpleBoolMessage>;
+namespace SimpleBoolMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleBoolMessage_QtProtobufNested
+
 class SimpleIntMessage;
 using SimpleIntMessageRepeated = QList<SimpleIntMessage>;
+namespace SimpleIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleIntMessage_QtProtobufNested
+
 class SimpleSIntMessage;
 using SimpleSIntMessageRepeated = QList<SimpleSIntMessage>;
+namespace SimpleSIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSIntMessage_QtProtobufNested
+
 class SimpleUIntMessage;
 using SimpleUIntMessageRepeated = QList<SimpleUIntMessage>;
+namespace SimpleUIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUIntMessage_QtProtobufNested
+
 class SimpleInt64Message;
 using SimpleInt64MessageRepeated = QList<SimpleInt64Message>;
+namespace SimpleInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64Message_QtProtobufNested
+
 class SimpleSInt64Message;
 using SimpleSInt64MessageRepeated = QList<SimpleSInt64Message>;
+namespace SimpleSInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64Message_QtProtobufNested
+
 class SimpleUInt64Message;
 using SimpleUInt64MessageRepeated = QList<SimpleUInt64Message>;
+namespace SimpleUInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64Message_QtProtobufNested
+
 class SimpleStringMessage;
 using SimpleStringMessageRepeated = QList<SimpleStringMessage>;
+namespace SimpleStringMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringMessage_QtProtobufNested
+
 class SimpleFloatMessage;
 using SimpleFloatMessageRepeated = QList<SimpleFloatMessage>;
+namespace SimpleFloatMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFloatMessage_QtProtobufNested
+
 class SimpleDoubleMessage;
 using SimpleDoubleMessageRepeated = QList<SimpleDoubleMessage>;
+namespace SimpleDoubleMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleDoubleMessage_QtProtobufNested
+
 class SimpleBytesMessage;
 using SimpleBytesMessageRepeated = QList<SimpleBytesMessage>;
+namespace SimpleBytesMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleBytesMessage_QtProtobufNested
+
 class SimpleFixedInt32Message;
 using SimpleFixedInt32MessageRepeated = QList<SimpleFixedInt32Message>;
+namespace SimpleFixedInt32Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixedInt32Message_QtProtobufNested
+
 class SimpleFixedInt64Message;
 using SimpleFixedInt64MessageRepeated = QList<SimpleFixedInt64Message>;
+namespace SimpleFixedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixedInt64Message_QtProtobufNested
+
 class SimpleSFixedInt32Message;
 using SimpleSFixedInt32MessageRepeated = QList<SimpleSFixedInt32Message>;
+namespace SimpleSFixedInt32Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixedInt32Message_QtProtobufNested
+
 class SimpleSFixedInt64Message;
 using SimpleSFixedInt64MessageRepeated = QList<SimpleSFixedInt64Message>;
+namespace SimpleSFixedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixedInt64Message_QtProtobufNested
+
 class ComplexMessage;
 using ComplexMessageRepeated = QList<ComplexMessage>;
+namespace ComplexMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace ComplexMessage_QtProtobufNested
+
 
 class EmptyMessage_QtProtobufData;
 class EmptyMessage : public QProtobufMessage
@@ -61,6 +129,7 @@ class EmptyMessage : public QProtobufMessage
     Q_DECLARE_PROTOBUF_SERIALIZERS(EmptyMessage)
 
 public:
+    using QtProtobufFieldEnum = EmptyMessage_QtProtobufNested::QtProtobufFieldEnum;
     EmptyMessage();
     ~EmptyMessage();
     EmptyMessage(const EmptyMessage &other);
@@ -74,6 +143,10 @@ public:
 private:
     QExplicitlySharedDataPointer<EmptyMessage_QtProtobufData> dptr;
 };
+namespace EmptyMessage_QtProtobufNested {
+Q_NAMESPACE
+
+} // namespace EmptyMessage_QtProtobufNested
 
 class SimpleBoolMessage_QtProtobufData;
 class SimpleBoolMessage : public QProtobufMessage
@@ -84,11 +157,7 @@ class SimpleBoolMessage : public QProtobufMessage
     Q_PROPERTY(bool testFieldBool READ testFieldBool WRITE setTestFieldBool SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldBoolProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleBoolMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleBoolMessage();
     ~SimpleBoolMessage();
     SimpleBoolMessage(const SimpleBoolMessage &other);
@@ -105,6 +174,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleBoolMessage_QtProtobufData> dptr;
 };
+namespace SimpleBoolMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldBoolProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleBoolMessage_QtProtobufNested
 
 class SimpleIntMessage_QtProtobufData;
 class SimpleIntMessage : public QProtobufMessage
@@ -115,11 +193,7 @@ class SimpleIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleIntMessage();
     ~SimpleIntMessage();
     SimpleIntMessage(const SimpleIntMessage &other);
@@ -136,6 +210,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleIntMessage_QtProtobufData> dptr;
 };
+namespace SimpleIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleIntMessage_QtProtobufNested
 
 class SimpleSIntMessage_QtProtobufData;
 class SimpleSIntMessage : public QProtobufMessage
@@ -146,11 +229,7 @@ class SimpleSIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleSIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleSIntMessage();
     ~SimpleSIntMessage();
     SimpleSIntMessage(const SimpleSIntMessage &other);
@@ -167,6 +246,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSIntMessage_QtProtobufData> dptr;
 };
+namespace SimpleSIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSIntMessage_QtProtobufNested
 
 class SimpleUIntMessage_QtProtobufData;
 class SimpleUIntMessage : public QProtobufMessage
@@ -177,11 +265,7 @@ class SimpleUIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleUIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleUIntMessage();
     ~SimpleUIntMessage();
     SimpleUIntMessage(const SimpleUIntMessage &other);
@@ -198,6 +282,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUIntMessage_QtProtobufData> dptr;
 };
+namespace SimpleUIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUIntMessage_QtProtobufNested
 
 class SimpleInt64Message_QtProtobufData;
 class SimpleInt64Message : public QProtobufMessage
@@ -208,11 +301,7 @@ class SimpleInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleInt64Message();
     ~SimpleInt64Message();
     SimpleInt64Message(const SimpleInt64Message &other);
@@ -229,6 +318,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64Message_QtProtobufData> dptr;
 };
+namespace SimpleInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64Message_QtProtobufNested
 
 class SimpleSInt64Message_QtProtobufData;
 class SimpleSInt64Message : public QProtobufMessage
@@ -239,11 +337,7 @@ class SimpleSInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleSInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleSInt64Message();
     ~SimpleSInt64Message();
     SimpleSInt64Message(const SimpleSInt64Message &other);
@@ -260,6 +354,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64Message_QtProtobufData> dptr;
 };
+namespace SimpleSInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64Message_QtProtobufNested
 
 class SimpleUInt64Message_QtProtobufData;
 class SimpleUInt64Message : public QProtobufMessage
@@ -270,11 +373,7 @@ class SimpleUInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleUInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleUInt64Message();
     ~SimpleUInt64Message();
     SimpleUInt64Message(const SimpleUInt64Message &other);
@@ -291,6 +390,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64Message_QtProtobufData> dptr;
 };
+namespace SimpleUInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64Message_QtProtobufNested
 
 class SimpleStringMessage_QtProtobufData;
 class SimpleStringMessage : public QProtobufMessage
@@ -301,11 +409,7 @@ class SimpleStringMessage : public QProtobufMessage
     Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldStringProtoFieldNumber = 6,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleStringMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleStringMessage();
     ~SimpleStringMessage();
     SimpleStringMessage(const SimpleStringMessage &other);
@@ -322,6 +426,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldStringProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringMessage_QtProtobufNested
 
 class SimpleFloatMessage_QtProtobufData;
 class SimpleFloatMessage : public QProtobufMessage
@@ -332,11 +445,7 @@ class SimpleFloatMessage : public QProtobufMessage
     Q_PROPERTY(float testFieldFloat READ testFieldFloat WRITE setTestFieldFloat SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldFloatProtoFieldNumber = 7,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleFloatMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleFloatMessage();
     ~SimpleFloatMessage();
     SimpleFloatMessage(const SimpleFloatMessage &other);
@@ -353,6 +462,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFloatMessage_QtProtobufData> dptr;
 };
+namespace SimpleFloatMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldFloatProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFloatMessage_QtProtobufNested
 
 class SimpleDoubleMessage_QtProtobufData;
 class SimpleDoubleMessage : public QProtobufMessage
@@ -363,11 +481,7 @@ class SimpleDoubleMessage : public QProtobufMessage
     Q_PROPERTY(double testFieldDouble READ testFieldDouble WRITE setTestFieldDouble SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldDoubleProtoFieldNumber = 8,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleDoubleMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleDoubleMessage();
     ~SimpleDoubleMessage();
     SimpleDoubleMessage(const SimpleDoubleMessage &other);
@@ -384,6 +498,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleDoubleMessage_QtProtobufData> dptr;
 };
+namespace SimpleDoubleMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldDoubleProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleDoubleMessage_QtProtobufNested
 
 class SimpleBytesMessage_QtProtobufData;
 class SimpleBytesMessage : public QProtobufMessage
@@ -394,11 +517,7 @@ class SimpleBytesMessage : public QProtobufMessage
     Q_PROPERTY(QByteArray testFieldBytes READ testFieldBytes WRITE setTestFieldBytes SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldBytesProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleBytesMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleBytesMessage();
     ~SimpleBytesMessage();
     SimpleBytesMessage(const SimpleBytesMessage &other);
@@ -415,6 +534,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleBytesMessage_QtProtobufData> dptr;
 };
+namespace SimpleBytesMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldBytesProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleBytesMessage_QtProtobufNested
 
 class SimpleFixedInt32Message_QtProtobufData;
 class SimpleFixedInt32Message : public QProtobufMessage
@@ -425,11 +553,7 @@ class SimpleFixedInt32Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldFixedInt32ProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleFixedInt32Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleFixedInt32Message();
     ~SimpleFixedInt32Message();
     SimpleFixedInt32Message(const SimpleFixedInt32Message &other);
@@ -446,6 +570,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixedInt32Message_QtProtobufData> dptr;
 };
+namespace SimpleFixedInt32Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldFixedInt32ProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixedInt32Message_QtProtobufNested
 
 class SimpleFixedInt64Message_QtProtobufData;
 class SimpleFixedInt64Message : public QProtobufMessage
@@ -456,11 +589,7 @@ class SimpleFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldFixedInt64ProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleFixedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleFixedInt64Message();
     ~SimpleFixedInt64Message();
     SimpleFixedInt64Message(const SimpleFixedInt64Message &other);
@@ -477,6 +606,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixedInt64Message_QtProtobufData> dptr;
 };
+namespace SimpleFixedInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldFixedInt64ProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixedInt64Message_QtProtobufNested
 
 class SimpleSFixedInt32Message_QtProtobufData;
 class SimpleSFixedInt32Message : public QProtobufMessage
@@ -487,11 +625,7 @@ class SimpleSFixedInt32Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldFixedInt32ProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleSFixedInt32Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleSFixedInt32Message();
     ~SimpleSFixedInt32Message();
     SimpleSFixedInt32Message(const SimpleSFixedInt32Message &other);
@@ -508,6 +642,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixedInt32Message_QtProtobufData> dptr;
 };
+namespace SimpleSFixedInt32Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldFixedInt32ProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixedInt32Message_QtProtobufNested
 
 class SimpleSFixedInt64Message_QtProtobufData;
 class SimpleSFixedInt64Message : public QProtobufMessage
@@ -518,11 +661,7 @@ class SimpleSFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldFixedInt64ProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleSFixedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleSFixedInt64Message();
     ~SimpleSFixedInt64Message();
     SimpleSFixedInt64Message(const SimpleSFixedInt64Message &other);
@@ -539,6 +678,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixedInt64Message_QtProtobufData> dptr;
 };
+namespace SimpleSFixedInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldFixedInt64ProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixedInt64Message_QtProtobufNested
 
 class ComplexMessage_QtProtobufData;
 class ComplexMessage : public QProtobufMessage
@@ -550,12 +698,7 @@ class ComplexMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringMessage *testComplexField_p READ testComplexField_p WRITE setTestComplexField_p)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-        TestComplexFieldProtoFieldNumber = 2,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = ComplexMessage_QtProtobufNested::QtProtobufFieldEnum;
     ComplexMessage();
     ~ComplexMessage();
     ComplexMessage(const ComplexMessage &other);
@@ -578,6 +721,16 @@ private:
     void setTestComplexField_p(SimpleStringMessage *testComplexField);
     QExplicitlySharedDataPointer<ComplexMessage_QtProtobufData> dptr;
 };
+namespace ComplexMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+    TestComplexFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace ComplexMessage_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::EmptyMessage)
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 ea677e0..412a132 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
@@ -21,180 +21,532 @@
 namespace qtprotobufnamespace::tests {
 class SimpleSInt32StringMapMessage;
 using SimpleSInt32StringMapMessageRepeated = QList<SimpleSInt32StringMapMessage>;
+namespace SimpleSInt32StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt32StringMapMessage_QtProtobufNested
+
 class SimpleSInt64StringMapMessage;
 using SimpleSInt64StringMapMessageRepeated = QList<SimpleSInt64StringMapMessage>;
+namespace SimpleSInt64StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64StringMapMessage_QtProtobufNested
+
 class SimpleInt32StringMapMessage;
 using SimpleInt32StringMapMessageRepeated = QList<SimpleInt32StringMapMessage>;
+namespace SimpleInt32StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt32StringMapMessage_QtProtobufNested
+
 class SimpleInt64StringMapMessage;
 using SimpleInt64StringMapMessageRepeated = QList<SimpleInt64StringMapMessage>;
+namespace SimpleInt64StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64StringMapMessage_QtProtobufNested
+
 class SimpleUInt32StringMapMessage;
 using SimpleUInt32StringMapMessageRepeated = QList<SimpleUInt32StringMapMessage>;
+namespace SimpleUInt32StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt32StringMapMessage_QtProtobufNested
+
 class SimpleUInt64StringMapMessage;
 using SimpleUInt64StringMapMessageRepeated = QList<SimpleUInt64StringMapMessage>;
+namespace SimpleUInt64StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64StringMapMessage_QtProtobufNested
+
 class SimpleFixed32StringMapMessage;
 using SimpleFixed32StringMapMessageRepeated = QList<SimpleFixed32StringMapMessage>;
+namespace SimpleFixed32StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed32StringMapMessage_QtProtobufNested
+
 class SimpleFixed64StringMapMessage;
 using SimpleFixed64StringMapMessageRepeated = QList<SimpleFixed64StringMapMessage>;
+namespace SimpleFixed64StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed64StringMapMessage_QtProtobufNested
+
 class SimpleSFixed32StringMapMessage;
 using SimpleSFixed32StringMapMessageRepeated = QList<SimpleSFixed32StringMapMessage>;
+namespace SimpleSFixed32StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed32StringMapMessage_QtProtobufNested
+
 class SimpleSFixed64StringMapMessage;
 using SimpleSFixed64StringMapMessageRepeated = QList<SimpleSFixed64StringMapMessage>;
+namespace SimpleSFixed64StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed64StringMapMessage_QtProtobufNested
+
 class SimpleStringStringMapMessage;
 using SimpleStringStringMapMessageRepeated = QList<SimpleStringStringMapMessage>;
+namespace SimpleStringStringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringStringMapMessage_QtProtobufNested
+
 class SimpleSInt32SInt32MapMessage;
 using SimpleSInt32SInt32MapMessageRepeated = QList<SimpleSInt32SInt32MapMessage>;
+namespace SimpleSInt32SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt32SInt32MapMessage_QtProtobufNested
+
 class SimpleSInt64SInt32MapMessage;
 using SimpleSInt64SInt32MapMessageRepeated = QList<SimpleSInt64SInt32MapMessage>;
+namespace SimpleSInt64SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64SInt32MapMessage_QtProtobufNested
+
 class SimpleInt32SInt32MapMessage;
 using SimpleInt32SInt32MapMessageRepeated = QList<SimpleInt32SInt32MapMessage>;
+namespace SimpleInt32SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt32SInt32MapMessage_QtProtobufNested
+
 class SimpleInt64SInt32MapMessage;
 using SimpleInt64SInt32MapMessageRepeated = QList<SimpleInt64SInt32MapMessage>;
+namespace SimpleInt64SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64SInt32MapMessage_QtProtobufNested
+
 class SimpleUInt32SInt32MapMessage;
 using SimpleUInt32SInt32MapMessageRepeated = QList<SimpleUInt32SInt32MapMessage>;
+namespace SimpleUInt32SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt32SInt32MapMessage_QtProtobufNested
+
 class SimpleUInt64SInt32MapMessage;
 using SimpleUInt64SInt32MapMessageRepeated = QList<SimpleUInt64SInt32MapMessage>;
+namespace SimpleUInt64SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64SInt32MapMessage_QtProtobufNested
+
 class SimpleFixed32SInt32MapMessage;
 using SimpleFixed32SInt32MapMessageRepeated = QList<SimpleFixed32SInt32MapMessage>;
+namespace SimpleFixed32SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed32SInt32MapMessage_QtProtobufNested
+
 class SimpleFixed64SInt32MapMessage;
 using SimpleFixed64SInt32MapMessageRepeated = QList<SimpleFixed64SInt32MapMessage>;
+namespace SimpleFixed64SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed64SInt32MapMessage_QtProtobufNested
+
 class SimpleSFixed32SInt32MapMessage;
 using SimpleSFixed32SInt32MapMessageRepeated = QList<SimpleSFixed32SInt32MapMessage>;
+namespace SimpleSFixed32SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed32SInt32MapMessage_QtProtobufNested
+
 class SimpleSFixed64SInt32MapMessage;
 using SimpleSFixed64SInt32MapMessageRepeated = QList<SimpleSFixed64SInt32MapMessage>;
+namespace SimpleSFixed64SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed64SInt32MapMessage_QtProtobufNested
+
 class SimpleStringSInt32MapMessage;
 using SimpleStringSInt32MapMessageRepeated = QList<SimpleStringSInt32MapMessage>;
+namespace SimpleStringSInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringSInt32MapMessage_QtProtobufNested
+
 class SimpleSInt32SInt64MapMessage;
 using SimpleSInt32SInt64MapMessageRepeated = QList<SimpleSInt32SInt64MapMessage>;
+namespace SimpleSInt32SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt32SInt64MapMessage_QtProtobufNested
+
 class SimpleSInt64SInt64MapMessage;
 using SimpleSInt64SInt64MapMessageRepeated = QList<SimpleSInt64SInt64MapMessage>;
+namespace SimpleSInt64SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64SInt64MapMessage_QtProtobufNested
+
 class SimpleInt32SInt64MapMessage;
 using SimpleInt32SInt64MapMessageRepeated = QList<SimpleInt32SInt64MapMessage>;
+namespace SimpleInt32SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt32SInt64MapMessage_QtProtobufNested
+
 class SimpleInt64SInt64MapMessage;
 using SimpleInt64SInt64MapMessageRepeated = QList<SimpleInt64SInt64MapMessage>;
+namespace SimpleInt64SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64SInt64MapMessage_QtProtobufNested
+
 class SimpleUInt32SInt64MapMessage;
 using SimpleUInt32SInt64MapMessageRepeated = QList<SimpleUInt32SInt64MapMessage>;
+namespace SimpleUInt32SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt32SInt64MapMessage_QtProtobufNested
+
 class SimpleUInt64SInt64MapMessage;
 using SimpleUInt64SInt64MapMessageRepeated = QList<SimpleUInt64SInt64MapMessage>;
+namespace SimpleUInt64SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64SInt64MapMessage_QtProtobufNested
+
 class SimpleFixed32SInt64MapMessage;
 using SimpleFixed32SInt64MapMessageRepeated = QList<SimpleFixed32SInt64MapMessage>;
+namespace SimpleFixed32SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed32SInt64MapMessage_QtProtobufNested
+
 class SimpleFixed64SInt64MapMessage;
 using SimpleFixed64SInt64MapMessageRepeated = QList<SimpleFixed64SInt64MapMessage>;
+namespace SimpleFixed64SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed64SInt64MapMessage_QtProtobufNested
+
 class SimpleSFixed32SInt64MapMessage;
 using SimpleSFixed32SInt64MapMessageRepeated = QList<SimpleSFixed32SInt64MapMessage>;
+namespace SimpleSFixed32SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed32SInt64MapMessage_QtProtobufNested
+
 class SimpleSFixed64SInt64MapMessage;
 using SimpleSFixed64SInt64MapMessageRepeated = QList<SimpleSFixed64SInt64MapMessage>;
+namespace SimpleSFixed64SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed64SInt64MapMessage_QtProtobufNested
+
 class SimpleStringSInt64MapMessage;
 using SimpleStringSInt64MapMessageRepeated = QList<SimpleStringSInt64MapMessage>;
+namespace SimpleStringSInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringSInt64MapMessage_QtProtobufNested
+
 class SimpleSInt32UInt32MapMessage;
 using SimpleSInt32UInt32MapMessageRepeated = QList<SimpleSInt32UInt32MapMessage>;
+namespace SimpleSInt32UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt32UInt32MapMessage_QtProtobufNested
+
 class SimpleSInt64UInt32MapMessage;
 using SimpleSInt64UInt32MapMessageRepeated = QList<SimpleSInt64UInt32MapMessage>;
+namespace SimpleSInt64UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64UInt32MapMessage_QtProtobufNested
+
 class SimpleInt32UInt32MapMessage;
 using SimpleInt32UInt32MapMessageRepeated = QList<SimpleInt32UInt32MapMessage>;
+namespace SimpleInt32UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt32UInt32MapMessage_QtProtobufNested
+
 class SimpleInt64UInt32MapMessage;
 using SimpleInt64UInt32MapMessageRepeated = QList<SimpleInt64UInt32MapMessage>;
+namespace SimpleInt64UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64UInt32MapMessage_QtProtobufNested
+
 class SimpleUInt32UInt32MapMessage;
 using SimpleUInt32UInt32MapMessageRepeated = QList<SimpleUInt32UInt32MapMessage>;
+namespace SimpleUInt32UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt32UInt32MapMessage_QtProtobufNested
+
 class SimpleUInt64UInt32MapMessage;
 using SimpleUInt64UInt32MapMessageRepeated = QList<SimpleUInt64UInt32MapMessage>;
+namespace SimpleUInt64UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64UInt32MapMessage_QtProtobufNested
+
 class SimpleFixed32UInt32MapMessage;
 using SimpleFixed32UInt32MapMessageRepeated = QList<SimpleFixed32UInt32MapMessage>;
+namespace SimpleFixed32UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed32UInt32MapMessage_QtProtobufNested
+
 class SimpleFixed64UInt32MapMessage;
 using SimpleFixed64UInt32MapMessageRepeated = QList<SimpleFixed64UInt32MapMessage>;
+namespace SimpleFixed64UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed64UInt32MapMessage_QtProtobufNested
+
 class SimpleSFixed32UInt32MapMessage;
 using SimpleSFixed32UInt32MapMessageRepeated = QList<SimpleSFixed32UInt32MapMessage>;
+namespace SimpleSFixed32UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed32UInt32MapMessage_QtProtobufNested
+
 class SimpleSFixed64UInt32MapMessage;
 using SimpleSFixed64UInt32MapMessageRepeated = QList<SimpleSFixed64UInt32MapMessage>;
+namespace SimpleSFixed64UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed64UInt32MapMessage_QtProtobufNested
+
 class SimpleStringUInt32MapMessage;
 using SimpleStringUInt32MapMessageRepeated = QList<SimpleStringUInt32MapMessage>;
+namespace SimpleStringUInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringUInt32MapMessage_QtProtobufNested
+
 class SimpleSInt32UInt64MapMessage;
 using SimpleSInt32UInt64MapMessageRepeated = QList<SimpleSInt32UInt64MapMessage>;
+namespace SimpleSInt32UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt32UInt64MapMessage_QtProtobufNested
+
 class SimpleSInt64UInt64MapMessage;
 using SimpleSInt64UInt64MapMessageRepeated = QList<SimpleSInt64UInt64MapMessage>;
+namespace SimpleSInt64UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64UInt64MapMessage_QtProtobufNested
+
 class SimpleInt32UInt64MapMessage;
 using SimpleInt32UInt64MapMessageRepeated = QList<SimpleInt32UInt64MapMessage>;
+namespace SimpleInt32UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt32UInt64MapMessage_QtProtobufNested
+
 class SimpleInt64UInt64MapMessage;
 using SimpleInt64UInt64MapMessageRepeated = QList<SimpleInt64UInt64MapMessage>;
+namespace SimpleInt64UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64UInt64MapMessage_QtProtobufNested
+
 class SimpleUInt32UInt64MapMessage;
 using SimpleUInt32UInt64MapMessageRepeated = QList<SimpleUInt32UInt64MapMessage>;
+namespace SimpleUInt32UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt32UInt64MapMessage_QtProtobufNested
+
 class SimpleUInt64UInt64MapMessage;
 using SimpleUInt64UInt64MapMessageRepeated = QList<SimpleUInt64UInt64MapMessage>;
+namespace SimpleUInt64UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64UInt64MapMessage_QtProtobufNested
+
 class SimpleFixed32UInt64MapMessage;
 using SimpleFixed32UInt64MapMessageRepeated = QList<SimpleFixed32UInt64MapMessage>;
+namespace SimpleFixed32UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed32UInt64MapMessage_QtProtobufNested
+
 class SimpleFixed64UInt64MapMessage;
 using SimpleFixed64UInt64MapMessageRepeated = QList<SimpleFixed64UInt64MapMessage>;
+namespace SimpleFixed64UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed64UInt64MapMessage_QtProtobufNested
+
 class SimpleSFixed32UInt64MapMessage;
 using SimpleSFixed32UInt64MapMessageRepeated = QList<SimpleSFixed32UInt64MapMessage>;
+namespace SimpleSFixed32UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed32UInt64MapMessage_QtProtobufNested
+
 class SimpleSFixed64UInt64MapMessage;
 using SimpleSFixed64UInt64MapMessageRepeated = QList<SimpleSFixed64UInt64MapMessage>;
+namespace SimpleSFixed64UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed64UInt64MapMessage_QtProtobufNested
+
 class SimpleStringUInt64MapMessage;
 using SimpleStringUInt64MapMessageRepeated = QList<SimpleStringUInt64MapMessage>;
+namespace SimpleStringUInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringUInt64MapMessage_QtProtobufNested
+
 class SimpleSInt32Int32MapMessage;
 using SimpleSInt32Int32MapMessageRepeated = QList<SimpleSInt32Int32MapMessage>;
+namespace SimpleSInt32Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt32Int32MapMessage_QtProtobufNested
+
 class SimpleSInt64Int32MapMessage;
 using SimpleSInt64Int32MapMessageRepeated = QList<SimpleSInt64Int32MapMessage>;
+namespace SimpleSInt64Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64Int32MapMessage_QtProtobufNested
+
 class SimpleInt32Int32MapMessage;
 using SimpleInt32Int32MapMessageRepeated = QList<SimpleInt32Int32MapMessage>;
+namespace SimpleInt32Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt32Int32MapMessage_QtProtobufNested
+
 class SimpleInt64Int32MapMessage;
 using SimpleInt64Int32MapMessageRepeated = QList<SimpleInt64Int32MapMessage>;
+namespace SimpleInt64Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64Int32MapMessage_QtProtobufNested
+
 class SimpleUInt32Int32MapMessage;
 using SimpleUInt32Int32MapMessageRepeated = QList<SimpleUInt32Int32MapMessage>;
+namespace SimpleUInt32Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt32Int32MapMessage_QtProtobufNested
+
 class SimpleUInt64Int32MapMessage;
 using SimpleUInt64Int32MapMessageRepeated = QList<SimpleUInt64Int32MapMessage>;
+namespace SimpleUInt64Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64Int32MapMessage_QtProtobufNested
+
 class SimpleFixed32Int32MapMessage;
 using SimpleFixed32Int32MapMessageRepeated = QList<SimpleFixed32Int32MapMessage>;
+namespace SimpleFixed32Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed32Int32MapMessage_QtProtobufNested
+
 class SimpleFixed64Int32MapMessage;
 using SimpleFixed64Int32MapMessageRepeated = QList<SimpleFixed64Int32MapMessage>;
+namespace SimpleFixed64Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed64Int32MapMessage_QtProtobufNested
+
 class SimpleSFixed32Int32MapMessage;
 using SimpleSFixed32Int32MapMessageRepeated = QList<SimpleSFixed32Int32MapMessage>;
+namespace SimpleSFixed32Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed32Int32MapMessage_QtProtobufNested
+
 class SimpleSFixed64Int32MapMessage;
 using SimpleSFixed64Int32MapMessageRepeated = QList<SimpleSFixed64Int32MapMessage>;
+namespace SimpleSFixed64Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed64Int32MapMessage_QtProtobufNested
+
 class SimpleStringInt32MapMessage;
 using SimpleStringInt32MapMessageRepeated = QList<SimpleStringInt32MapMessage>;
+namespace SimpleStringInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringInt32MapMessage_QtProtobufNested
+
 class SimpleSInt32Int64MapMessage;
 using SimpleSInt32Int64MapMessageRepeated = QList<SimpleSInt32Int64MapMessage>;
+namespace SimpleSInt32Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt32Int64MapMessage_QtProtobufNested
+
 class SimpleSInt64Int64MapMessage;
 using SimpleSInt64Int64MapMessageRepeated = QList<SimpleSInt64Int64MapMessage>;
+namespace SimpleSInt64Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64Int64MapMessage_QtProtobufNested
+
 class SimpleInt32Int64MapMessage;
 using SimpleInt32Int64MapMessageRepeated = QList<SimpleInt32Int64MapMessage>;
+namespace SimpleInt32Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt32Int64MapMessage_QtProtobufNested
+
 class SimpleInt64Int64MapMessage;
 using SimpleInt64Int64MapMessageRepeated = QList<SimpleInt64Int64MapMessage>;
+namespace SimpleInt64Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64Int64MapMessage_QtProtobufNested
+
 class SimpleUInt32Int64MapMessage;
 using SimpleUInt32Int64MapMessageRepeated = QList<SimpleUInt32Int64MapMessage>;
+namespace SimpleUInt32Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt32Int64MapMessage_QtProtobufNested
+
 class SimpleUInt64Int64MapMessage;
 using SimpleUInt64Int64MapMessageRepeated = QList<SimpleUInt64Int64MapMessage>;
+namespace SimpleUInt64Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64Int64MapMessage_QtProtobufNested
+
 class SimpleFixed32Int64MapMessage;
 using SimpleFixed32Int64MapMessageRepeated = QList<SimpleFixed32Int64MapMessage>;
+namespace SimpleFixed32Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed32Int64MapMessage_QtProtobufNested
+
 class SimpleFixed64Int64MapMessage;
 using SimpleFixed64Int64MapMessageRepeated = QList<SimpleFixed64Int64MapMessage>;
+namespace SimpleFixed64Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed64Int64MapMessage_QtProtobufNested
+
 class SimpleSFixed32Int64MapMessage;
 using SimpleSFixed32Int64MapMessageRepeated = QList<SimpleSFixed32Int64MapMessage>;
+namespace SimpleSFixed32Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed32Int64MapMessage_QtProtobufNested
+
 class SimpleSFixed64Int64MapMessage;
 using SimpleSFixed64Int64MapMessageRepeated = QList<SimpleSFixed64Int64MapMessage>;
+namespace SimpleSFixed64Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed64Int64MapMessage_QtProtobufNested
+
 class SimpleStringInt64MapMessage;
 using SimpleStringInt64MapMessageRepeated = QList<SimpleStringInt64MapMessage>;
+namespace SimpleStringInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringInt64MapMessage_QtProtobufNested
+
 class SimpleSInt32ComplexMessageMapMessage;
 using SimpleSInt32ComplexMessageMapMessageRepeated = QList<SimpleSInt32ComplexMessageMapMessage>;
+namespace SimpleSInt32ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt32ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleSInt64ComplexMessageMapMessage;
 using SimpleSInt64ComplexMessageMapMessageRepeated = QList<SimpleSInt64ComplexMessageMapMessage>;
+namespace SimpleSInt64ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleInt32ComplexMessageMapMessage;
 using SimpleInt32ComplexMessageMapMessageRepeated = QList<SimpleInt32ComplexMessageMapMessage>;
+namespace SimpleInt32ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt32ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleInt64ComplexMessageMapMessage;
 using SimpleInt64ComplexMessageMapMessageRepeated = QList<SimpleInt64ComplexMessageMapMessage>;
+namespace SimpleInt64ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleUInt32ComplexMessageMapMessage;
 using SimpleUInt32ComplexMessageMapMessageRepeated = QList<SimpleUInt32ComplexMessageMapMessage>;
+namespace SimpleUInt32ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt32ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleUInt64ComplexMessageMapMessage;
 using SimpleUInt64ComplexMessageMapMessageRepeated = QList<SimpleUInt64ComplexMessageMapMessage>;
+namespace SimpleUInt64ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleFixed32ComplexMessageMapMessage;
 using SimpleFixed32ComplexMessageMapMessageRepeated = QList<SimpleFixed32ComplexMessageMapMessage>;
+namespace SimpleFixed32ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed32ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleFixed64ComplexMessageMapMessage;
 using SimpleFixed64ComplexMessageMapMessageRepeated = QList<SimpleFixed64ComplexMessageMapMessage>;
+namespace SimpleFixed64ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed64ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleSFixed32ComplexMessageMapMessage;
 using SimpleSFixed32ComplexMessageMapMessageRepeated = QList<SimpleSFixed32ComplexMessageMapMessage>;
+namespace SimpleSFixed32ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed32ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleSFixed64ComplexMessageMapMessage;
 using SimpleSFixed64ComplexMessageMapMessageRepeated = QList<SimpleSFixed64ComplexMessageMapMessage>;
+namespace SimpleSFixed64ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed64ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleStringComplexMessageMapMessage;
 using SimpleStringComplexMessageMapMessageRepeated = QList<SimpleStringComplexMessageMapMessage>;
+namespace SimpleStringComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringComplexMessageMapMessage_QtProtobufNested
+
 
 class SimpleSInt32StringMapMessage_QtProtobufData;
 class SimpleSInt32StringMapMessage : public QProtobufMessage
@@ -205,11 +557,7 @@ 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 QtProtobufFieldEnum = SimpleSInt32StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint32, QString>;
     SimpleSInt32StringMapMessage();
     ~SimpleSInt32StringMapMessage();
@@ -228,6 +576,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt32StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt32StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt32StringMapMessage_QtProtobufNested
 
 class SimpleSInt64StringMapMessage_QtProtobufData;
 class SimpleSInt64StringMapMessage : public QProtobufMessage
@@ -238,11 +595,7 @@ 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 QtProtobufFieldEnum = SimpleSInt64StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint64, QString>;
     SimpleSInt64StringMapMessage();
     ~SimpleSInt64StringMapMessage();
@@ -261,6 +614,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt64StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64StringMapMessage_QtProtobufNested
 
 class SimpleInt32StringMapMessage_QtProtobufData;
 class SimpleInt32StringMapMessage : public QProtobufMessage
@@ -271,11 +633,7 @@ 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 QtProtobufFieldEnum = SimpleInt32StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int32, QString>;
     SimpleInt32StringMapMessage();
     ~SimpleInt32StringMapMessage();
@@ -294,6 +652,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt32StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt32StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 3,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt32StringMapMessage_QtProtobufNested
 
 class SimpleInt64StringMapMessage_QtProtobufData;
 class SimpleInt64StringMapMessage : public QProtobufMessage
@@ -304,11 +671,7 @@ 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 QtProtobufFieldEnum = SimpleInt64StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int64, QString>;
     SimpleInt64StringMapMessage();
     ~SimpleInt64StringMapMessage();
@@ -327,6 +690,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt64StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 4,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64StringMapMessage_QtProtobufNested
 
 class SimpleUInt32StringMapMessage_QtProtobufData;
 class SimpleUInt32StringMapMessage : public QProtobufMessage
@@ -337,11 +709,7 @@ 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 QtProtobufFieldEnum = SimpleUInt32StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint32, QString>;
     SimpleUInt32StringMapMessage();
     ~SimpleUInt32StringMapMessage();
@@ -360,6 +728,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt32StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt32StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt32StringMapMessage_QtProtobufNested
 
 class SimpleUInt64StringMapMessage_QtProtobufData;
 class SimpleUInt64StringMapMessage : public QProtobufMessage
@@ -370,11 +747,7 @@ 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 QtProtobufFieldEnum = SimpleUInt64StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint64, QString>;
     SimpleUInt64StringMapMessage();
     ~SimpleUInt64StringMapMessage();
@@ -393,6 +766,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt64StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64StringMapMessage_QtProtobufNested
 
 class SimpleFixed32StringMapMessage_QtProtobufData;
 class SimpleFixed32StringMapMessage : public QProtobufMessage
@@ -403,11 +785,7 @@ 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 QtProtobufFieldEnum = SimpleFixed32StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QString>;
     SimpleFixed32StringMapMessage();
     ~SimpleFixed32StringMapMessage();
@@ -426,6 +804,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed32StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed32StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed32StringMapMessage_QtProtobufNested
 
 class SimpleFixed64StringMapMessage_QtProtobufData;
 class SimpleFixed64StringMapMessage : public QProtobufMessage
@@ -436,11 +823,7 @@ 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 QtProtobufFieldEnum = SimpleFixed64StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QString>;
     SimpleFixed64StringMapMessage();
     ~SimpleFixed64StringMapMessage();
@@ -459,6 +842,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed64StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed64StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed64StringMapMessage_QtProtobufNested
 
 class SimpleSFixed32StringMapMessage_QtProtobufData;
 class SimpleSFixed32StringMapMessage : public QProtobufMessage
@@ -469,11 +861,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed32StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QString>;
     SimpleSFixed32StringMapMessage();
     ~SimpleSFixed32StringMapMessage();
@@ -492,6 +880,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed32StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed32StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 9,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed32StringMapMessage_QtProtobufNested
 
 class SimpleSFixed64StringMapMessage_QtProtobufData;
 class SimpleSFixed64StringMapMessage : public QProtobufMessage
@@ -502,11 +899,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed64StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QString>;
     SimpleSFixed64StringMapMessage();
     ~SimpleSFixed64StringMapMessage();
@@ -525,6 +918,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed64StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed64StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 10,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed64StringMapMessage_QtProtobufNested
 
 class SimpleStringStringMapMessage_QtProtobufData;
 class SimpleStringStringMapMessage : public QProtobufMessage
@@ -535,11 +937,7 @@ 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 QtProtobufFieldEnum = SimpleStringStringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QString, QString>;
     SimpleStringStringMapMessage();
     ~SimpleStringStringMapMessage();
@@ -558,6 +956,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringStringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringStringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 13,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringStringMapMessage_QtProtobufNested
 
 class SimpleSInt32SInt32MapMessage_QtProtobufData;
 class SimpleSInt32SInt32MapMessage : public QProtobufMessage
@@ -568,11 +975,7 @@ 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 QtProtobufFieldEnum = SimpleSInt32SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::sint32>;
     SimpleSInt32SInt32MapMessage();
     ~SimpleSInt32SInt32MapMessage();
@@ -591,6 +994,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt32SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt32SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt32SInt32MapMessage_QtProtobufNested
 
 class SimpleSInt64SInt32MapMessage_QtProtobufData;
 class SimpleSInt64SInt32MapMessage : public QProtobufMessage
@@ -601,11 +1013,7 @@ 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 QtProtobufFieldEnum = SimpleSInt64SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::sint32>;
     SimpleSInt64SInt32MapMessage();
     ~SimpleSInt64SInt32MapMessage();
@@ -624,6 +1032,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt64SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64SInt32MapMessage_QtProtobufNested
 
 class SimpleInt32SInt32MapMessage_QtProtobufData;
 class SimpleInt32SInt32MapMessage : public QProtobufMessage
@@ -634,11 +1051,7 @@ 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 QtProtobufFieldEnum = SimpleInt32SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::sint32>;
     SimpleInt32SInt32MapMessage();
     ~SimpleInt32SInt32MapMessage();
@@ -657,6 +1070,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt32SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt32SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 3,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt32SInt32MapMessage_QtProtobufNested
 
 class SimpleInt64SInt32MapMessage_QtProtobufData;
 class SimpleInt64SInt32MapMessage : public QProtobufMessage
@@ -667,11 +1089,7 @@ 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 QtProtobufFieldEnum = SimpleInt64SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::sint32>;
     SimpleInt64SInt32MapMessage();
     ~SimpleInt64SInt32MapMessage();
@@ -690,6 +1108,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt64SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 4,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64SInt32MapMessage_QtProtobufNested
 
 class SimpleUInt32SInt32MapMessage_QtProtobufData;
 class SimpleUInt32SInt32MapMessage : public QProtobufMessage
@@ -700,11 +1127,7 @@ 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 QtProtobufFieldEnum = SimpleUInt32SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::sint32>;
     SimpleUInt32SInt32MapMessage();
     ~SimpleUInt32SInt32MapMessage();
@@ -723,6 +1146,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt32SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt32SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt32SInt32MapMessage_QtProtobufNested
 
 class SimpleUInt64SInt32MapMessage_QtProtobufData;
 class SimpleUInt64SInt32MapMessage : public QProtobufMessage
@@ -733,11 +1165,7 @@ 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 QtProtobufFieldEnum = SimpleUInt64SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::sint32>;
     SimpleUInt64SInt32MapMessage();
     ~SimpleUInt64SInt32MapMessage();
@@ -756,6 +1184,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt64SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64SInt32MapMessage_QtProtobufNested
 
 class SimpleFixed32SInt32MapMessage_QtProtobufData;
 class SimpleFixed32SInt32MapMessage : public QProtobufMessage
@@ -766,11 +1203,7 @@ 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 QtProtobufFieldEnum = SimpleFixed32SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::sint32>;
     SimpleFixed32SInt32MapMessage();
     ~SimpleFixed32SInt32MapMessage();
@@ -789,6 +1222,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed32SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed32SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed32SInt32MapMessage_QtProtobufNested
 
 class SimpleFixed64SInt32MapMessage_QtProtobufData;
 class SimpleFixed64SInt32MapMessage : public QProtobufMessage
@@ -799,11 +1241,7 @@ 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 QtProtobufFieldEnum = SimpleFixed64SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::sint32>;
     SimpleFixed64SInt32MapMessage();
     ~SimpleFixed64SInt32MapMessage();
@@ -822,6 +1260,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed64SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed64SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed64SInt32MapMessage_QtProtobufNested
 
 class SimpleSFixed32SInt32MapMessage_QtProtobufData;
 class SimpleSFixed32SInt32MapMessage : public QProtobufMessage
@@ -832,11 +1279,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed32SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::sint32>;
     SimpleSFixed32SInt32MapMessage();
     ~SimpleSFixed32SInt32MapMessage();
@@ -855,6 +1298,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed32SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed32SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 9,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed32SInt32MapMessage_QtProtobufNested
 
 class SimpleSFixed64SInt32MapMessage_QtProtobufData;
 class SimpleSFixed64SInt32MapMessage : public QProtobufMessage
@@ -865,11 +1317,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed64SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::sint32>;
     SimpleSFixed64SInt32MapMessage();
     ~SimpleSFixed64SInt32MapMessage();
@@ -888,6 +1336,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed64SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed64SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 10,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed64SInt32MapMessage_QtProtobufNested
 
 class SimpleStringSInt32MapMessage_QtProtobufData;
 class SimpleStringSInt32MapMessage : public QProtobufMessage
@@ -898,11 +1355,7 @@ 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 QtProtobufFieldEnum = SimpleStringSInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QString, QtProtobuf::sint32>;
     SimpleStringSInt32MapMessage();
     ~SimpleStringSInt32MapMessage();
@@ -921,6 +1374,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringSInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringSInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 13,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringSInt32MapMessage_QtProtobufNested
 
 class SimpleSInt32SInt64MapMessage_QtProtobufData;
 class SimpleSInt32SInt64MapMessage : public QProtobufMessage
@@ -931,11 +1393,7 @@ 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 QtProtobufFieldEnum = SimpleSInt32SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::sint64>;
     SimpleSInt32SInt64MapMessage();
     ~SimpleSInt32SInt64MapMessage();
@@ -954,6 +1412,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt32SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt32SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt32SInt64MapMessage_QtProtobufNested
 
 class SimpleSInt64SInt64MapMessage_QtProtobufData;
 class SimpleSInt64SInt64MapMessage : public QProtobufMessage
@@ -964,11 +1431,7 @@ 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 QtProtobufFieldEnum = SimpleSInt64SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::sint64>;
     SimpleSInt64SInt64MapMessage();
     ~SimpleSInt64SInt64MapMessage();
@@ -987,6 +1450,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt64SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64SInt64MapMessage_QtProtobufNested
 
 class SimpleInt32SInt64MapMessage_QtProtobufData;
 class SimpleInt32SInt64MapMessage : public QProtobufMessage
@@ -997,11 +1469,7 @@ 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 QtProtobufFieldEnum = SimpleInt32SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::sint64>;
     SimpleInt32SInt64MapMessage();
     ~SimpleInt32SInt64MapMessage();
@@ -1020,6 +1488,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt32SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt32SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 3,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt32SInt64MapMessage_QtProtobufNested
 
 class SimpleInt64SInt64MapMessage_QtProtobufData;
 class SimpleInt64SInt64MapMessage : public QProtobufMessage
@@ -1030,11 +1507,7 @@ 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 QtProtobufFieldEnum = SimpleInt64SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::sint64>;
     SimpleInt64SInt64MapMessage();
     ~SimpleInt64SInt64MapMessage();
@@ -1053,6 +1526,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt64SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 4,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64SInt64MapMessage_QtProtobufNested
 
 class SimpleUInt32SInt64MapMessage_QtProtobufData;
 class SimpleUInt32SInt64MapMessage : public QProtobufMessage
@@ -1063,11 +1545,7 @@ 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 QtProtobufFieldEnum = SimpleUInt32SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::sint64>;
     SimpleUInt32SInt64MapMessage();
     ~SimpleUInt32SInt64MapMessage();
@@ -1086,6 +1564,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt32SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt32SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt32SInt64MapMessage_QtProtobufNested
 
 class SimpleUInt64SInt64MapMessage_QtProtobufData;
 class SimpleUInt64SInt64MapMessage : public QProtobufMessage
@@ -1096,11 +1583,7 @@ 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 QtProtobufFieldEnum = SimpleUInt64SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::sint64>;
     SimpleUInt64SInt64MapMessage();
     ~SimpleUInt64SInt64MapMessage();
@@ -1119,6 +1602,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt64SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64SInt64MapMessage_QtProtobufNested
 
 class SimpleFixed32SInt64MapMessage_QtProtobufData;
 class SimpleFixed32SInt64MapMessage : public QProtobufMessage
@@ -1129,11 +1621,7 @@ 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 QtProtobufFieldEnum = SimpleFixed32SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::sint64>;
     SimpleFixed32SInt64MapMessage();
     ~SimpleFixed32SInt64MapMessage();
@@ -1152,6 +1640,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed32SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed32SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed32SInt64MapMessage_QtProtobufNested
 
 class SimpleFixed64SInt64MapMessage_QtProtobufData;
 class SimpleFixed64SInt64MapMessage : public QProtobufMessage
@@ -1162,11 +1659,7 @@ 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 QtProtobufFieldEnum = SimpleFixed64SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::sint64>;
     SimpleFixed64SInt64MapMessage();
     ~SimpleFixed64SInt64MapMessage();
@@ -1185,6 +1678,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed64SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed64SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed64SInt64MapMessage_QtProtobufNested
 
 class SimpleSFixed32SInt64MapMessage_QtProtobufData;
 class SimpleSFixed32SInt64MapMessage : public QProtobufMessage
@@ -1195,11 +1697,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed32SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::sint64>;
     SimpleSFixed32SInt64MapMessage();
     ~SimpleSFixed32SInt64MapMessage();
@@ -1218,6 +1716,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed32SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed32SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 9,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed32SInt64MapMessage_QtProtobufNested
 
 class SimpleSFixed64SInt64MapMessage_QtProtobufData;
 class SimpleSFixed64SInt64MapMessage : public QProtobufMessage
@@ -1228,11 +1735,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed64SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::sint64>;
     SimpleSFixed64SInt64MapMessage();
     ~SimpleSFixed64SInt64MapMessage();
@@ -1251,6 +1754,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed64SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed64SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 10,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed64SInt64MapMessage_QtProtobufNested
 
 class SimpleStringSInt64MapMessage_QtProtobufData;
 class SimpleStringSInt64MapMessage : public QProtobufMessage
@@ -1261,11 +1773,7 @@ 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 QtProtobufFieldEnum = SimpleStringSInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QString, QtProtobuf::sint64>;
     SimpleStringSInt64MapMessage();
     ~SimpleStringSInt64MapMessage();
@@ -1284,6 +1792,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringSInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringSInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 13,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringSInt64MapMessage_QtProtobufNested
 
 class SimpleSInt32UInt32MapMessage_QtProtobufData;
 class SimpleSInt32UInt32MapMessage : public QProtobufMessage
@@ -1294,11 +1811,7 @@ 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 QtProtobufFieldEnum = SimpleSInt32UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::uint32>;
     SimpleSInt32UInt32MapMessage();
     ~SimpleSInt32UInt32MapMessage();
@@ -1317,6 +1830,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt32UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt32UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt32UInt32MapMessage_QtProtobufNested
 
 class SimpleSInt64UInt32MapMessage_QtProtobufData;
 class SimpleSInt64UInt32MapMessage : public QProtobufMessage
@@ -1327,11 +1849,7 @@ 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 QtProtobufFieldEnum = SimpleSInt64UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::uint32>;
     SimpleSInt64UInt32MapMessage();
     ~SimpleSInt64UInt32MapMessage();
@@ -1350,6 +1868,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt64UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64UInt32MapMessage_QtProtobufNested
 
 class SimpleInt32UInt32MapMessage_QtProtobufData;
 class SimpleInt32UInt32MapMessage : public QProtobufMessage
@@ -1360,11 +1887,7 @@ 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 QtProtobufFieldEnum = SimpleInt32UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::uint32>;
     SimpleInt32UInt32MapMessage();
     ~SimpleInt32UInt32MapMessage();
@@ -1383,6 +1906,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt32UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt32UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 3,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt32UInt32MapMessage_QtProtobufNested
 
 class SimpleInt64UInt32MapMessage_QtProtobufData;
 class SimpleInt64UInt32MapMessage : public QProtobufMessage
@@ -1393,11 +1925,7 @@ 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 QtProtobufFieldEnum = SimpleInt64UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::uint32>;
     SimpleInt64UInt32MapMessage();
     ~SimpleInt64UInt32MapMessage();
@@ -1416,6 +1944,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt64UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 4,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64UInt32MapMessage_QtProtobufNested
 
 class SimpleUInt32UInt32MapMessage_QtProtobufData;
 class SimpleUInt32UInt32MapMessage : public QProtobufMessage
@@ -1426,11 +1963,7 @@ 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 QtProtobufFieldEnum = SimpleUInt32UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::uint32>;
     SimpleUInt32UInt32MapMessage();
     ~SimpleUInt32UInt32MapMessage();
@@ -1449,6 +1982,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt32UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt32UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt32UInt32MapMessage_QtProtobufNested
 
 class SimpleUInt64UInt32MapMessage_QtProtobufData;
 class SimpleUInt64UInt32MapMessage : public QProtobufMessage
@@ -1459,11 +2001,7 @@ 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 QtProtobufFieldEnum = SimpleUInt64UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::uint32>;
     SimpleUInt64UInt32MapMessage();
     ~SimpleUInt64UInt32MapMessage();
@@ -1482,6 +2020,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt64UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64UInt32MapMessage_QtProtobufNested
 
 class SimpleFixed32UInt32MapMessage_QtProtobufData;
 class SimpleFixed32UInt32MapMessage : public QProtobufMessage
@@ -1492,11 +2039,7 @@ 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 QtProtobufFieldEnum = SimpleFixed32UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::uint32>;
     SimpleFixed32UInt32MapMessage();
     ~SimpleFixed32UInt32MapMessage();
@@ -1515,6 +2058,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed32UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed32UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed32UInt32MapMessage_QtProtobufNested
 
 class SimpleFixed64UInt32MapMessage_QtProtobufData;
 class SimpleFixed64UInt32MapMessage : public QProtobufMessage
@@ -1525,11 +2077,7 @@ 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 QtProtobufFieldEnum = SimpleFixed64UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::uint32>;
     SimpleFixed64UInt32MapMessage();
     ~SimpleFixed64UInt32MapMessage();
@@ -1548,6 +2096,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed64UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed64UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed64UInt32MapMessage_QtProtobufNested
 
 class SimpleSFixed32UInt32MapMessage_QtProtobufData;
 class SimpleSFixed32UInt32MapMessage : public QProtobufMessage
@@ -1558,11 +2115,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed32UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::uint32>;
     SimpleSFixed32UInt32MapMessage();
     ~SimpleSFixed32UInt32MapMessage();
@@ -1581,6 +2134,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed32UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed32UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 9,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed32UInt32MapMessage_QtProtobufNested
 
 class SimpleSFixed64UInt32MapMessage_QtProtobufData;
 class SimpleSFixed64UInt32MapMessage : public QProtobufMessage
@@ -1591,11 +2153,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed64UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::uint32>;
     SimpleSFixed64UInt32MapMessage();
     ~SimpleSFixed64UInt32MapMessage();
@@ -1614,6 +2172,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed64UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed64UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 10,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed64UInt32MapMessage_QtProtobufNested
 
 class SimpleStringUInt32MapMessage_QtProtobufData;
 class SimpleStringUInt32MapMessage : public QProtobufMessage
@@ -1624,11 +2191,7 @@ 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 QtProtobufFieldEnum = SimpleStringUInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QString, QtProtobuf::uint32>;
     SimpleStringUInt32MapMessage();
     ~SimpleStringUInt32MapMessage();
@@ -1647,6 +2210,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringUInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringUInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 13,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringUInt32MapMessage_QtProtobufNested
 
 class SimpleSInt32UInt64MapMessage_QtProtobufData;
 class SimpleSInt32UInt64MapMessage : public QProtobufMessage
@@ -1657,11 +2229,7 @@ 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 QtProtobufFieldEnum = SimpleSInt32UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::uint64>;
     SimpleSInt32UInt64MapMessage();
     ~SimpleSInt32UInt64MapMessage();
@@ -1680,6 +2248,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt32UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt32UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt32UInt64MapMessage_QtProtobufNested
 
 class SimpleSInt64UInt64MapMessage_QtProtobufData;
 class SimpleSInt64UInt64MapMessage : public QProtobufMessage
@@ -1690,11 +2267,7 @@ 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 QtProtobufFieldEnum = SimpleSInt64UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::uint64>;
     SimpleSInt64UInt64MapMessage();
     ~SimpleSInt64UInt64MapMessage();
@@ -1713,6 +2286,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt64UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64UInt64MapMessage_QtProtobufNested
 
 class SimpleInt32UInt64MapMessage_QtProtobufData;
 class SimpleInt32UInt64MapMessage : public QProtobufMessage
@@ -1723,11 +2305,7 @@ 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 QtProtobufFieldEnum = SimpleInt32UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::uint64>;
     SimpleInt32UInt64MapMessage();
     ~SimpleInt32UInt64MapMessage();
@@ -1746,6 +2324,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt32UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt32UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 3,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt32UInt64MapMessage_QtProtobufNested
 
 class SimpleInt64UInt64MapMessage_QtProtobufData;
 class SimpleInt64UInt64MapMessage : public QProtobufMessage
@@ -1756,11 +2343,7 @@ 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 QtProtobufFieldEnum = SimpleInt64UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::uint64>;
     SimpleInt64UInt64MapMessage();
     ~SimpleInt64UInt64MapMessage();
@@ -1779,6 +2362,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt64UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 4,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64UInt64MapMessage_QtProtobufNested
 
 class SimpleUInt32UInt64MapMessage_QtProtobufData;
 class SimpleUInt32UInt64MapMessage : public QProtobufMessage
@@ -1789,11 +2381,7 @@ 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 QtProtobufFieldEnum = SimpleUInt32UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::uint64>;
     SimpleUInt32UInt64MapMessage();
     ~SimpleUInt32UInt64MapMessage();
@@ -1812,6 +2400,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt32UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt32UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt32UInt64MapMessage_QtProtobufNested
 
 class SimpleUInt64UInt64MapMessage_QtProtobufData;
 class SimpleUInt64UInt64MapMessage : public QProtobufMessage
@@ -1822,11 +2419,7 @@ 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 QtProtobufFieldEnum = SimpleUInt64UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::uint64>;
     SimpleUInt64UInt64MapMessage();
     ~SimpleUInt64UInt64MapMessage();
@@ -1845,6 +2438,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt64UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64UInt64MapMessage_QtProtobufNested
 
 class SimpleFixed32UInt64MapMessage_QtProtobufData;
 class SimpleFixed32UInt64MapMessage : public QProtobufMessage
@@ -1855,11 +2457,7 @@ 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 QtProtobufFieldEnum = SimpleFixed32UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::uint64>;
     SimpleFixed32UInt64MapMessage();
     ~SimpleFixed32UInt64MapMessage();
@@ -1878,6 +2476,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed32UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed32UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed32UInt64MapMessage_QtProtobufNested
 
 class SimpleFixed64UInt64MapMessage_QtProtobufData;
 class SimpleFixed64UInt64MapMessage : public QProtobufMessage
@@ -1888,11 +2495,7 @@ 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 QtProtobufFieldEnum = SimpleFixed64UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::uint64>;
     SimpleFixed64UInt64MapMessage();
     ~SimpleFixed64UInt64MapMessage();
@@ -1911,6 +2514,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed64UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed64UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed64UInt64MapMessage_QtProtobufNested
 
 class SimpleSFixed32UInt64MapMessage_QtProtobufData;
 class SimpleSFixed32UInt64MapMessage : public QProtobufMessage
@@ -1921,11 +2533,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed32UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::uint64>;
     SimpleSFixed32UInt64MapMessage();
     ~SimpleSFixed32UInt64MapMessage();
@@ -1944,6 +2552,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed32UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed32UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 9,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed32UInt64MapMessage_QtProtobufNested
 
 class SimpleSFixed64UInt64MapMessage_QtProtobufData;
 class SimpleSFixed64UInt64MapMessage : public QProtobufMessage
@@ -1954,11 +2571,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed64UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::uint64>;
     SimpleSFixed64UInt64MapMessage();
     ~SimpleSFixed64UInt64MapMessage();
@@ -1977,6 +2590,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed64UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed64UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 10,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed64UInt64MapMessage_QtProtobufNested
 
 class SimpleStringUInt64MapMessage_QtProtobufData;
 class SimpleStringUInt64MapMessage : public QProtobufMessage
@@ -1987,11 +2609,7 @@ 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 QtProtobufFieldEnum = SimpleStringUInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QString, QtProtobuf::uint64>;
     SimpleStringUInt64MapMessage();
     ~SimpleStringUInt64MapMessage();
@@ -2010,6 +2628,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringUInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringUInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 13,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringUInt64MapMessage_QtProtobufNested
 
 class SimpleSInt32Int32MapMessage_QtProtobufData;
 class SimpleSInt32Int32MapMessage : public QProtobufMessage
@@ -2020,11 +2647,7 @@ 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 QtProtobufFieldEnum = SimpleSInt32Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::int32>;
     SimpleSInt32Int32MapMessage();
     ~SimpleSInt32Int32MapMessage();
@@ -2043,6 +2666,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt32Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt32Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt32Int32MapMessage_QtProtobufNested
 
 class SimpleSInt64Int32MapMessage_QtProtobufData;
 class SimpleSInt64Int32MapMessage : public QProtobufMessage
@@ -2053,11 +2685,7 @@ 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 QtProtobufFieldEnum = SimpleSInt64Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::int32>;
     SimpleSInt64Int32MapMessage();
     ~SimpleSInt64Int32MapMessage();
@@ -2076,6 +2704,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt64Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64Int32MapMessage_QtProtobufNested
 
 class SimpleInt32Int32MapMessage_QtProtobufData;
 class SimpleInt32Int32MapMessage : public QProtobufMessage
@@ -2086,11 +2723,7 @@ 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 QtProtobufFieldEnum = SimpleInt32Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::int32>;
     SimpleInt32Int32MapMessage();
     ~SimpleInt32Int32MapMessage();
@@ -2109,6 +2742,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt32Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt32Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 3,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt32Int32MapMessage_QtProtobufNested
 
 class SimpleInt64Int32MapMessage_QtProtobufData;
 class SimpleInt64Int32MapMessage : public QProtobufMessage
@@ -2119,11 +2761,7 @@ 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 QtProtobufFieldEnum = SimpleInt64Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::int32>;
     SimpleInt64Int32MapMessage();
     ~SimpleInt64Int32MapMessage();
@@ -2142,6 +2780,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt64Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 4,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64Int32MapMessage_QtProtobufNested
 
 class SimpleUInt32Int32MapMessage_QtProtobufData;
 class SimpleUInt32Int32MapMessage : public QProtobufMessage
@@ -2152,11 +2799,7 @@ 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 QtProtobufFieldEnum = SimpleUInt32Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::int32>;
     SimpleUInt32Int32MapMessage();
     ~SimpleUInt32Int32MapMessage();
@@ -2175,6 +2818,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt32Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt32Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt32Int32MapMessage_QtProtobufNested
 
 class SimpleUInt64Int32MapMessage_QtProtobufData;
 class SimpleUInt64Int32MapMessage : public QProtobufMessage
@@ -2185,11 +2837,7 @@ 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 QtProtobufFieldEnum = SimpleUInt64Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::int32>;
     SimpleUInt64Int32MapMessage();
     ~SimpleUInt64Int32MapMessage();
@@ -2208,6 +2856,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt64Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64Int32MapMessage_QtProtobufNested
 
 class SimpleFixed32Int32MapMessage_QtProtobufData;
 class SimpleFixed32Int32MapMessage : public QProtobufMessage
@@ -2218,11 +2875,7 @@ 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 QtProtobufFieldEnum = SimpleFixed32Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::int32>;
     SimpleFixed32Int32MapMessage();
     ~SimpleFixed32Int32MapMessage();
@@ -2241,6 +2894,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed32Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed32Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed32Int32MapMessage_QtProtobufNested
 
 class SimpleFixed64Int32MapMessage_QtProtobufData;
 class SimpleFixed64Int32MapMessage : public QProtobufMessage
@@ -2251,11 +2913,7 @@ 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 QtProtobufFieldEnum = SimpleFixed64Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::int32>;
     SimpleFixed64Int32MapMessage();
     ~SimpleFixed64Int32MapMessage();
@@ -2274,6 +2932,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed64Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed64Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed64Int32MapMessage_QtProtobufNested
 
 class SimpleSFixed32Int32MapMessage_QtProtobufData;
 class SimpleSFixed32Int32MapMessage : public QProtobufMessage
@@ -2284,11 +2951,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed32Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::int32>;
     SimpleSFixed32Int32MapMessage();
     ~SimpleSFixed32Int32MapMessage();
@@ -2307,6 +2970,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed32Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed32Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 9,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed32Int32MapMessage_QtProtobufNested
 
 class SimpleSFixed64Int32MapMessage_QtProtobufData;
 class SimpleSFixed64Int32MapMessage : public QProtobufMessage
@@ -2317,11 +2989,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed64Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::int32>;
     SimpleSFixed64Int32MapMessage();
     ~SimpleSFixed64Int32MapMessage();
@@ -2340,6 +3008,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed64Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed64Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 10,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed64Int32MapMessage_QtProtobufNested
 
 class SimpleStringInt32MapMessage_QtProtobufData;
 class SimpleStringInt32MapMessage : public QProtobufMessage
@@ -2350,11 +3027,7 @@ 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 QtProtobufFieldEnum = SimpleStringInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QString, QtProtobuf::int32>;
     SimpleStringInt32MapMessage();
     ~SimpleStringInt32MapMessage();
@@ -2373,6 +3046,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 13,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringInt32MapMessage_QtProtobufNested
 
 class SimpleSInt32Int64MapMessage_QtProtobufData;
 class SimpleSInt32Int64MapMessage : public QProtobufMessage
@@ -2383,11 +3065,7 @@ 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 QtProtobufFieldEnum = SimpleSInt32Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::int64>;
     SimpleSInt32Int64MapMessage();
     ~SimpleSInt32Int64MapMessage();
@@ -2406,6 +3084,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt32Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt32Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt32Int64MapMessage_QtProtobufNested
 
 class SimpleSInt64Int64MapMessage_QtProtobufData;
 class SimpleSInt64Int64MapMessage : public QProtobufMessage
@@ -2416,11 +3103,7 @@ 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 QtProtobufFieldEnum = SimpleSInt64Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::int64>;
     SimpleSInt64Int64MapMessage();
     ~SimpleSInt64Int64MapMessage();
@@ -2439,6 +3122,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt64Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64Int64MapMessage_QtProtobufNested
 
 class SimpleInt32Int64MapMessage_QtProtobufData;
 class SimpleInt32Int64MapMessage : public QProtobufMessage
@@ -2449,11 +3141,7 @@ 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 QtProtobufFieldEnum = SimpleInt32Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::int64>;
     SimpleInt32Int64MapMessage();
     ~SimpleInt32Int64MapMessage();
@@ -2472,6 +3160,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt32Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt32Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 3,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt32Int64MapMessage_QtProtobufNested
 
 class SimpleInt64Int64MapMessage_QtProtobufData;
 class SimpleInt64Int64MapMessage : public QProtobufMessage
@@ -2482,11 +3179,7 @@ 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 QtProtobufFieldEnum = SimpleInt64Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::int64>;
     SimpleInt64Int64MapMessage();
     ~SimpleInt64Int64MapMessage();
@@ -2505,6 +3198,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt64Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 4,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64Int64MapMessage_QtProtobufNested
 
 class SimpleUInt32Int64MapMessage_QtProtobufData;
 class SimpleUInt32Int64MapMessage : public QProtobufMessage
@@ -2515,11 +3217,7 @@ 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 QtProtobufFieldEnum = SimpleUInt32Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::int64>;
     SimpleUInt32Int64MapMessage();
     ~SimpleUInt32Int64MapMessage();
@@ -2538,6 +3236,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt32Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt32Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt32Int64MapMessage_QtProtobufNested
 
 class SimpleUInt64Int64MapMessage_QtProtobufData;
 class SimpleUInt64Int64MapMessage : public QProtobufMessage
@@ -2548,11 +3255,7 @@ 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 QtProtobufFieldEnum = SimpleUInt64Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::int64>;
     SimpleUInt64Int64MapMessage();
     ~SimpleUInt64Int64MapMessage();
@@ -2571,6 +3274,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt64Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64Int64MapMessage_QtProtobufNested
 
 class SimpleFixed32Int64MapMessage_QtProtobufData;
 class SimpleFixed32Int64MapMessage : public QProtobufMessage
@@ -2581,11 +3293,7 @@ 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 QtProtobufFieldEnum = SimpleFixed32Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::int64>;
     SimpleFixed32Int64MapMessage();
     ~SimpleFixed32Int64MapMessage();
@@ -2604,6 +3312,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed32Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed32Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed32Int64MapMessage_QtProtobufNested
 
 class SimpleFixed64Int64MapMessage_QtProtobufData;
 class SimpleFixed64Int64MapMessage : public QProtobufMessage
@@ -2614,11 +3331,7 @@ 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 QtProtobufFieldEnum = SimpleFixed64Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::int64>;
     SimpleFixed64Int64MapMessage();
     ~SimpleFixed64Int64MapMessage();
@@ -2637,6 +3350,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed64Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed64Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed64Int64MapMessage_QtProtobufNested
 
 class SimpleSFixed32Int64MapMessage_QtProtobufData;
 class SimpleSFixed32Int64MapMessage : public QProtobufMessage
@@ -2647,11 +3369,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed32Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::int64>;
     SimpleSFixed32Int64MapMessage();
     ~SimpleSFixed32Int64MapMessage();
@@ -2670,6 +3388,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed32Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed32Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 9,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed32Int64MapMessage_QtProtobufNested
 
 class SimpleSFixed64Int64MapMessage_QtProtobufData;
 class SimpleSFixed64Int64MapMessage : public QProtobufMessage
@@ -2680,11 +3407,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed64Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::int64>;
     SimpleSFixed64Int64MapMessage();
     ~SimpleSFixed64Int64MapMessage();
@@ -2703,6 +3426,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed64Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed64Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 10,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed64Int64MapMessage_QtProtobufNested
 
 class SimpleStringInt64MapMessage_QtProtobufData;
 class SimpleStringInt64MapMessage : public QProtobufMessage
@@ -2713,11 +3445,7 @@ 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 QtProtobufFieldEnum = SimpleStringInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QString, QtProtobuf::int64>;
     SimpleStringInt64MapMessage();
     ~SimpleStringInt64MapMessage();
@@ -2736,6 +3464,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 13,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringInt64MapMessage_QtProtobufNested
 
 class SimpleSInt32ComplexMessageMapMessage_QtProtobufData;
 class SimpleSInt32ComplexMessageMapMessage : public QProtobufMessage
@@ -2746,11 +3483,7 @@ 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 QtProtobufFieldEnum = SimpleSInt32ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint32, ComplexMessage>;
     SimpleSInt32ComplexMessageMapMessage();
     ~SimpleSInt32ComplexMessageMapMessage();
@@ -2769,6 +3502,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt32ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt32ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt32ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleSInt64ComplexMessageMapMessage_QtProtobufData;
 class SimpleSInt64ComplexMessageMapMessage : public QProtobufMessage
@@ -2779,11 +3521,7 @@ 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 QtProtobufFieldEnum = SimpleSInt64ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint64, ComplexMessage>;
     SimpleSInt64ComplexMessageMapMessage();
     ~SimpleSInt64ComplexMessageMapMessage();
@@ -2802,6 +3540,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt64ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleInt32ComplexMessageMapMessage_QtProtobufData;
 class SimpleInt32ComplexMessageMapMessage : public QProtobufMessage
@@ -2812,11 +3559,7 @@ 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 QtProtobufFieldEnum = SimpleInt32ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int32, ComplexMessage>;
     SimpleInt32ComplexMessageMapMessage();
     ~SimpleInt32ComplexMessageMapMessage();
@@ -2835,6 +3578,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt32ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt32ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 3,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt32ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleInt64ComplexMessageMapMessage_QtProtobufData;
 class SimpleInt64ComplexMessageMapMessage : public QProtobufMessage
@@ -2845,11 +3597,7 @@ 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 QtProtobufFieldEnum = SimpleInt64ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int64, ComplexMessage>;
     SimpleInt64ComplexMessageMapMessage();
     ~SimpleInt64ComplexMessageMapMessage();
@@ -2868,6 +3616,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt64ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 4,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleUInt32ComplexMessageMapMessage_QtProtobufData;
 class SimpleUInt32ComplexMessageMapMessage : public QProtobufMessage
@@ -2878,11 +3635,7 @@ 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 QtProtobufFieldEnum = SimpleUInt32ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint32, ComplexMessage>;
     SimpleUInt32ComplexMessageMapMessage();
     ~SimpleUInt32ComplexMessageMapMessage();
@@ -2901,6 +3654,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt32ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt32ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt32ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleUInt64ComplexMessageMapMessage_QtProtobufData;
 class SimpleUInt64ComplexMessageMapMessage : public QProtobufMessage
@@ -2911,11 +3673,7 @@ 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 QtProtobufFieldEnum = SimpleUInt64ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint64, ComplexMessage>;
     SimpleUInt64ComplexMessageMapMessage();
     ~SimpleUInt64ComplexMessageMapMessage();
@@ -2934,6 +3692,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt64ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleFixed32ComplexMessageMapMessage_QtProtobufData;
 class SimpleFixed32ComplexMessageMapMessage : public QProtobufMessage
@@ -2944,11 +3711,7 @@ 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 QtProtobufFieldEnum = SimpleFixed32ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed32, ComplexMessage>;
     SimpleFixed32ComplexMessageMapMessage();
     ~SimpleFixed32ComplexMessageMapMessage();
@@ -2967,6 +3730,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed32ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed32ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed32ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleFixed64ComplexMessageMapMessage_QtProtobufData;
 class SimpleFixed64ComplexMessageMapMessage : public QProtobufMessage
@@ -2977,11 +3749,7 @@ 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 QtProtobufFieldEnum = SimpleFixed64ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed64, ComplexMessage>;
     SimpleFixed64ComplexMessageMapMessage();
     ~SimpleFixed64ComplexMessageMapMessage();
@@ -3000,6 +3768,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed64ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed64ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed64ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleSFixed32ComplexMessageMapMessage_QtProtobufData;
 class SimpleSFixed32ComplexMessageMapMessage : public QProtobufMessage
@@ -3010,11 +3787,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed32ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, ComplexMessage>;
     SimpleSFixed32ComplexMessageMapMessage();
     ~SimpleSFixed32ComplexMessageMapMessage();
@@ -3033,6 +3806,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed32ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed32ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 9,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed32ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleSFixed64ComplexMessageMapMessage_QtProtobufData;
 class SimpleSFixed64ComplexMessageMapMessage : public QProtobufMessage
@@ -3043,11 +3825,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed64ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, ComplexMessage>;
     SimpleSFixed64ComplexMessageMapMessage();
     ~SimpleSFixed64ComplexMessageMapMessage();
@@ -3066,6 +3844,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed64ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed64ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 10,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed64ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleStringComplexMessageMapMessage_QtProtobufData;
 class SimpleStringComplexMessageMapMessage : public QProtobufMessage
@@ -3076,11 +3863,7 @@ 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 QtProtobufFieldEnum = SimpleStringComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QString, ComplexMessage>;
     SimpleStringComplexMessageMapMessage();
     ~SimpleStringComplexMessageMapMessage();
@@ -3099,6 +3882,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 13,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringComplexMessageMapMessage_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32StringMapMessage)
diff --git a/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/oneofmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/oneofmessages.qpb.h
index 7616f57..bcee72b 100644
--- a/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/oneofmessages.qpb.h
+++ b/tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/oneofmessages.qpb.h
@@ -22,8 +22,19 @@
 namespace qtprotobufnamespace::tests {
 class OneofSimpleMessage;
 using OneofSimpleMessageRepeated = QList<OneofSimpleMessage>;
+namespace OneofSimpleMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+enum class TestOneofFields;
+} // namespace OneofSimpleMessage_QtProtobufNested
+
 class OneofComplexMessage;
 using OneofComplexMessageRepeated = QList<OneofComplexMessage>;
+namespace OneofComplexMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+enum class TestOneofFields;
+enum class SecondOneofFields;
+} // namespace OneofComplexMessage_QtProtobufNested
+
 
 class OneofSimpleMessage_QtProtobufData;
 class OneofSimpleMessage : public QProtobufMessage
@@ -37,19 +48,8 @@ class OneofSimpleMessage : public QProtobufMessage
     Q_PROPERTY(bool hasTestOneofFieldSecondInt READ hasTestOneofFieldSecondInt)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestOneofFieldIntProtoFieldNumber = 1,
-        TestOneofFieldSecondIntProtoFieldNumber = 2,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
-    enum class TestOneofFields {
-        UninitializedField = QtProtobuf::InvalidFieldNumber,
-        TestOneofFieldInt = 1,
-        TestOneofFieldSecondInt = 2,
-    };
-    Q_ENUM(TestOneofFields)
-
+    using QtProtobufFieldEnum = OneofSimpleMessage_QtProtobufNested::QtProtobufFieldEnum;
+    using TestOneofFields = OneofSimpleMessage_QtProtobufNested::TestOneofFields;
     OneofSimpleMessage();
     ~OneofSimpleMessage();
     OneofSimpleMessage(const OneofSimpleMessage &other);
@@ -77,6 +77,23 @@ private:
     void setTestOneofFieldSecondInt_p(QtProtobuf::int32 testOneofFieldSecondInt);
     QExplicitlySharedDataPointer<OneofSimpleMessage_QtProtobufData> dptr;
 };
+namespace OneofSimpleMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestOneofFieldIntProtoFieldNumber = 1,
+    TestOneofFieldSecondIntProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+enum class TestOneofFields {
+    UninitializedField = QtProtobuf::InvalidFieldNumber,
+    TestOneofFieldInt = 1,
+    TestOneofFieldSecondInt = 2,
+};
+Q_ENUM_NS(TestOneofFields)
+
+} // namespace OneofSimpleMessage_QtProtobufNested
 
 class OneofComplexMessage_QtProtobufData;
 class OneofComplexMessage : public QProtobufMessage
@@ -101,35 +118,9 @@ class OneofComplexMessage : public QProtobufMessage
     Q_PROPERTY(bool hasTestSnakeCaseField READ hasTestSnakeCaseField)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-        TestOneofFieldIntProtoFieldNumber = 42,
-        TestOneofComplexFieldProtoFieldNumber = 3,
-        TestOneofSecondComplexFieldProtoFieldNumber = 4,
-        SecondFieldIntProtoFieldNumber = 43,
-        SecondComplexFieldProtoFieldNumber = 5,
-        SecondSecondComplexFieldProtoFieldNumber = 6,
-        TestSnakeCaseFieldProtoFieldNumber = 7,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
-    enum class TestOneofFields {
-        UninitializedField = QtProtobuf::InvalidFieldNumber,
-        TestOneofFieldInt = 42,
-        TestOneofComplexField = 3,
-        TestOneofSecondComplexField = 4,
-    };
-    Q_ENUM(TestOneofFields)
-
-    enum class SecondOneofFields {
-        UninitializedField = QtProtobuf::InvalidFieldNumber,
-        SecondFieldInt = 43,
-        SecondComplexField = 5,
-        SecondSecondComplexField = 6,
-        TestSnakeCaseField = 7,
-    };
-    Q_ENUM(SecondOneofFields)
-
+    using QtProtobufFieldEnum = OneofComplexMessage_QtProtobufNested::QtProtobufFieldEnum;
+    using TestOneofFields = OneofComplexMessage_QtProtobufNested::TestOneofFields;
+    using SecondOneofFields = OneofComplexMessage_QtProtobufNested::SecondOneofFields;
     OneofComplexMessage();
     ~OneofComplexMessage();
     OneofComplexMessage(const OneofComplexMessage &other);
@@ -192,6 +183,39 @@ private:
     void setTestSnakeCaseField_p(QtProtobuf::int32 testSnakeCaseField);
     QExplicitlySharedDataPointer<OneofComplexMessage_QtProtobufData> dptr;
 };
+namespace OneofComplexMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+    TestOneofFieldIntProtoFieldNumber = 42,
+    TestOneofComplexFieldProtoFieldNumber = 3,
+    TestOneofSecondComplexFieldProtoFieldNumber = 4,
+    SecondFieldIntProtoFieldNumber = 43,
+    SecondComplexFieldProtoFieldNumber = 5,
+    SecondSecondComplexFieldProtoFieldNumber = 6,
+    TestSnakeCaseFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+enum class TestOneofFields {
+    UninitializedField = QtProtobuf::InvalidFieldNumber,
+    TestOneofFieldInt = 42,
+    TestOneofComplexField = 3,
+    TestOneofSecondComplexField = 4,
+};
+Q_ENUM_NS(TestOneofFields)
+
+enum class SecondOneofFields {
+    UninitializedField = QtProtobuf::InvalidFieldNumber,
+    SecondFieldInt = 43,
+    SecondComplexField = 5,
+    SecondSecondComplexField = 6,
+    TestSnakeCaseField = 7,
+};
+Q_ENUM_NS(SecondOneofFields)
+
+} // namespace OneofComplexMessage_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::OneofSimpleMessage)
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 3a1c60b..8d01a7a 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
@@ -21,36 +21,100 @@
 namespace qtprotobufnamespace::tests {
 class RepeatedStringMessage;
 using RepeatedStringMessageRepeated = QList<RepeatedStringMessage>;
+namespace RepeatedStringMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedStringMessage_QtProtobufNested
+
 class RepeatedDoubleMessage;
 using RepeatedDoubleMessageRepeated = QList<RepeatedDoubleMessage>;
+namespace RepeatedDoubleMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedDoubleMessage_QtProtobufNested
+
 class RepeatedBytesMessage;
 using RepeatedBytesMessageRepeated = QList<RepeatedBytesMessage>;
+namespace RepeatedBytesMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedBytesMessage_QtProtobufNested
+
 class RepeatedFloatMessage;
 using RepeatedFloatMessageRepeated = QList<RepeatedFloatMessage>;
+namespace RepeatedFloatMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedFloatMessage_QtProtobufNested
+
 class RepeatedComplexMessage;
 using RepeatedComplexMessageRepeated = QList<RepeatedComplexMessage>;
+namespace RepeatedComplexMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedComplexMessage_QtProtobufNested
+
 class RepeatedSIntMessage;
 using RepeatedSIntMessageRepeated = QList<RepeatedSIntMessage>;
+namespace RepeatedSIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedSIntMessage_QtProtobufNested
+
 class RepeatedIntMessage;
 using RepeatedIntMessageRepeated = QList<RepeatedIntMessage>;
+namespace RepeatedIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedIntMessage_QtProtobufNested
+
 class RepeatedUIntMessage;
 using RepeatedUIntMessageRepeated = QList<RepeatedUIntMessage>;
+namespace RepeatedUIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedUIntMessage_QtProtobufNested
+
 class RepeatedSInt64Message;
 using RepeatedSInt64MessageRepeated = QList<RepeatedSInt64Message>;
+namespace RepeatedSInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedSInt64Message_QtProtobufNested
+
 class RepeatedInt64Message;
 using RepeatedInt64MessageRepeated = QList<RepeatedInt64Message>;
+namespace RepeatedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedInt64Message_QtProtobufNested
+
 class RepeatedUInt64Message;
 using RepeatedUInt64MessageRepeated = QList<RepeatedUInt64Message>;
+namespace RepeatedUInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedUInt64Message_QtProtobufNested
+
 class RepeatedFixedIntMessage;
 using RepeatedFixedIntMessageRepeated = QList<RepeatedFixedIntMessage>;
+namespace RepeatedFixedIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedFixedIntMessage_QtProtobufNested
+
 class RepeatedSFixedIntMessage;
 using RepeatedSFixedIntMessageRepeated = QList<RepeatedSFixedIntMessage>;
+namespace RepeatedSFixedIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedSFixedIntMessage_QtProtobufNested
+
 class RepeatedFixedInt64Message;
 using RepeatedFixedInt64MessageRepeated = QList<RepeatedFixedInt64Message>;
+namespace RepeatedFixedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedFixedInt64Message_QtProtobufNested
+
 class RepeatedSFixedInt64Message;
 using RepeatedSFixedInt64MessageRepeated = QList<RepeatedSFixedInt64Message>;
+namespace RepeatedSFixedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedSFixedInt64Message_QtProtobufNested
+
 class RepeatedBoolMessage;
 using RepeatedBoolMessageRepeated = QList<RepeatedBoolMessage>;
+namespace RepeatedBoolMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedBoolMessage_QtProtobufNested
+
 
 class RepeatedStringMessage_QtProtobufData;
 class RepeatedStringMessage : public QProtobufMessage
@@ -61,11 +125,7 @@ class RepeatedStringMessage : public QProtobufMessage
     Q_PROPERTY(QStringList testRepeatedString READ testRepeatedString WRITE setTestRepeatedString SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedStringProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedStringMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedStringMessage();
     ~RepeatedStringMessage();
     RepeatedStringMessage(const RepeatedStringMessage &other);
@@ -83,6 +143,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedStringMessage_QtProtobufData> dptr;
 };
+namespace RepeatedStringMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedStringProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedStringMessage_QtProtobufNested
 
 class RepeatedDoubleMessage_QtProtobufData;
 class RepeatedDoubleMessage : public QProtobufMessage
@@ -93,11 +162,7 @@ class RepeatedDoubleMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::doubleList testRepeatedDouble READ testRepeatedDouble WRITE setTestRepeatedDouble SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedDoubleProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedDoubleMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedDoubleMessage();
     ~RepeatedDoubleMessage();
     RepeatedDoubleMessage(const RepeatedDoubleMessage &other);
@@ -115,6 +180,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedDoubleMessage_QtProtobufData> dptr;
 };
+namespace RepeatedDoubleMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedDoubleProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedDoubleMessage_QtProtobufNested
 
 class RepeatedBytesMessage_QtProtobufData;
 class RepeatedBytesMessage : public QProtobufMessage
@@ -125,11 +199,7 @@ class RepeatedBytesMessage : public QProtobufMessage
     Q_PROPERTY(QByteArrayList testRepeatedBytes READ testRepeatedBytes WRITE setTestRepeatedBytes SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedBytesProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedBytesMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedBytesMessage();
     ~RepeatedBytesMessage();
     RepeatedBytesMessage(const RepeatedBytesMessage &other);
@@ -147,6 +217,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedBytesMessage_QtProtobufData> dptr;
 };
+namespace RepeatedBytesMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedBytesProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedBytesMessage_QtProtobufNested
 
 class RepeatedFloatMessage_QtProtobufData;
 class RepeatedFloatMessage : public QProtobufMessage
@@ -157,11 +236,7 @@ class RepeatedFloatMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::floatList testRepeatedFloat READ testRepeatedFloat WRITE setTestRepeatedFloat SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedFloatProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedFloatMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedFloatMessage();
     ~RepeatedFloatMessage();
     RepeatedFloatMessage(const RepeatedFloatMessage &other);
@@ -179,6 +254,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedFloatMessage_QtProtobufData> dptr;
 };
+namespace RepeatedFloatMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedFloatProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedFloatMessage_QtProtobufNested
 
 class RepeatedComplexMessage_QtProtobufData;
 class RepeatedComplexMessage : public QProtobufMessage
@@ -189,11 +273,7 @@ class RepeatedComplexMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::ComplexMessageRepeated testRepeatedComplexData READ testRepeatedComplex WRITE setTestRepeatedComplex SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedComplexProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedComplexMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedComplexMessage();
     ~RepeatedComplexMessage();
     RepeatedComplexMessage(const RepeatedComplexMessage &other);
@@ -211,6 +291,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedComplexMessage_QtProtobufData> dptr;
 };
+namespace RepeatedComplexMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedComplexProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedComplexMessage_QtProtobufNested
 
 class RepeatedSIntMessage_QtProtobufData;
 class RepeatedSIntMessage : public QProtobufMessage
@@ -221,11 +310,7 @@ class RepeatedSIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedSIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedSIntMessage();
     ~RepeatedSIntMessage();
     RepeatedSIntMessage(const RepeatedSIntMessage &other);
@@ -243,6 +328,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedSIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedSIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedSIntMessage_QtProtobufNested
 
 class RepeatedIntMessage_QtProtobufData;
 class RepeatedIntMessage : public QProtobufMessage
@@ -253,11 +347,7 @@ class RepeatedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedIntMessage();
     ~RepeatedIntMessage();
     RepeatedIntMessage(const RepeatedIntMessage &other);
@@ -275,6 +365,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedIntMessage_QtProtobufNested
 
 class RepeatedUIntMessage_QtProtobufData;
 class RepeatedUIntMessage : public QProtobufMessage
@@ -285,11 +384,7 @@ class RepeatedUIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedUIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedUIntMessage();
     ~RepeatedUIntMessage();
     RepeatedUIntMessage(const RepeatedUIntMessage &other);
@@ -307,6 +402,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedUIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedUIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedUIntMessage_QtProtobufNested
 
 class RepeatedSInt64Message_QtProtobufData;
 class RepeatedSInt64Message : public QProtobufMessage
@@ -317,11 +421,7 @@ class RepeatedSInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedSInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedSInt64Message();
     ~RepeatedSInt64Message();
     RepeatedSInt64Message(const RepeatedSInt64Message &other);
@@ -339,6 +439,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedSInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedSInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedSInt64Message_QtProtobufNested
 
 class RepeatedInt64Message_QtProtobufData;
 class RepeatedInt64Message : public QProtobufMessage
@@ -349,11 +458,7 @@ class RepeatedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedInt64Message();
     ~RepeatedInt64Message();
     RepeatedInt64Message(const RepeatedInt64Message &other);
@@ -371,6 +476,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedInt64Message_QtProtobufNested
 
 class RepeatedUInt64Message_QtProtobufData;
 class RepeatedUInt64Message : public QProtobufMessage
@@ -381,11 +495,7 @@ class RepeatedUInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedUInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedUInt64Message();
     ~RepeatedUInt64Message();
     RepeatedUInt64Message(const RepeatedUInt64Message &other);
@@ -403,6 +513,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedUInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedUInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedUInt64Message_QtProtobufNested
 
 class RepeatedFixedIntMessage_QtProtobufData;
 class RepeatedFixedIntMessage : public QProtobufMessage
@@ -413,11 +532,7 @@ class RepeatedFixedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedFixedIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedFixedIntMessage();
     ~RepeatedFixedIntMessage();
     RepeatedFixedIntMessage(const RepeatedFixedIntMessage &other);
@@ -435,6 +550,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedFixedIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedFixedIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedFixedIntMessage_QtProtobufNested
 
 class RepeatedSFixedIntMessage_QtProtobufData;
 class RepeatedSFixedIntMessage : public QProtobufMessage
@@ -445,11 +569,7 @@ class RepeatedSFixedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedSFixedIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedSFixedIntMessage();
     ~RepeatedSFixedIntMessage();
     RepeatedSFixedIntMessage(const RepeatedSFixedIntMessage &other);
@@ -467,6 +587,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedSFixedIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedSFixedIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedSFixedIntMessage_QtProtobufNested
 
 class RepeatedFixedInt64Message_QtProtobufData;
 class RepeatedFixedInt64Message : public QProtobufMessage
@@ -477,11 +606,7 @@ class RepeatedFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedFixedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedFixedInt64Message();
     ~RepeatedFixedInt64Message();
     RepeatedFixedInt64Message(const RepeatedFixedInt64Message &other);
@@ -499,6 +624,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedFixedInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedFixedInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedFixedInt64Message_QtProtobufNested
 
 class RepeatedSFixedInt64Message_QtProtobufData;
 class RepeatedSFixedInt64Message : public QProtobufMessage
@@ -509,11 +643,7 @@ class RepeatedSFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedSFixedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedSFixedInt64Message();
     ~RepeatedSFixedInt64Message();
     RepeatedSFixedInt64Message(const RepeatedSFixedInt64Message &other);
@@ -531,6 +661,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedSFixedInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedSFixedInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedSFixedInt64Message_QtProtobufNested
 
 class RepeatedBoolMessage_QtProtobufData;
 class RepeatedBoolMessage : public QProtobufMessage
@@ -541,11 +680,7 @@ class RepeatedBoolMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::boolList testRepeatedBool READ testRepeatedBool WRITE setTestRepeatedBool SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedBoolProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedBoolMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedBoolMessage();
     ~RepeatedBoolMessage();
     RepeatedBoolMessage(const RepeatedBoolMessage &other);
@@ -563,6 +698,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedBoolMessage_QtProtobufData> dptr;
 };
+namespace RepeatedBoolMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedBoolProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedBoolMessage_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedStringMessage)
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 13640f9..467ddb9 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
@@ -20,22 +20,58 @@
 namespace qtprotobufnamespace::tests {
 class AnnotatedMessage1;
 using AnnotatedMessage1Repeated = QList<AnnotatedMessage1>;
+namespace AnnotatedMessage1_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage1_QtProtobufNested
+
 class AnnotatedMessage2;
 using AnnotatedMessage2Repeated = QList<AnnotatedMessage2>;
+namespace AnnotatedMessage2_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage2_QtProtobufNested
+
 class AnnotatedMessage3;
 using AnnotatedMessage3Repeated = QList<AnnotatedMessage3>;
+namespace AnnotatedMessage3_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage3_QtProtobufNested
+
 class AnnotatedMessage4;
 using AnnotatedMessage4Repeated = QList<AnnotatedMessage4>;
+namespace AnnotatedMessage4_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage4_QtProtobufNested
+
 class AnnotatedMessage5;
 using AnnotatedMessage5Repeated = QList<AnnotatedMessage5>;
+namespace AnnotatedMessage5_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage5_QtProtobufNested
+
 class AnnotatedMessage6;
 using AnnotatedMessage6Repeated = QList<AnnotatedMessage6>;
+namespace AnnotatedMessage6_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage6_QtProtobufNested
+
 class AnnotatedMessage7;
 using AnnotatedMessage7Repeated = QList<AnnotatedMessage7>;
+namespace AnnotatedMessage7_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage7_QtProtobufNested
+
 class AnnotatedMessage8;
 using AnnotatedMessage8Repeated = QList<AnnotatedMessage8>;
+namespace AnnotatedMessage8_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage8_QtProtobufNested
+
 class AnnotatedMessage9;
 using AnnotatedMessage9Repeated = QList<AnnotatedMessage9>;
+namespace AnnotatedMessage9_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnnotatedMessage9_QtProtobufNested
+
 
 class AnnotatedMessage1_QtProtobufData;
 class AnnotatedMessage1 : public QProtobufMessage
@@ -46,11 +82,7 @@ class AnnotatedMessage1 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage1_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage1();
     ~AnnotatedMessage1();
     AnnotatedMessage1(const AnnotatedMessage1 &other);
@@ -67,6 +99,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage1_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage1_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage1_QtProtobufNested
 
 class AnnotatedMessage2_QtProtobufData;
 class AnnotatedMessage2 : public QProtobufMessage
@@ -77,11 +118,7 @@ class AnnotatedMessage2 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage2_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage2();
     ~AnnotatedMessage2();
     AnnotatedMessage2(const AnnotatedMessage2 &other);
@@ -98,6 +135,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage2_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage2_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage2_QtProtobufNested
 
 class AnnotatedMessage3_QtProtobufData;
 class AnnotatedMessage3 : public QProtobufMessage
@@ -108,11 +154,7 @@ class AnnotatedMessage3 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage3_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage3();
     ~AnnotatedMessage3();
     AnnotatedMessage3(const AnnotatedMessage3 &other);
@@ -129,6 +171,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage3_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage3_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage3_QtProtobufNested
 
 class AnnotatedMessage4_QtProtobufData;
 class AnnotatedMessage4 : public QProtobufMessage
@@ -139,11 +190,7 @@ class AnnotatedMessage4 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage4_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage4();
     ~AnnotatedMessage4();
     AnnotatedMessage4(const AnnotatedMessage4 &other);
@@ -160,6 +207,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage4_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage4_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage4_QtProtobufNested
 
 class AnnotatedMessage5_QtProtobufData;
 class AnnotatedMessage5 : public QProtobufMessage
@@ -170,11 +226,7 @@ class AnnotatedMessage5 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage5_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage5();
     ~AnnotatedMessage5();
     AnnotatedMessage5(const AnnotatedMessage5 &other);
@@ -191,6 +243,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage5_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage5_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage5_QtProtobufNested
 
 class AnnotatedMessage6_QtProtobufData;
 class AnnotatedMessage6 : public QProtobufMessage
@@ -201,11 +262,7 @@ class AnnotatedMessage6 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage6_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage6();
     ~AnnotatedMessage6();
     AnnotatedMessage6(const AnnotatedMessage6 &other);
@@ -222,6 +279,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage6_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage6_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage6_QtProtobufNested
 
 class AnnotatedMessage7_QtProtobufData;
 class AnnotatedMessage7 : public QProtobufMessage
@@ -232,11 +298,7 @@ class AnnotatedMessage7 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage7_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage7();
     ~AnnotatedMessage7();
     AnnotatedMessage7(const AnnotatedMessage7 &other);
@@ -253,6 +315,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage7_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage7_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage7_QtProtobufNested
 
 class AnnotatedMessage8_QtProtobufData;
 class AnnotatedMessage8 : public QProtobufMessage
@@ -263,11 +334,7 @@ class AnnotatedMessage8 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage8_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage8();
     ~AnnotatedMessage8();
     AnnotatedMessage8(const AnnotatedMessage8 &other);
@@ -284,6 +351,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage8_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage8_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage8_QtProtobufNested
 
 class AnnotatedMessage9_QtProtobufData;
 class AnnotatedMessage9 : public QProtobufMessage
@@ -294,11 +370,7 @@ class AnnotatedMessage9 : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnnotatedMessage9_QtProtobufNested::QtProtobufFieldEnum;
     AnnotatedMessage9();
     ~AnnotatedMessage9();
     AnnotatedMessage9(const AnnotatedMessage9 &other);
@@ -315,6 +387,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnnotatedMessage9_QtProtobufData> dptr;
 };
+namespace AnnotatedMessage9_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnnotatedMessage9_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::AnnotatedMessage1)
diff --git a/tests/auto/protobufgen/data/expected_result/no-options/anymessages.qpb.h b/tests/auto/protobufgen/data/expected_result/no-options/anymessages.qpb.h
index 716e62c..89d6e0d 100644
--- a/tests/auto/protobufgen/data/expected_result/no-options/anymessages.qpb.h
+++ b/tests/auto/protobufgen/data/expected_result/no-options/anymessages.qpb.h
@@ -21,14 +21,34 @@
 namespace qtproto::tests {
 class AnyMessage;
 using AnyMessageRepeated = QList<AnyMessage>;
+namespace AnyMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace AnyMessage_QtProtobufNested
+
 class RepeatedAnyMessage;
 using RepeatedAnyMessageRepeated = QList<RepeatedAnyMessage>;
+namespace RepeatedAnyMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedAnyMessage_QtProtobufNested
+
 class TwoAnyMessage;
 using TwoAnyMessageRepeated = QList<TwoAnyMessage>;
+namespace TwoAnyMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace TwoAnyMessage_QtProtobufNested
+
 class Example;
 using ExampleRepeated = QList<Example>;
+namespace Example_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace Example_QtProtobufNested
+
 class SimpleMessage;
 using SimpleMessageRepeated = QList<SimpleMessage>;
+namespace SimpleMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleMessage_QtProtobufNested
+
 
 class AnyMessage_QtProtobufData;
 class AnyMessage : public QProtobufMessage
@@ -39,11 +59,7 @@ class AnyMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::Any field READ field WRITE setField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        FieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = AnyMessage_QtProtobufNested::QtProtobufFieldEnum;
     AnyMessage();
     ~AnyMessage();
     AnyMessage(const AnyMessage &other);
@@ -60,6 +76,15 @@ public:
 private:
     QExplicitlySharedDataPointer<AnyMessage_QtProtobufData> dptr;
 };
+namespace AnyMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    FieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace AnyMessage_QtProtobufNested
 
 class RepeatedAnyMessage_QtProtobufData;
 class RepeatedAnyMessage : public QProtobufMessage
@@ -70,11 +95,7 @@ class RepeatedAnyMessage : public QProtobufMessage
     Q_PROPERTY(QList<QtProtobuf::Any> anysData READ anys WRITE setAnys SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        AnysProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedAnyMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedAnyMessage();
     ~RepeatedAnyMessage();
     RepeatedAnyMessage(const RepeatedAnyMessage &other);
@@ -92,6 +113,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedAnyMessage_QtProtobufData> dptr;
 };
+namespace RepeatedAnyMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    AnysProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedAnyMessage_QtProtobufNested
 
 class TwoAnyMessage_QtProtobufData;
 class TwoAnyMessage : public QProtobufMessage
@@ -103,12 +133,7 @@ class TwoAnyMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::Any two READ two WRITE setTwo SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        OneProtoFieldNumber = 1,
-        TwoProtoFieldNumber = 2,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = TwoAnyMessage_QtProtobufNested::QtProtobufFieldEnum;
     TwoAnyMessage();
     ~TwoAnyMessage();
     TwoAnyMessage(const TwoAnyMessage &other);
@@ -128,6 +153,16 @@ public:
 private:
     QExplicitlySharedDataPointer<TwoAnyMessage_QtProtobufData> dptr;
 };
+namespace TwoAnyMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    OneProtoFieldNumber = 1,
+    TwoProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace TwoAnyMessage_QtProtobufNested
 
 class Example_QtProtobufData;
 class Example : public QProtobufMessage
@@ -142,15 +177,7 @@ class Example : public QProtobufMessage
     Q_PROPERTY(QString str2 READ str2 WRITE setStr2 SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        StrProtoFieldNumber = 1,
-        IProtoFieldNumber = 2,
-        JProtoFieldNumber = 3,
-        HProtoFieldNumber = 4,
-        Str2ProtoFieldNumber = 5,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = Example_QtProtobufNested::QtProtobufFieldEnum;
     Example();
     ~Example();
     Example(const Example &other);
@@ -179,6 +206,19 @@ public:
 private:
     QExplicitlySharedDataPointer<Example_QtProtobufData> dptr;
 };
+namespace Example_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    StrProtoFieldNumber = 1,
+    IProtoFieldNumber = 2,
+    JProtoFieldNumber = 3,
+    HProtoFieldNumber = 4,
+    Str2ProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace Example_QtProtobufNested
 
 class SimpleMessage_QtProtobufData;
 class SimpleMessage : public QProtobufMessage
@@ -189,11 +229,7 @@ class SimpleMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int32 i READ i WRITE setI SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        IProtoFieldNumber = 500000,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleMessage();
     ~SimpleMessage();
     SimpleMessage(const SimpleMessage &other);
@@ -210,6 +246,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleMessage_QtProtobufData> dptr;
 };
+namespace SimpleMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    IProtoFieldNumber = 500000,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleMessage_QtProtobufNested
 } // namespace qtproto::tests
 
 Q_DECLARE_METATYPE(qtproto::tests::AnyMessage)
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 c04f1a4..e4b00fd 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
@@ -20,38 +20,106 @@
 namespace qtprotobufnamespace::tests {
 class EmptyMessage;
 using EmptyMessageRepeated = QList<EmptyMessage>;
+namespace EmptyMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace EmptyMessage_QtProtobufNested
+
 class SimpleBoolMessage;
 using SimpleBoolMessageRepeated = QList<SimpleBoolMessage>;
+namespace SimpleBoolMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleBoolMessage_QtProtobufNested
+
 class SimpleIntMessage;
 using SimpleIntMessageRepeated = QList<SimpleIntMessage>;
+namespace SimpleIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleIntMessage_QtProtobufNested
+
 class SimpleSIntMessage;
 using SimpleSIntMessageRepeated = QList<SimpleSIntMessage>;
+namespace SimpleSIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSIntMessage_QtProtobufNested
+
 class SimpleUIntMessage;
 using SimpleUIntMessageRepeated = QList<SimpleUIntMessage>;
+namespace SimpleUIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUIntMessage_QtProtobufNested
+
 class SimpleInt64Message;
 using SimpleInt64MessageRepeated = QList<SimpleInt64Message>;
+namespace SimpleInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64Message_QtProtobufNested
+
 class SimpleSInt64Message;
 using SimpleSInt64MessageRepeated = QList<SimpleSInt64Message>;
+namespace SimpleSInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64Message_QtProtobufNested
+
 class SimpleUInt64Message;
 using SimpleUInt64MessageRepeated = QList<SimpleUInt64Message>;
+namespace SimpleUInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64Message_QtProtobufNested
+
 class SimpleStringMessage;
 using SimpleStringMessageRepeated = QList<SimpleStringMessage>;
+namespace SimpleStringMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringMessage_QtProtobufNested
+
 class SimpleFloatMessage;
 using SimpleFloatMessageRepeated = QList<SimpleFloatMessage>;
+namespace SimpleFloatMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFloatMessage_QtProtobufNested
+
 class SimpleDoubleMessage;
 using SimpleDoubleMessageRepeated = QList<SimpleDoubleMessage>;
+namespace SimpleDoubleMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleDoubleMessage_QtProtobufNested
+
 class SimpleBytesMessage;
 using SimpleBytesMessageRepeated = QList<SimpleBytesMessage>;
+namespace SimpleBytesMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleBytesMessage_QtProtobufNested
+
 class SimpleFixedInt32Message;
 using SimpleFixedInt32MessageRepeated = QList<SimpleFixedInt32Message>;
+namespace SimpleFixedInt32Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixedInt32Message_QtProtobufNested
+
 class SimpleFixedInt64Message;
 using SimpleFixedInt64MessageRepeated = QList<SimpleFixedInt64Message>;
+namespace SimpleFixedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixedInt64Message_QtProtobufNested
+
 class SimpleSFixedInt32Message;
 using SimpleSFixedInt32MessageRepeated = QList<SimpleSFixedInt32Message>;
+namespace SimpleSFixedInt32Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixedInt32Message_QtProtobufNested
+
 class SimpleSFixedInt64Message;
 using SimpleSFixedInt64MessageRepeated = QList<SimpleSFixedInt64Message>;
+namespace SimpleSFixedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixedInt64Message_QtProtobufNested
+
 class ComplexMessage;
 using ComplexMessageRepeated = QList<ComplexMessage>;
+namespace ComplexMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace ComplexMessage_QtProtobufNested
+
 
 class EmptyMessage_QtProtobufData;
 class EmptyMessage : public QProtobufMessage
@@ -61,6 +129,7 @@ class EmptyMessage : public QProtobufMessage
     Q_DECLARE_PROTOBUF_SERIALIZERS(EmptyMessage)
 
 public:
+    using QtProtobufFieldEnum = EmptyMessage_QtProtobufNested::QtProtobufFieldEnum;
     EmptyMessage();
     ~EmptyMessage();
     EmptyMessage(const EmptyMessage &other);
@@ -74,6 +143,10 @@ public:
 private:
     QExplicitlySharedDataPointer<EmptyMessage_QtProtobufData> dptr;
 };
+namespace EmptyMessage_QtProtobufNested {
+Q_NAMESPACE
+
+} // namespace EmptyMessage_QtProtobufNested
 
 class SimpleBoolMessage_QtProtobufData;
 class SimpleBoolMessage : public QProtobufMessage
@@ -84,11 +157,7 @@ class SimpleBoolMessage : public QProtobufMessage
     Q_PROPERTY(bool testFieldBool READ testFieldBool WRITE setTestFieldBool SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldBoolProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleBoolMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleBoolMessage();
     ~SimpleBoolMessage();
     SimpleBoolMessage(const SimpleBoolMessage &other);
@@ -105,6 +174,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleBoolMessage_QtProtobufData> dptr;
 };
+namespace SimpleBoolMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldBoolProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleBoolMessage_QtProtobufNested
 
 class SimpleIntMessage_QtProtobufData;
 class SimpleIntMessage : public QProtobufMessage
@@ -115,11 +193,7 @@ class SimpleIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleIntMessage();
     ~SimpleIntMessage();
     SimpleIntMessage(const SimpleIntMessage &other);
@@ -136,6 +210,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleIntMessage_QtProtobufData> dptr;
 };
+namespace SimpleIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleIntMessage_QtProtobufNested
 
 class SimpleSIntMessage_QtProtobufData;
 class SimpleSIntMessage : public QProtobufMessage
@@ -146,11 +229,7 @@ class SimpleSIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleSIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleSIntMessage();
     ~SimpleSIntMessage();
     SimpleSIntMessage(const SimpleSIntMessage &other);
@@ -167,6 +246,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSIntMessage_QtProtobufData> dptr;
 };
+namespace SimpleSIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSIntMessage_QtProtobufNested
 
 class SimpleUIntMessage_QtProtobufData;
 class SimpleUIntMessage : public QProtobufMessage
@@ -177,11 +265,7 @@ class SimpleUIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleUIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleUIntMessage();
     ~SimpleUIntMessage();
     SimpleUIntMessage(const SimpleUIntMessage &other);
@@ -198,6 +282,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUIntMessage_QtProtobufData> dptr;
 };
+namespace SimpleUIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUIntMessage_QtProtobufNested
 
 class SimpleInt64Message_QtProtobufData;
 class SimpleInt64Message : public QProtobufMessage
@@ -208,11 +301,7 @@ class SimpleInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleInt64Message();
     ~SimpleInt64Message();
     SimpleInt64Message(const SimpleInt64Message &other);
@@ -229,6 +318,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64Message_QtProtobufData> dptr;
 };
+namespace SimpleInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64Message_QtProtobufNested
 
 class SimpleSInt64Message_QtProtobufData;
 class SimpleSInt64Message : public QProtobufMessage
@@ -239,11 +337,7 @@ class SimpleSInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleSInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleSInt64Message();
     ~SimpleSInt64Message();
     SimpleSInt64Message(const SimpleSInt64Message &other);
@@ -260,6 +354,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64Message_QtProtobufData> dptr;
 };
+namespace SimpleSInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64Message_QtProtobufNested
 
 class SimpleUInt64Message_QtProtobufData;
 class SimpleUInt64Message : public QProtobufMessage
@@ -270,11 +373,7 @@ class SimpleUInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleUInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleUInt64Message();
     ~SimpleUInt64Message();
     SimpleUInt64Message(const SimpleUInt64Message &other);
@@ -291,6 +390,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64Message_QtProtobufData> dptr;
 };
+namespace SimpleUInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64Message_QtProtobufNested
 
 class SimpleStringMessage_QtProtobufData;
 class SimpleStringMessage : public QProtobufMessage
@@ -301,11 +409,7 @@ class SimpleStringMessage : public QProtobufMessage
     Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldStringProtoFieldNumber = 6,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleStringMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleStringMessage();
     ~SimpleStringMessage();
     SimpleStringMessage(const SimpleStringMessage &other);
@@ -322,6 +426,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldStringProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringMessage_QtProtobufNested
 
 class SimpleFloatMessage_QtProtobufData;
 class SimpleFloatMessage : public QProtobufMessage
@@ -332,11 +445,7 @@ class SimpleFloatMessage : public QProtobufMessage
     Q_PROPERTY(float testFieldFloat READ testFieldFloat WRITE setTestFieldFloat SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldFloatProtoFieldNumber = 7,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleFloatMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleFloatMessage();
     ~SimpleFloatMessage();
     SimpleFloatMessage(const SimpleFloatMessage &other);
@@ -353,6 +462,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFloatMessage_QtProtobufData> dptr;
 };
+namespace SimpleFloatMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldFloatProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFloatMessage_QtProtobufNested
 
 class SimpleDoubleMessage_QtProtobufData;
 class SimpleDoubleMessage : public QProtobufMessage
@@ -363,11 +481,7 @@ class SimpleDoubleMessage : public QProtobufMessage
     Q_PROPERTY(double testFieldDouble READ testFieldDouble WRITE setTestFieldDouble SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldDoubleProtoFieldNumber = 8,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleDoubleMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleDoubleMessage();
     ~SimpleDoubleMessage();
     SimpleDoubleMessage(const SimpleDoubleMessage &other);
@@ -384,6 +498,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleDoubleMessage_QtProtobufData> dptr;
 };
+namespace SimpleDoubleMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldDoubleProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleDoubleMessage_QtProtobufNested
 
 class SimpleBytesMessage_QtProtobufData;
 class SimpleBytesMessage : public QProtobufMessage
@@ -394,11 +517,7 @@ class SimpleBytesMessage : public QProtobufMessage
     Q_PROPERTY(QByteArray testFieldBytes READ testFieldBytes WRITE setTestFieldBytes SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldBytesProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleBytesMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleBytesMessage();
     ~SimpleBytesMessage();
     SimpleBytesMessage(const SimpleBytesMessage &other);
@@ -415,6 +534,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleBytesMessage_QtProtobufData> dptr;
 };
+namespace SimpleBytesMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldBytesProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleBytesMessage_QtProtobufNested
 
 class SimpleFixedInt32Message_QtProtobufData;
 class SimpleFixedInt32Message : public QProtobufMessage
@@ -425,11 +553,7 @@ class SimpleFixedInt32Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldFixedInt32ProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleFixedInt32Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleFixedInt32Message();
     ~SimpleFixedInt32Message();
     SimpleFixedInt32Message(const SimpleFixedInt32Message &other);
@@ -446,6 +570,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixedInt32Message_QtProtobufData> dptr;
 };
+namespace SimpleFixedInt32Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldFixedInt32ProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixedInt32Message_QtProtobufNested
 
 class SimpleFixedInt64Message_QtProtobufData;
 class SimpleFixedInt64Message : public QProtobufMessage
@@ -456,11 +589,7 @@ class SimpleFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldFixedInt64ProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleFixedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleFixedInt64Message();
     ~SimpleFixedInt64Message();
     SimpleFixedInt64Message(const SimpleFixedInt64Message &other);
@@ -477,6 +606,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixedInt64Message_QtProtobufData> dptr;
 };
+namespace SimpleFixedInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldFixedInt64ProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixedInt64Message_QtProtobufNested
 
 class SimpleSFixedInt32Message_QtProtobufData;
 class SimpleSFixedInt32Message : public QProtobufMessage
@@ -487,11 +625,7 @@ class SimpleSFixedInt32Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed32 testFieldFixedInt32 READ testFieldFixedInt32 WRITE setTestFieldFixedInt32 SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldFixedInt32ProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleSFixedInt32Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleSFixedInt32Message();
     ~SimpleSFixedInt32Message();
     SimpleSFixedInt32Message(const SimpleSFixedInt32Message &other);
@@ -508,6 +642,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixedInt32Message_QtProtobufData> dptr;
 };
+namespace SimpleSFixedInt32Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldFixedInt32ProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixedInt32Message_QtProtobufNested
 
 class SimpleSFixedInt64Message_QtProtobufData;
 class SimpleSFixedInt64Message : public QProtobufMessage
@@ -518,11 +661,7 @@ class SimpleSFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldFixedInt64ProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleSFixedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleSFixedInt64Message();
     ~SimpleSFixedInt64Message();
     SimpleSFixedInt64Message(const SimpleSFixedInt64Message &other);
@@ -539,6 +678,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixedInt64Message_QtProtobufData> dptr;
 };
+namespace SimpleSFixedInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldFixedInt64ProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixedInt64Message_QtProtobufNested
 
 class ComplexMessage_QtProtobufData;
 class ComplexMessage : public QProtobufMessage
@@ -550,12 +698,7 @@ class ComplexMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringMessage *testComplexField_p READ testComplexField_p WRITE setTestComplexField_p)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-        TestComplexFieldProtoFieldNumber = 2,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = ComplexMessage_QtProtobufNested::QtProtobufFieldEnum;
     ComplexMessage();
     ~ComplexMessage();
     ComplexMessage(const ComplexMessage &other);
@@ -578,6 +721,16 @@ private:
     void setTestComplexField_p(SimpleStringMessage *testComplexField);
     QExplicitlySharedDataPointer<ComplexMessage_QtProtobufData> dptr;
 };
+namespace ComplexMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+    TestComplexFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace ComplexMessage_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::EmptyMessage)
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 d8bc82b..2a635a4 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
@@ -20,10 +20,22 @@
 namespace qtprotobufnamespace::tests {
 class EmptyMessage;
 using EmptyMessageRepeated = QList<EmptyMessage>;
+namespace EmptyMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace EmptyMessage_QtProtobufNested
+
 class SimpleStringMessage;
 using SimpleStringMessageRepeated = QList<SimpleStringMessage>;
+namespace SimpleStringMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringMessage_QtProtobufNested
+
 class ComplexMessage;
 using ComplexMessageRepeated = QList<ComplexMessage>;
+namespace ComplexMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace ComplexMessage_QtProtobufNested
+
 
 class EmptyMessage_QtProtobufData;
 class EmptyMessage : public QProtobufMessage
@@ -33,6 +45,7 @@ class EmptyMessage : public QProtobufMessage
     Q_DECLARE_PROTOBUF_SERIALIZERS(EmptyMessage)
 
 public:
+    using QtProtobufFieldEnum = EmptyMessage_QtProtobufNested::QtProtobufFieldEnum;
     EmptyMessage();
     ~EmptyMessage();
     EmptyMessage(const EmptyMessage &other);
@@ -46,6 +59,10 @@ public:
 private:
     QExplicitlySharedDataPointer<EmptyMessage_QtProtobufData> dptr;
 };
+namespace EmptyMessage_QtProtobufNested {
+Q_NAMESPACE
+
+} // namespace EmptyMessage_QtProtobufNested
 
 class SimpleStringMessage_QtProtobufData;
 class SimpleStringMessage : public QProtobufMessage
@@ -56,11 +73,7 @@ class SimpleStringMessage : public QProtobufMessage
     Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldStringProtoFieldNumber = 6,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleStringMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleStringMessage();
     ~SimpleStringMessage();
     SimpleStringMessage(const SimpleStringMessage &other);
@@ -77,6 +90,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldStringProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringMessage_QtProtobufNested
 
 class ComplexMessage_QtProtobufData;
 class ComplexMessage : public QProtobufMessage
@@ -88,12 +110,7 @@ class ComplexMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleStringMessage *testComplexField_p READ testComplexField_p WRITE setTestComplexField_p)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-        TestComplexFieldProtoFieldNumber = 2,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = ComplexMessage_QtProtobufNested::QtProtobufFieldEnum;
     ComplexMessage();
     ~ComplexMessage();
     ComplexMessage(const ComplexMessage &other);
@@ -116,6 +133,16 @@ private:
     void setTestComplexField_p(SimpleStringMessage *testComplexField);
     QExplicitlySharedDataPointer<ComplexMessage_QtProtobufData> dptr;
 };
+namespace ComplexMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+    TestComplexFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace ComplexMessage_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::EmptyMessage)
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 c8d237f..43c9218 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
@@ -20,12 +20,28 @@
 namespace qtprotobufnamespace::tests {
 class FieldIndexTest1Message;
 using FieldIndexTest1MessageRepeated = QList<FieldIndexTest1Message>;
+namespace FieldIndexTest1Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace FieldIndexTest1Message_QtProtobufNested
+
 class FieldIndexTest2Message;
 using FieldIndexTest2MessageRepeated = QList<FieldIndexTest2Message>;
+namespace FieldIndexTest2Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace FieldIndexTest2Message_QtProtobufNested
+
 class FieldIndexTest3Message;
 using FieldIndexTest3MessageRepeated = QList<FieldIndexTest3Message>;
+namespace FieldIndexTest3Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace FieldIndexTest3Message_QtProtobufNested
+
 class FieldIndexTest4Message;
 using FieldIndexTest4MessageRepeated = QList<FieldIndexTest4Message>;
+namespace FieldIndexTest4Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace FieldIndexTest4Message_QtProtobufNested
+
 
 class FieldIndexTest1Message_QtProtobufData;
 class FieldIndexTest1Message : public QProtobufMessage
@@ -36,11 +52,7 @@ class FieldIndexTest1Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 31,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = FieldIndexTest1Message_QtProtobufNested::QtProtobufFieldEnum;
     FieldIndexTest1Message();
     ~FieldIndexTest1Message();
     FieldIndexTest1Message(const FieldIndexTest1Message &other);
@@ -57,6 +69,15 @@ public:
 private:
     QExplicitlySharedDataPointer<FieldIndexTest1Message_QtProtobufData> dptr;
 };
+namespace FieldIndexTest1Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 31,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace FieldIndexTest1Message_QtProtobufNested
 
 class FieldIndexTest2Message_QtProtobufData;
 class FieldIndexTest2Message : public QProtobufMessage
@@ -67,11 +88,7 @@ class FieldIndexTest2Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 8191,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = FieldIndexTest2Message_QtProtobufNested::QtProtobufFieldEnum;
     FieldIndexTest2Message();
     ~FieldIndexTest2Message();
     FieldIndexTest2Message(const FieldIndexTest2Message &other);
@@ -88,6 +105,15 @@ public:
 private:
     QExplicitlySharedDataPointer<FieldIndexTest2Message_QtProtobufData> dptr;
 };
+namespace FieldIndexTest2Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 8191,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace FieldIndexTest2Message_QtProtobufNested
 
 class FieldIndexTest3Message_QtProtobufData;
 class FieldIndexTest3Message : public QProtobufMessage
@@ -98,11 +124,7 @@ class FieldIndexTest3Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 2097151,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = FieldIndexTest3Message_QtProtobufNested::QtProtobufFieldEnum;
     FieldIndexTest3Message();
     ~FieldIndexTest3Message();
     FieldIndexTest3Message(const FieldIndexTest3Message &other);
@@ -119,6 +141,15 @@ public:
 private:
     QExplicitlySharedDataPointer<FieldIndexTest3Message_QtProtobufData> dptr;
 };
+namespace FieldIndexTest3Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 2097151,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace FieldIndexTest3Message_QtProtobufNested
 
 class FieldIndexTest4Message_QtProtobufData;
 class FieldIndexTest4Message : public QProtobufMessage
@@ -129,11 +160,7 @@ class FieldIndexTest4Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32 testField READ testField WRITE setTestField SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 536870911,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = FieldIndexTest4Message_QtProtobufNested::QtProtobufFieldEnum;
     FieldIndexTest4Message();
     ~FieldIndexTest4Message();
     FieldIndexTest4Message(const FieldIndexTest4Message &other);
@@ -150,6 +177,15 @@ public:
 private:
     QExplicitlySharedDataPointer<FieldIndexTest4Message_QtProtobufData> dptr;
 };
+namespace FieldIndexTest4Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 536870911,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace FieldIndexTest4Message_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::FieldIndexTest1Message)
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 ea677e0..412a132 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
@@ -21,180 +21,532 @@
 namespace qtprotobufnamespace::tests {
 class SimpleSInt32StringMapMessage;
 using SimpleSInt32StringMapMessageRepeated = QList<SimpleSInt32StringMapMessage>;
+namespace SimpleSInt32StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt32StringMapMessage_QtProtobufNested
+
 class SimpleSInt64StringMapMessage;
 using SimpleSInt64StringMapMessageRepeated = QList<SimpleSInt64StringMapMessage>;
+namespace SimpleSInt64StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64StringMapMessage_QtProtobufNested
+
 class SimpleInt32StringMapMessage;
 using SimpleInt32StringMapMessageRepeated = QList<SimpleInt32StringMapMessage>;
+namespace SimpleInt32StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt32StringMapMessage_QtProtobufNested
+
 class SimpleInt64StringMapMessage;
 using SimpleInt64StringMapMessageRepeated = QList<SimpleInt64StringMapMessage>;
+namespace SimpleInt64StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64StringMapMessage_QtProtobufNested
+
 class SimpleUInt32StringMapMessage;
 using SimpleUInt32StringMapMessageRepeated = QList<SimpleUInt32StringMapMessage>;
+namespace SimpleUInt32StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt32StringMapMessage_QtProtobufNested
+
 class SimpleUInt64StringMapMessage;
 using SimpleUInt64StringMapMessageRepeated = QList<SimpleUInt64StringMapMessage>;
+namespace SimpleUInt64StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64StringMapMessage_QtProtobufNested
+
 class SimpleFixed32StringMapMessage;
 using SimpleFixed32StringMapMessageRepeated = QList<SimpleFixed32StringMapMessage>;
+namespace SimpleFixed32StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed32StringMapMessage_QtProtobufNested
+
 class SimpleFixed64StringMapMessage;
 using SimpleFixed64StringMapMessageRepeated = QList<SimpleFixed64StringMapMessage>;
+namespace SimpleFixed64StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed64StringMapMessage_QtProtobufNested
+
 class SimpleSFixed32StringMapMessage;
 using SimpleSFixed32StringMapMessageRepeated = QList<SimpleSFixed32StringMapMessage>;
+namespace SimpleSFixed32StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed32StringMapMessage_QtProtobufNested
+
 class SimpleSFixed64StringMapMessage;
 using SimpleSFixed64StringMapMessageRepeated = QList<SimpleSFixed64StringMapMessage>;
+namespace SimpleSFixed64StringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed64StringMapMessage_QtProtobufNested
+
 class SimpleStringStringMapMessage;
 using SimpleStringStringMapMessageRepeated = QList<SimpleStringStringMapMessage>;
+namespace SimpleStringStringMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringStringMapMessage_QtProtobufNested
+
 class SimpleSInt32SInt32MapMessage;
 using SimpleSInt32SInt32MapMessageRepeated = QList<SimpleSInt32SInt32MapMessage>;
+namespace SimpleSInt32SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt32SInt32MapMessage_QtProtobufNested
+
 class SimpleSInt64SInt32MapMessage;
 using SimpleSInt64SInt32MapMessageRepeated = QList<SimpleSInt64SInt32MapMessage>;
+namespace SimpleSInt64SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64SInt32MapMessage_QtProtobufNested
+
 class SimpleInt32SInt32MapMessage;
 using SimpleInt32SInt32MapMessageRepeated = QList<SimpleInt32SInt32MapMessage>;
+namespace SimpleInt32SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt32SInt32MapMessage_QtProtobufNested
+
 class SimpleInt64SInt32MapMessage;
 using SimpleInt64SInt32MapMessageRepeated = QList<SimpleInt64SInt32MapMessage>;
+namespace SimpleInt64SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64SInt32MapMessage_QtProtobufNested
+
 class SimpleUInt32SInt32MapMessage;
 using SimpleUInt32SInt32MapMessageRepeated = QList<SimpleUInt32SInt32MapMessage>;
+namespace SimpleUInt32SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt32SInt32MapMessage_QtProtobufNested
+
 class SimpleUInt64SInt32MapMessage;
 using SimpleUInt64SInt32MapMessageRepeated = QList<SimpleUInt64SInt32MapMessage>;
+namespace SimpleUInt64SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64SInt32MapMessage_QtProtobufNested
+
 class SimpleFixed32SInt32MapMessage;
 using SimpleFixed32SInt32MapMessageRepeated = QList<SimpleFixed32SInt32MapMessage>;
+namespace SimpleFixed32SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed32SInt32MapMessage_QtProtobufNested
+
 class SimpleFixed64SInt32MapMessage;
 using SimpleFixed64SInt32MapMessageRepeated = QList<SimpleFixed64SInt32MapMessage>;
+namespace SimpleFixed64SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed64SInt32MapMessage_QtProtobufNested
+
 class SimpleSFixed32SInt32MapMessage;
 using SimpleSFixed32SInt32MapMessageRepeated = QList<SimpleSFixed32SInt32MapMessage>;
+namespace SimpleSFixed32SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed32SInt32MapMessage_QtProtobufNested
+
 class SimpleSFixed64SInt32MapMessage;
 using SimpleSFixed64SInt32MapMessageRepeated = QList<SimpleSFixed64SInt32MapMessage>;
+namespace SimpleSFixed64SInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed64SInt32MapMessage_QtProtobufNested
+
 class SimpleStringSInt32MapMessage;
 using SimpleStringSInt32MapMessageRepeated = QList<SimpleStringSInt32MapMessage>;
+namespace SimpleStringSInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringSInt32MapMessage_QtProtobufNested
+
 class SimpleSInt32SInt64MapMessage;
 using SimpleSInt32SInt64MapMessageRepeated = QList<SimpleSInt32SInt64MapMessage>;
+namespace SimpleSInt32SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt32SInt64MapMessage_QtProtobufNested
+
 class SimpleSInt64SInt64MapMessage;
 using SimpleSInt64SInt64MapMessageRepeated = QList<SimpleSInt64SInt64MapMessage>;
+namespace SimpleSInt64SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64SInt64MapMessage_QtProtobufNested
+
 class SimpleInt32SInt64MapMessage;
 using SimpleInt32SInt64MapMessageRepeated = QList<SimpleInt32SInt64MapMessage>;
+namespace SimpleInt32SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt32SInt64MapMessage_QtProtobufNested
+
 class SimpleInt64SInt64MapMessage;
 using SimpleInt64SInt64MapMessageRepeated = QList<SimpleInt64SInt64MapMessage>;
+namespace SimpleInt64SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64SInt64MapMessage_QtProtobufNested
+
 class SimpleUInt32SInt64MapMessage;
 using SimpleUInt32SInt64MapMessageRepeated = QList<SimpleUInt32SInt64MapMessage>;
+namespace SimpleUInt32SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt32SInt64MapMessage_QtProtobufNested
+
 class SimpleUInt64SInt64MapMessage;
 using SimpleUInt64SInt64MapMessageRepeated = QList<SimpleUInt64SInt64MapMessage>;
+namespace SimpleUInt64SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64SInt64MapMessage_QtProtobufNested
+
 class SimpleFixed32SInt64MapMessage;
 using SimpleFixed32SInt64MapMessageRepeated = QList<SimpleFixed32SInt64MapMessage>;
+namespace SimpleFixed32SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed32SInt64MapMessage_QtProtobufNested
+
 class SimpleFixed64SInt64MapMessage;
 using SimpleFixed64SInt64MapMessageRepeated = QList<SimpleFixed64SInt64MapMessage>;
+namespace SimpleFixed64SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed64SInt64MapMessage_QtProtobufNested
+
 class SimpleSFixed32SInt64MapMessage;
 using SimpleSFixed32SInt64MapMessageRepeated = QList<SimpleSFixed32SInt64MapMessage>;
+namespace SimpleSFixed32SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed32SInt64MapMessage_QtProtobufNested
+
 class SimpleSFixed64SInt64MapMessage;
 using SimpleSFixed64SInt64MapMessageRepeated = QList<SimpleSFixed64SInt64MapMessage>;
+namespace SimpleSFixed64SInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed64SInt64MapMessage_QtProtobufNested
+
 class SimpleStringSInt64MapMessage;
 using SimpleStringSInt64MapMessageRepeated = QList<SimpleStringSInt64MapMessage>;
+namespace SimpleStringSInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringSInt64MapMessage_QtProtobufNested
+
 class SimpleSInt32UInt32MapMessage;
 using SimpleSInt32UInt32MapMessageRepeated = QList<SimpleSInt32UInt32MapMessage>;
+namespace SimpleSInt32UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt32UInt32MapMessage_QtProtobufNested
+
 class SimpleSInt64UInt32MapMessage;
 using SimpleSInt64UInt32MapMessageRepeated = QList<SimpleSInt64UInt32MapMessage>;
+namespace SimpleSInt64UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64UInt32MapMessage_QtProtobufNested
+
 class SimpleInt32UInt32MapMessage;
 using SimpleInt32UInt32MapMessageRepeated = QList<SimpleInt32UInt32MapMessage>;
+namespace SimpleInt32UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt32UInt32MapMessage_QtProtobufNested
+
 class SimpleInt64UInt32MapMessage;
 using SimpleInt64UInt32MapMessageRepeated = QList<SimpleInt64UInt32MapMessage>;
+namespace SimpleInt64UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64UInt32MapMessage_QtProtobufNested
+
 class SimpleUInt32UInt32MapMessage;
 using SimpleUInt32UInt32MapMessageRepeated = QList<SimpleUInt32UInt32MapMessage>;
+namespace SimpleUInt32UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt32UInt32MapMessage_QtProtobufNested
+
 class SimpleUInt64UInt32MapMessage;
 using SimpleUInt64UInt32MapMessageRepeated = QList<SimpleUInt64UInt32MapMessage>;
+namespace SimpleUInt64UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64UInt32MapMessage_QtProtobufNested
+
 class SimpleFixed32UInt32MapMessage;
 using SimpleFixed32UInt32MapMessageRepeated = QList<SimpleFixed32UInt32MapMessage>;
+namespace SimpleFixed32UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed32UInt32MapMessage_QtProtobufNested
+
 class SimpleFixed64UInt32MapMessage;
 using SimpleFixed64UInt32MapMessageRepeated = QList<SimpleFixed64UInt32MapMessage>;
+namespace SimpleFixed64UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed64UInt32MapMessage_QtProtobufNested
+
 class SimpleSFixed32UInt32MapMessage;
 using SimpleSFixed32UInt32MapMessageRepeated = QList<SimpleSFixed32UInt32MapMessage>;
+namespace SimpleSFixed32UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed32UInt32MapMessage_QtProtobufNested
+
 class SimpleSFixed64UInt32MapMessage;
 using SimpleSFixed64UInt32MapMessageRepeated = QList<SimpleSFixed64UInt32MapMessage>;
+namespace SimpleSFixed64UInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed64UInt32MapMessage_QtProtobufNested
+
 class SimpleStringUInt32MapMessage;
 using SimpleStringUInt32MapMessageRepeated = QList<SimpleStringUInt32MapMessage>;
+namespace SimpleStringUInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringUInt32MapMessage_QtProtobufNested
+
 class SimpleSInt32UInt64MapMessage;
 using SimpleSInt32UInt64MapMessageRepeated = QList<SimpleSInt32UInt64MapMessage>;
+namespace SimpleSInt32UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt32UInt64MapMessage_QtProtobufNested
+
 class SimpleSInt64UInt64MapMessage;
 using SimpleSInt64UInt64MapMessageRepeated = QList<SimpleSInt64UInt64MapMessage>;
+namespace SimpleSInt64UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64UInt64MapMessage_QtProtobufNested
+
 class SimpleInt32UInt64MapMessage;
 using SimpleInt32UInt64MapMessageRepeated = QList<SimpleInt32UInt64MapMessage>;
+namespace SimpleInt32UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt32UInt64MapMessage_QtProtobufNested
+
 class SimpleInt64UInt64MapMessage;
 using SimpleInt64UInt64MapMessageRepeated = QList<SimpleInt64UInt64MapMessage>;
+namespace SimpleInt64UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64UInt64MapMessage_QtProtobufNested
+
 class SimpleUInt32UInt64MapMessage;
 using SimpleUInt32UInt64MapMessageRepeated = QList<SimpleUInt32UInt64MapMessage>;
+namespace SimpleUInt32UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt32UInt64MapMessage_QtProtobufNested
+
 class SimpleUInt64UInt64MapMessage;
 using SimpleUInt64UInt64MapMessageRepeated = QList<SimpleUInt64UInt64MapMessage>;
+namespace SimpleUInt64UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64UInt64MapMessage_QtProtobufNested
+
 class SimpleFixed32UInt64MapMessage;
 using SimpleFixed32UInt64MapMessageRepeated = QList<SimpleFixed32UInt64MapMessage>;
+namespace SimpleFixed32UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed32UInt64MapMessage_QtProtobufNested
+
 class SimpleFixed64UInt64MapMessage;
 using SimpleFixed64UInt64MapMessageRepeated = QList<SimpleFixed64UInt64MapMessage>;
+namespace SimpleFixed64UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed64UInt64MapMessage_QtProtobufNested
+
 class SimpleSFixed32UInt64MapMessage;
 using SimpleSFixed32UInt64MapMessageRepeated = QList<SimpleSFixed32UInt64MapMessage>;
+namespace SimpleSFixed32UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed32UInt64MapMessage_QtProtobufNested
+
 class SimpleSFixed64UInt64MapMessage;
 using SimpleSFixed64UInt64MapMessageRepeated = QList<SimpleSFixed64UInt64MapMessage>;
+namespace SimpleSFixed64UInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed64UInt64MapMessage_QtProtobufNested
+
 class SimpleStringUInt64MapMessage;
 using SimpleStringUInt64MapMessageRepeated = QList<SimpleStringUInt64MapMessage>;
+namespace SimpleStringUInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringUInt64MapMessage_QtProtobufNested
+
 class SimpleSInt32Int32MapMessage;
 using SimpleSInt32Int32MapMessageRepeated = QList<SimpleSInt32Int32MapMessage>;
+namespace SimpleSInt32Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt32Int32MapMessage_QtProtobufNested
+
 class SimpleSInt64Int32MapMessage;
 using SimpleSInt64Int32MapMessageRepeated = QList<SimpleSInt64Int32MapMessage>;
+namespace SimpleSInt64Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64Int32MapMessage_QtProtobufNested
+
 class SimpleInt32Int32MapMessage;
 using SimpleInt32Int32MapMessageRepeated = QList<SimpleInt32Int32MapMessage>;
+namespace SimpleInt32Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt32Int32MapMessage_QtProtobufNested
+
 class SimpleInt64Int32MapMessage;
 using SimpleInt64Int32MapMessageRepeated = QList<SimpleInt64Int32MapMessage>;
+namespace SimpleInt64Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64Int32MapMessage_QtProtobufNested
+
 class SimpleUInt32Int32MapMessage;
 using SimpleUInt32Int32MapMessageRepeated = QList<SimpleUInt32Int32MapMessage>;
+namespace SimpleUInt32Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt32Int32MapMessage_QtProtobufNested
+
 class SimpleUInt64Int32MapMessage;
 using SimpleUInt64Int32MapMessageRepeated = QList<SimpleUInt64Int32MapMessage>;
+namespace SimpleUInt64Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64Int32MapMessage_QtProtobufNested
+
 class SimpleFixed32Int32MapMessage;
 using SimpleFixed32Int32MapMessageRepeated = QList<SimpleFixed32Int32MapMessage>;
+namespace SimpleFixed32Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed32Int32MapMessage_QtProtobufNested
+
 class SimpleFixed64Int32MapMessage;
 using SimpleFixed64Int32MapMessageRepeated = QList<SimpleFixed64Int32MapMessage>;
+namespace SimpleFixed64Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed64Int32MapMessage_QtProtobufNested
+
 class SimpleSFixed32Int32MapMessage;
 using SimpleSFixed32Int32MapMessageRepeated = QList<SimpleSFixed32Int32MapMessage>;
+namespace SimpleSFixed32Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed32Int32MapMessage_QtProtobufNested
+
 class SimpleSFixed64Int32MapMessage;
 using SimpleSFixed64Int32MapMessageRepeated = QList<SimpleSFixed64Int32MapMessage>;
+namespace SimpleSFixed64Int32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed64Int32MapMessage_QtProtobufNested
+
 class SimpleStringInt32MapMessage;
 using SimpleStringInt32MapMessageRepeated = QList<SimpleStringInt32MapMessage>;
+namespace SimpleStringInt32MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringInt32MapMessage_QtProtobufNested
+
 class SimpleSInt32Int64MapMessage;
 using SimpleSInt32Int64MapMessageRepeated = QList<SimpleSInt32Int64MapMessage>;
+namespace SimpleSInt32Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt32Int64MapMessage_QtProtobufNested
+
 class SimpleSInt64Int64MapMessage;
 using SimpleSInt64Int64MapMessageRepeated = QList<SimpleSInt64Int64MapMessage>;
+namespace SimpleSInt64Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64Int64MapMessage_QtProtobufNested
+
 class SimpleInt32Int64MapMessage;
 using SimpleInt32Int64MapMessageRepeated = QList<SimpleInt32Int64MapMessage>;
+namespace SimpleInt32Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt32Int64MapMessage_QtProtobufNested
+
 class SimpleInt64Int64MapMessage;
 using SimpleInt64Int64MapMessageRepeated = QList<SimpleInt64Int64MapMessage>;
+namespace SimpleInt64Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64Int64MapMessage_QtProtobufNested
+
 class SimpleUInt32Int64MapMessage;
 using SimpleUInt32Int64MapMessageRepeated = QList<SimpleUInt32Int64MapMessage>;
+namespace SimpleUInt32Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt32Int64MapMessage_QtProtobufNested
+
 class SimpleUInt64Int64MapMessage;
 using SimpleUInt64Int64MapMessageRepeated = QList<SimpleUInt64Int64MapMessage>;
+namespace SimpleUInt64Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64Int64MapMessage_QtProtobufNested
+
 class SimpleFixed32Int64MapMessage;
 using SimpleFixed32Int64MapMessageRepeated = QList<SimpleFixed32Int64MapMessage>;
+namespace SimpleFixed32Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed32Int64MapMessage_QtProtobufNested
+
 class SimpleFixed64Int64MapMessage;
 using SimpleFixed64Int64MapMessageRepeated = QList<SimpleFixed64Int64MapMessage>;
+namespace SimpleFixed64Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed64Int64MapMessage_QtProtobufNested
+
 class SimpleSFixed32Int64MapMessage;
 using SimpleSFixed32Int64MapMessageRepeated = QList<SimpleSFixed32Int64MapMessage>;
+namespace SimpleSFixed32Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed32Int64MapMessage_QtProtobufNested
+
 class SimpleSFixed64Int64MapMessage;
 using SimpleSFixed64Int64MapMessageRepeated = QList<SimpleSFixed64Int64MapMessage>;
+namespace SimpleSFixed64Int64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed64Int64MapMessage_QtProtobufNested
+
 class SimpleStringInt64MapMessage;
 using SimpleStringInt64MapMessageRepeated = QList<SimpleStringInt64MapMessage>;
+namespace SimpleStringInt64MapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringInt64MapMessage_QtProtobufNested
+
 class SimpleSInt32ComplexMessageMapMessage;
 using SimpleSInt32ComplexMessageMapMessageRepeated = QList<SimpleSInt32ComplexMessageMapMessage>;
+namespace SimpleSInt32ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt32ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleSInt64ComplexMessageMapMessage;
 using SimpleSInt64ComplexMessageMapMessageRepeated = QList<SimpleSInt64ComplexMessageMapMessage>;
+namespace SimpleSInt64ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleInt32ComplexMessageMapMessage;
 using SimpleInt32ComplexMessageMapMessageRepeated = QList<SimpleInt32ComplexMessageMapMessage>;
+namespace SimpleInt32ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt32ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleInt64ComplexMessageMapMessage;
 using SimpleInt64ComplexMessageMapMessageRepeated = QList<SimpleInt64ComplexMessageMapMessage>;
+namespace SimpleInt64ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleUInt32ComplexMessageMapMessage;
 using SimpleUInt32ComplexMessageMapMessageRepeated = QList<SimpleUInt32ComplexMessageMapMessage>;
+namespace SimpleUInt32ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt32ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleUInt64ComplexMessageMapMessage;
 using SimpleUInt64ComplexMessageMapMessageRepeated = QList<SimpleUInt64ComplexMessageMapMessage>;
+namespace SimpleUInt64ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleFixed32ComplexMessageMapMessage;
 using SimpleFixed32ComplexMessageMapMessageRepeated = QList<SimpleFixed32ComplexMessageMapMessage>;
+namespace SimpleFixed32ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed32ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleFixed64ComplexMessageMapMessage;
 using SimpleFixed64ComplexMessageMapMessageRepeated = QList<SimpleFixed64ComplexMessageMapMessage>;
+namespace SimpleFixed64ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixed64ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleSFixed32ComplexMessageMapMessage;
 using SimpleSFixed32ComplexMessageMapMessageRepeated = QList<SimpleSFixed32ComplexMessageMapMessage>;
+namespace SimpleSFixed32ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed32ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleSFixed64ComplexMessageMapMessage;
 using SimpleSFixed64ComplexMessageMapMessageRepeated = QList<SimpleSFixed64ComplexMessageMapMessage>;
+namespace SimpleSFixed64ComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixed64ComplexMessageMapMessage_QtProtobufNested
+
 class SimpleStringComplexMessageMapMessage;
 using SimpleStringComplexMessageMapMessageRepeated = QList<SimpleStringComplexMessageMapMessage>;
+namespace SimpleStringComplexMessageMapMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringComplexMessageMapMessage_QtProtobufNested
+
 
 class SimpleSInt32StringMapMessage_QtProtobufData;
 class SimpleSInt32StringMapMessage : public QProtobufMessage
@@ -205,11 +557,7 @@ 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 QtProtobufFieldEnum = SimpleSInt32StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint32, QString>;
     SimpleSInt32StringMapMessage();
     ~SimpleSInt32StringMapMessage();
@@ -228,6 +576,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt32StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt32StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt32StringMapMessage_QtProtobufNested
 
 class SimpleSInt64StringMapMessage_QtProtobufData;
 class SimpleSInt64StringMapMessage : public QProtobufMessage
@@ -238,11 +595,7 @@ 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 QtProtobufFieldEnum = SimpleSInt64StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint64, QString>;
     SimpleSInt64StringMapMessage();
     ~SimpleSInt64StringMapMessage();
@@ -261,6 +614,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt64StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64StringMapMessage_QtProtobufNested
 
 class SimpleInt32StringMapMessage_QtProtobufData;
 class SimpleInt32StringMapMessage : public QProtobufMessage
@@ -271,11 +633,7 @@ 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 QtProtobufFieldEnum = SimpleInt32StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int32, QString>;
     SimpleInt32StringMapMessage();
     ~SimpleInt32StringMapMessage();
@@ -294,6 +652,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt32StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt32StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 3,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt32StringMapMessage_QtProtobufNested
 
 class SimpleInt64StringMapMessage_QtProtobufData;
 class SimpleInt64StringMapMessage : public QProtobufMessage
@@ -304,11 +671,7 @@ 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 QtProtobufFieldEnum = SimpleInt64StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int64, QString>;
     SimpleInt64StringMapMessage();
     ~SimpleInt64StringMapMessage();
@@ -327,6 +690,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt64StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 4,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64StringMapMessage_QtProtobufNested
 
 class SimpleUInt32StringMapMessage_QtProtobufData;
 class SimpleUInt32StringMapMessage : public QProtobufMessage
@@ -337,11 +709,7 @@ 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 QtProtobufFieldEnum = SimpleUInt32StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint32, QString>;
     SimpleUInt32StringMapMessage();
     ~SimpleUInt32StringMapMessage();
@@ -360,6 +728,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt32StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt32StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt32StringMapMessage_QtProtobufNested
 
 class SimpleUInt64StringMapMessage_QtProtobufData;
 class SimpleUInt64StringMapMessage : public QProtobufMessage
@@ -370,11 +747,7 @@ 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 QtProtobufFieldEnum = SimpleUInt64StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint64, QString>;
     SimpleUInt64StringMapMessage();
     ~SimpleUInt64StringMapMessage();
@@ -393,6 +766,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt64StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64StringMapMessage_QtProtobufNested
 
 class SimpleFixed32StringMapMessage_QtProtobufData;
 class SimpleFixed32StringMapMessage : public QProtobufMessage
@@ -403,11 +785,7 @@ 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 QtProtobufFieldEnum = SimpleFixed32StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QString>;
     SimpleFixed32StringMapMessage();
     ~SimpleFixed32StringMapMessage();
@@ -426,6 +804,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed32StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed32StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed32StringMapMessage_QtProtobufNested
 
 class SimpleFixed64StringMapMessage_QtProtobufData;
 class SimpleFixed64StringMapMessage : public QProtobufMessage
@@ -436,11 +823,7 @@ 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 QtProtobufFieldEnum = SimpleFixed64StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QString>;
     SimpleFixed64StringMapMessage();
     ~SimpleFixed64StringMapMessage();
@@ -459,6 +842,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed64StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed64StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed64StringMapMessage_QtProtobufNested
 
 class SimpleSFixed32StringMapMessage_QtProtobufData;
 class SimpleSFixed32StringMapMessage : public QProtobufMessage
@@ -469,11 +861,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed32StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QString>;
     SimpleSFixed32StringMapMessage();
     ~SimpleSFixed32StringMapMessage();
@@ -492,6 +880,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed32StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed32StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 9,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed32StringMapMessage_QtProtobufNested
 
 class SimpleSFixed64StringMapMessage_QtProtobufData;
 class SimpleSFixed64StringMapMessage : public QProtobufMessage
@@ -502,11 +899,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed64StringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QString>;
     SimpleSFixed64StringMapMessage();
     ~SimpleSFixed64StringMapMessage();
@@ -525,6 +918,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed64StringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed64StringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 10,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed64StringMapMessage_QtProtobufNested
 
 class SimpleStringStringMapMessage_QtProtobufData;
 class SimpleStringStringMapMessage : public QProtobufMessage
@@ -535,11 +937,7 @@ 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 QtProtobufFieldEnum = SimpleStringStringMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QString, QString>;
     SimpleStringStringMapMessage();
     ~SimpleStringStringMapMessage();
@@ -558,6 +956,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringStringMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringStringMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 13,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringStringMapMessage_QtProtobufNested
 
 class SimpleSInt32SInt32MapMessage_QtProtobufData;
 class SimpleSInt32SInt32MapMessage : public QProtobufMessage
@@ -568,11 +975,7 @@ 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 QtProtobufFieldEnum = SimpleSInt32SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::sint32>;
     SimpleSInt32SInt32MapMessage();
     ~SimpleSInt32SInt32MapMessage();
@@ -591,6 +994,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt32SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt32SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt32SInt32MapMessage_QtProtobufNested
 
 class SimpleSInt64SInt32MapMessage_QtProtobufData;
 class SimpleSInt64SInt32MapMessage : public QProtobufMessage
@@ -601,11 +1013,7 @@ 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 QtProtobufFieldEnum = SimpleSInt64SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::sint32>;
     SimpleSInt64SInt32MapMessage();
     ~SimpleSInt64SInt32MapMessage();
@@ -624,6 +1032,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt64SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64SInt32MapMessage_QtProtobufNested
 
 class SimpleInt32SInt32MapMessage_QtProtobufData;
 class SimpleInt32SInt32MapMessage : public QProtobufMessage
@@ -634,11 +1051,7 @@ 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 QtProtobufFieldEnum = SimpleInt32SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::sint32>;
     SimpleInt32SInt32MapMessage();
     ~SimpleInt32SInt32MapMessage();
@@ -657,6 +1070,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt32SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt32SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 3,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt32SInt32MapMessage_QtProtobufNested
 
 class SimpleInt64SInt32MapMessage_QtProtobufData;
 class SimpleInt64SInt32MapMessage : public QProtobufMessage
@@ -667,11 +1089,7 @@ 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 QtProtobufFieldEnum = SimpleInt64SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::sint32>;
     SimpleInt64SInt32MapMessage();
     ~SimpleInt64SInt32MapMessage();
@@ -690,6 +1108,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt64SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 4,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64SInt32MapMessage_QtProtobufNested
 
 class SimpleUInt32SInt32MapMessage_QtProtobufData;
 class SimpleUInt32SInt32MapMessage : public QProtobufMessage
@@ -700,11 +1127,7 @@ 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 QtProtobufFieldEnum = SimpleUInt32SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::sint32>;
     SimpleUInt32SInt32MapMessage();
     ~SimpleUInt32SInt32MapMessage();
@@ -723,6 +1146,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt32SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt32SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt32SInt32MapMessage_QtProtobufNested
 
 class SimpleUInt64SInt32MapMessage_QtProtobufData;
 class SimpleUInt64SInt32MapMessage : public QProtobufMessage
@@ -733,11 +1165,7 @@ 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 QtProtobufFieldEnum = SimpleUInt64SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::sint32>;
     SimpleUInt64SInt32MapMessage();
     ~SimpleUInt64SInt32MapMessage();
@@ -756,6 +1184,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt64SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64SInt32MapMessage_QtProtobufNested
 
 class SimpleFixed32SInt32MapMessage_QtProtobufData;
 class SimpleFixed32SInt32MapMessage : public QProtobufMessage
@@ -766,11 +1203,7 @@ 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 QtProtobufFieldEnum = SimpleFixed32SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::sint32>;
     SimpleFixed32SInt32MapMessage();
     ~SimpleFixed32SInt32MapMessage();
@@ -789,6 +1222,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed32SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed32SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed32SInt32MapMessage_QtProtobufNested
 
 class SimpleFixed64SInt32MapMessage_QtProtobufData;
 class SimpleFixed64SInt32MapMessage : public QProtobufMessage
@@ -799,11 +1241,7 @@ 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 QtProtobufFieldEnum = SimpleFixed64SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::sint32>;
     SimpleFixed64SInt32MapMessage();
     ~SimpleFixed64SInt32MapMessage();
@@ -822,6 +1260,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed64SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed64SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed64SInt32MapMessage_QtProtobufNested
 
 class SimpleSFixed32SInt32MapMessage_QtProtobufData;
 class SimpleSFixed32SInt32MapMessage : public QProtobufMessage
@@ -832,11 +1279,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed32SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::sint32>;
     SimpleSFixed32SInt32MapMessage();
     ~SimpleSFixed32SInt32MapMessage();
@@ -855,6 +1298,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed32SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed32SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 9,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed32SInt32MapMessage_QtProtobufNested
 
 class SimpleSFixed64SInt32MapMessage_QtProtobufData;
 class SimpleSFixed64SInt32MapMessage : public QProtobufMessage
@@ -865,11 +1317,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed64SInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::sint32>;
     SimpleSFixed64SInt32MapMessage();
     ~SimpleSFixed64SInt32MapMessage();
@@ -888,6 +1336,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed64SInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed64SInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 10,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed64SInt32MapMessage_QtProtobufNested
 
 class SimpleStringSInt32MapMessage_QtProtobufData;
 class SimpleStringSInt32MapMessage : public QProtobufMessage
@@ -898,11 +1355,7 @@ 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 QtProtobufFieldEnum = SimpleStringSInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QString, QtProtobuf::sint32>;
     SimpleStringSInt32MapMessage();
     ~SimpleStringSInt32MapMessage();
@@ -921,6 +1374,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringSInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringSInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 13,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringSInt32MapMessage_QtProtobufNested
 
 class SimpleSInt32SInt64MapMessage_QtProtobufData;
 class SimpleSInt32SInt64MapMessage : public QProtobufMessage
@@ -931,11 +1393,7 @@ 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 QtProtobufFieldEnum = SimpleSInt32SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::sint64>;
     SimpleSInt32SInt64MapMessage();
     ~SimpleSInt32SInt64MapMessage();
@@ -954,6 +1412,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt32SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt32SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt32SInt64MapMessage_QtProtobufNested
 
 class SimpleSInt64SInt64MapMessage_QtProtobufData;
 class SimpleSInt64SInt64MapMessage : public QProtobufMessage
@@ -964,11 +1431,7 @@ 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 QtProtobufFieldEnum = SimpleSInt64SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::sint64>;
     SimpleSInt64SInt64MapMessage();
     ~SimpleSInt64SInt64MapMessage();
@@ -987,6 +1450,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt64SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64SInt64MapMessage_QtProtobufNested
 
 class SimpleInt32SInt64MapMessage_QtProtobufData;
 class SimpleInt32SInt64MapMessage : public QProtobufMessage
@@ -997,11 +1469,7 @@ 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 QtProtobufFieldEnum = SimpleInt32SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::sint64>;
     SimpleInt32SInt64MapMessage();
     ~SimpleInt32SInt64MapMessage();
@@ -1020,6 +1488,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt32SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt32SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 3,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt32SInt64MapMessage_QtProtobufNested
 
 class SimpleInt64SInt64MapMessage_QtProtobufData;
 class SimpleInt64SInt64MapMessage : public QProtobufMessage
@@ -1030,11 +1507,7 @@ 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 QtProtobufFieldEnum = SimpleInt64SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::sint64>;
     SimpleInt64SInt64MapMessage();
     ~SimpleInt64SInt64MapMessage();
@@ -1053,6 +1526,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt64SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 4,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64SInt64MapMessage_QtProtobufNested
 
 class SimpleUInt32SInt64MapMessage_QtProtobufData;
 class SimpleUInt32SInt64MapMessage : public QProtobufMessage
@@ -1063,11 +1545,7 @@ 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 QtProtobufFieldEnum = SimpleUInt32SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::sint64>;
     SimpleUInt32SInt64MapMessage();
     ~SimpleUInt32SInt64MapMessage();
@@ -1086,6 +1564,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt32SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt32SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt32SInt64MapMessage_QtProtobufNested
 
 class SimpleUInt64SInt64MapMessage_QtProtobufData;
 class SimpleUInt64SInt64MapMessage : public QProtobufMessage
@@ -1096,11 +1583,7 @@ 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 QtProtobufFieldEnum = SimpleUInt64SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::sint64>;
     SimpleUInt64SInt64MapMessage();
     ~SimpleUInt64SInt64MapMessage();
@@ -1119,6 +1602,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt64SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64SInt64MapMessage_QtProtobufNested
 
 class SimpleFixed32SInt64MapMessage_QtProtobufData;
 class SimpleFixed32SInt64MapMessage : public QProtobufMessage
@@ -1129,11 +1621,7 @@ 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 QtProtobufFieldEnum = SimpleFixed32SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::sint64>;
     SimpleFixed32SInt64MapMessage();
     ~SimpleFixed32SInt64MapMessage();
@@ -1152,6 +1640,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed32SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed32SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed32SInt64MapMessage_QtProtobufNested
 
 class SimpleFixed64SInt64MapMessage_QtProtobufData;
 class SimpleFixed64SInt64MapMessage : public QProtobufMessage
@@ -1162,11 +1659,7 @@ 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 QtProtobufFieldEnum = SimpleFixed64SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::sint64>;
     SimpleFixed64SInt64MapMessage();
     ~SimpleFixed64SInt64MapMessage();
@@ -1185,6 +1678,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed64SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed64SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed64SInt64MapMessage_QtProtobufNested
 
 class SimpleSFixed32SInt64MapMessage_QtProtobufData;
 class SimpleSFixed32SInt64MapMessage : public QProtobufMessage
@@ -1195,11 +1697,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed32SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::sint64>;
     SimpleSFixed32SInt64MapMessage();
     ~SimpleSFixed32SInt64MapMessage();
@@ -1218,6 +1716,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed32SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed32SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 9,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed32SInt64MapMessage_QtProtobufNested
 
 class SimpleSFixed64SInt64MapMessage_QtProtobufData;
 class SimpleSFixed64SInt64MapMessage : public QProtobufMessage
@@ -1228,11 +1735,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed64SInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::sint64>;
     SimpleSFixed64SInt64MapMessage();
     ~SimpleSFixed64SInt64MapMessage();
@@ -1251,6 +1754,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed64SInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed64SInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 10,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed64SInt64MapMessage_QtProtobufNested
 
 class SimpleStringSInt64MapMessage_QtProtobufData;
 class SimpleStringSInt64MapMessage : public QProtobufMessage
@@ -1261,11 +1773,7 @@ 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 QtProtobufFieldEnum = SimpleStringSInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QString, QtProtobuf::sint64>;
     SimpleStringSInt64MapMessage();
     ~SimpleStringSInt64MapMessage();
@@ -1284,6 +1792,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringSInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringSInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 13,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringSInt64MapMessage_QtProtobufNested
 
 class SimpleSInt32UInt32MapMessage_QtProtobufData;
 class SimpleSInt32UInt32MapMessage : public QProtobufMessage
@@ -1294,11 +1811,7 @@ 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 QtProtobufFieldEnum = SimpleSInt32UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::uint32>;
     SimpleSInt32UInt32MapMessage();
     ~SimpleSInt32UInt32MapMessage();
@@ -1317,6 +1830,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt32UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt32UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt32UInt32MapMessage_QtProtobufNested
 
 class SimpleSInt64UInt32MapMessage_QtProtobufData;
 class SimpleSInt64UInt32MapMessage : public QProtobufMessage
@@ -1327,11 +1849,7 @@ 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 QtProtobufFieldEnum = SimpleSInt64UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::uint32>;
     SimpleSInt64UInt32MapMessage();
     ~SimpleSInt64UInt32MapMessage();
@@ -1350,6 +1868,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt64UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64UInt32MapMessage_QtProtobufNested
 
 class SimpleInt32UInt32MapMessage_QtProtobufData;
 class SimpleInt32UInt32MapMessage : public QProtobufMessage
@@ -1360,11 +1887,7 @@ 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 QtProtobufFieldEnum = SimpleInt32UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::uint32>;
     SimpleInt32UInt32MapMessage();
     ~SimpleInt32UInt32MapMessage();
@@ -1383,6 +1906,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt32UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt32UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 3,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt32UInt32MapMessage_QtProtobufNested
 
 class SimpleInt64UInt32MapMessage_QtProtobufData;
 class SimpleInt64UInt32MapMessage : public QProtobufMessage
@@ -1393,11 +1925,7 @@ 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 QtProtobufFieldEnum = SimpleInt64UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::uint32>;
     SimpleInt64UInt32MapMessage();
     ~SimpleInt64UInt32MapMessage();
@@ -1416,6 +1944,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt64UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 4,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64UInt32MapMessage_QtProtobufNested
 
 class SimpleUInt32UInt32MapMessage_QtProtobufData;
 class SimpleUInt32UInt32MapMessage : public QProtobufMessage
@@ -1426,11 +1963,7 @@ 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 QtProtobufFieldEnum = SimpleUInt32UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::uint32>;
     SimpleUInt32UInt32MapMessage();
     ~SimpleUInt32UInt32MapMessage();
@@ -1449,6 +1982,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt32UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt32UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt32UInt32MapMessage_QtProtobufNested
 
 class SimpleUInt64UInt32MapMessage_QtProtobufData;
 class SimpleUInt64UInt32MapMessage : public QProtobufMessage
@@ -1459,11 +2001,7 @@ 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 QtProtobufFieldEnum = SimpleUInt64UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::uint32>;
     SimpleUInt64UInt32MapMessage();
     ~SimpleUInt64UInt32MapMessage();
@@ -1482,6 +2020,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt64UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64UInt32MapMessage_QtProtobufNested
 
 class SimpleFixed32UInt32MapMessage_QtProtobufData;
 class SimpleFixed32UInt32MapMessage : public QProtobufMessage
@@ -1492,11 +2039,7 @@ 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 QtProtobufFieldEnum = SimpleFixed32UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::uint32>;
     SimpleFixed32UInt32MapMessage();
     ~SimpleFixed32UInt32MapMessage();
@@ -1515,6 +2058,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed32UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed32UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed32UInt32MapMessage_QtProtobufNested
 
 class SimpleFixed64UInt32MapMessage_QtProtobufData;
 class SimpleFixed64UInt32MapMessage : public QProtobufMessage
@@ -1525,11 +2077,7 @@ 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 QtProtobufFieldEnum = SimpleFixed64UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::uint32>;
     SimpleFixed64UInt32MapMessage();
     ~SimpleFixed64UInt32MapMessage();
@@ -1548,6 +2096,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed64UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed64UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed64UInt32MapMessage_QtProtobufNested
 
 class SimpleSFixed32UInt32MapMessage_QtProtobufData;
 class SimpleSFixed32UInt32MapMessage : public QProtobufMessage
@@ -1558,11 +2115,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed32UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::uint32>;
     SimpleSFixed32UInt32MapMessage();
     ~SimpleSFixed32UInt32MapMessage();
@@ -1581,6 +2134,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed32UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed32UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 9,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed32UInt32MapMessage_QtProtobufNested
 
 class SimpleSFixed64UInt32MapMessage_QtProtobufData;
 class SimpleSFixed64UInt32MapMessage : public QProtobufMessage
@@ -1591,11 +2153,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed64UInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::uint32>;
     SimpleSFixed64UInt32MapMessage();
     ~SimpleSFixed64UInt32MapMessage();
@@ -1614,6 +2172,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed64UInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed64UInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 10,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed64UInt32MapMessage_QtProtobufNested
 
 class SimpleStringUInt32MapMessage_QtProtobufData;
 class SimpleStringUInt32MapMessage : public QProtobufMessage
@@ -1624,11 +2191,7 @@ 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 QtProtobufFieldEnum = SimpleStringUInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QString, QtProtobuf::uint32>;
     SimpleStringUInt32MapMessage();
     ~SimpleStringUInt32MapMessage();
@@ -1647,6 +2210,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringUInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringUInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 13,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringUInt32MapMessage_QtProtobufNested
 
 class SimpleSInt32UInt64MapMessage_QtProtobufData;
 class SimpleSInt32UInt64MapMessage : public QProtobufMessage
@@ -1657,11 +2229,7 @@ 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 QtProtobufFieldEnum = SimpleSInt32UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::uint64>;
     SimpleSInt32UInt64MapMessage();
     ~SimpleSInt32UInt64MapMessage();
@@ -1680,6 +2248,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt32UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt32UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt32UInt64MapMessage_QtProtobufNested
 
 class SimpleSInt64UInt64MapMessage_QtProtobufData;
 class SimpleSInt64UInt64MapMessage : public QProtobufMessage
@@ -1690,11 +2267,7 @@ 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 QtProtobufFieldEnum = SimpleSInt64UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::uint64>;
     SimpleSInt64UInt64MapMessage();
     ~SimpleSInt64UInt64MapMessage();
@@ -1713,6 +2286,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt64UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64UInt64MapMessage_QtProtobufNested
 
 class SimpleInt32UInt64MapMessage_QtProtobufData;
 class SimpleInt32UInt64MapMessage : public QProtobufMessage
@@ -1723,11 +2305,7 @@ 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 QtProtobufFieldEnum = SimpleInt32UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::uint64>;
     SimpleInt32UInt64MapMessage();
     ~SimpleInt32UInt64MapMessage();
@@ -1746,6 +2324,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt32UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt32UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 3,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt32UInt64MapMessage_QtProtobufNested
 
 class SimpleInt64UInt64MapMessage_QtProtobufData;
 class SimpleInt64UInt64MapMessage : public QProtobufMessage
@@ -1756,11 +2343,7 @@ 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 QtProtobufFieldEnum = SimpleInt64UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::uint64>;
     SimpleInt64UInt64MapMessage();
     ~SimpleInt64UInt64MapMessage();
@@ -1779,6 +2362,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt64UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 4,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64UInt64MapMessage_QtProtobufNested
 
 class SimpleUInt32UInt64MapMessage_QtProtobufData;
 class SimpleUInt32UInt64MapMessage : public QProtobufMessage
@@ -1789,11 +2381,7 @@ 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 QtProtobufFieldEnum = SimpleUInt32UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::uint64>;
     SimpleUInt32UInt64MapMessage();
     ~SimpleUInt32UInt64MapMessage();
@@ -1812,6 +2400,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt32UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt32UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt32UInt64MapMessage_QtProtobufNested
 
 class SimpleUInt64UInt64MapMessage_QtProtobufData;
 class SimpleUInt64UInt64MapMessage : public QProtobufMessage
@@ -1822,11 +2419,7 @@ 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 QtProtobufFieldEnum = SimpleUInt64UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::uint64>;
     SimpleUInt64UInt64MapMessage();
     ~SimpleUInt64UInt64MapMessage();
@@ -1845,6 +2438,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt64UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64UInt64MapMessage_QtProtobufNested
 
 class SimpleFixed32UInt64MapMessage_QtProtobufData;
 class SimpleFixed32UInt64MapMessage : public QProtobufMessage
@@ -1855,11 +2457,7 @@ 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 QtProtobufFieldEnum = SimpleFixed32UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::uint64>;
     SimpleFixed32UInt64MapMessage();
     ~SimpleFixed32UInt64MapMessage();
@@ -1878,6 +2476,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed32UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed32UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed32UInt64MapMessage_QtProtobufNested
 
 class SimpleFixed64UInt64MapMessage_QtProtobufData;
 class SimpleFixed64UInt64MapMessage : public QProtobufMessage
@@ -1888,11 +2495,7 @@ 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 QtProtobufFieldEnum = SimpleFixed64UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::uint64>;
     SimpleFixed64UInt64MapMessage();
     ~SimpleFixed64UInt64MapMessage();
@@ -1911,6 +2514,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed64UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed64UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed64UInt64MapMessage_QtProtobufNested
 
 class SimpleSFixed32UInt64MapMessage_QtProtobufData;
 class SimpleSFixed32UInt64MapMessage : public QProtobufMessage
@@ -1921,11 +2533,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed32UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::uint64>;
     SimpleSFixed32UInt64MapMessage();
     ~SimpleSFixed32UInt64MapMessage();
@@ -1944,6 +2552,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed32UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed32UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 9,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed32UInt64MapMessage_QtProtobufNested
 
 class SimpleSFixed64UInt64MapMessage_QtProtobufData;
 class SimpleSFixed64UInt64MapMessage : public QProtobufMessage
@@ -1954,11 +2571,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed64UInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::uint64>;
     SimpleSFixed64UInt64MapMessage();
     ~SimpleSFixed64UInt64MapMessage();
@@ -1977,6 +2590,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed64UInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed64UInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 10,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed64UInt64MapMessage_QtProtobufNested
 
 class SimpleStringUInt64MapMessage_QtProtobufData;
 class SimpleStringUInt64MapMessage : public QProtobufMessage
@@ -1987,11 +2609,7 @@ 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 QtProtobufFieldEnum = SimpleStringUInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QString, QtProtobuf::uint64>;
     SimpleStringUInt64MapMessage();
     ~SimpleStringUInt64MapMessage();
@@ -2010,6 +2628,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringUInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringUInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 13,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringUInt64MapMessage_QtProtobufNested
 
 class SimpleSInt32Int32MapMessage_QtProtobufData;
 class SimpleSInt32Int32MapMessage : public QProtobufMessage
@@ -2020,11 +2647,7 @@ 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 QtProtobufFieldEnum = SimpleSInt32Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::int32>;
     SimpleSInt32Int32MapMessage();
     ~SimpleSInt32Int32MapMessage();
@@ -2043,6 +2666,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt32Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt32Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt32Int32MapMessage_QtProtobufNested
 
 class SimpleSInt64Int32MapMessage_QtProtobufData;
 class SimpleSInt64Int32MapMessage : public QProtobufMessage
@@ -2053,11 +2685,7 @@ 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 QtProtobufFieldEnum = SimpleSInt64Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::int32>;
     SimpleSInt64Int32MapMessage();
     ~SimpleSInt64Int32MapMessage();
@@ -2076,6 +2704,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt64Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64Int32MapMessage_QtProtobufNested
 
 class SimpleInt32Int32MapMessage_QtProtobufData;
 class SimpleInt32Int32MapMessage : public QProtobufMessage
@@ -2086,11 +2723,7 @@ 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 QtProtobufFieldEnum = SimpleInt32Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::int32>;
     SimpleInt32Int32MapMessage();
     ~SimpleInt32Int32MapMessage();
@@ -2109,6 +2742,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt32Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt32Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 3,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt32Int32MapMessage_QtProtobufNested
 
 class SimpleInt64Int32MapMessage_QtProtobufData;
 class SimpleInt64Int32MapMessage : public QProtobufMessage
@@ -2119,11 +2761,7 @@ 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 QtProtobufFieldEnum = SimpleInt64Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::int32>;
     SimpleInt64Int32MapMessage();
     ~SimpleInt64Int32MapMessage();
@@ -2142,6 +2780,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt64Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 4,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64Int32MapMessage_QtProtobufNested
 
 class SimpleUInt32Int32MapMessage_QtProtobufData;
 class SimpleUInt32Int32MapMessage : public QProtobufMessage
@@ -2152,11 +2799,7 @@ 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 QtProtobufFieldEnum = SimpleUInt32Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::int32>;
     SimpleUInt32Int32MapMessage();
     ~SimpleUInt32Int32MapMessage();
@@ -2175,6 +2818,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt32Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt32Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt32Int32MapMessage_QtProtobufNested
 
 class SimpleUInt64Int32MapMessage_QtProtobufData;
 class SimpleUInt64Int32MapMessage : public QProtobufMessage
@@ -2185,11 +2837,7 @@ 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 QtProtobufFieldEnum = SimpleUInt64Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::int32>;
     SimpleUInt64Int32MapMessage();
     ~SimpleUInt64Int32MapMessage();
@@ -2208,6 +2856,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt64Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64Int32MapMessage_QtProtobufNested
 
 class SimpleFixed32Int32MapMessage_QtProtobufData;
 class SimpleFixed32Int32MapMessage : public QProtobufMessage
@@ -2218,11 +2875,7 @@ 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 QtProtobufFieldEnum = SimpleFixed32Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::int32>;
     SimpleFixed32Int32MapMessage();
     ~SimpleFixed32Int32MapMessage();
@@ -2241,6 +2894,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed32Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed32Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed32Int32MapMessage_QtProtobufNested
 
 class SimpleFixed64Int32MapMessage_QtProtobufData;
 class SimpleFixed64Int32MapMessage : public QProtobufMessage
@@ -2251,11 +2913,7 @@ 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 QtProtobufFieldEnum = SimpleFixed64Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::int32>;
     SimpleFixed64Int32MapMessage();
     ~SimpleFixed64Int32MapMessage();
@@ -2274,6 +2932,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed64Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed64Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed64Int32MapMessage_QtProtobufNested
 
 class SimpleSFixed32Int32MapMessage_QtProtobufData;
 class SimpleSFixed32Int32MapMessage : public QProtobufMessage
@@ -2284,11 +2951,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed32Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::int32>;
     SimpleSFixed32Int32MapMessage();
     ~SimpleSFixed32Int32MapMessage();
@@ -2307,6 +2970,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed32Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed32Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 9,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed32Int32MapMessage_QtProtobufNested
 
 class SimpleSFixed64Int32MapMessage_QtProtobufData;
 class SimpleSFixed64Int32MapMessage : public QProtobufMessage
@@ -2317,11 +2989,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed64Int32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::int32>;
     SimpleSFixed64Int32MapMessage();
     ~SimpleSFixed64Int32MapMessage();
@@ -2340,6 +3008,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed64Int32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed64Int32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 10,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed64Int32MapMessage_QtProtobufNested
 
 class SimpleStringInt32MapMessage_QtProtobufData;
 class SimpleStringInt32MapMessage : public QProtobufMessage
@@ -2350,11 +3027,7 @@ 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 QtProtobufFieldEnum = SimpleStringInt32MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QString, QtProtobuf::int32>;
     SimpleStringInt32MapMessage();
     ~SimpleStringInt32MapMessage();
@@ -2373,6 +3046,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringInt32MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringInt32MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 13,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringInt32MapMessage_QtProtobufNested
 
 class SimpleSInt32Int64MapMessage_QtProtobufData;
 class SimpleSInt32Int64MapMessage : public QProtobufMessage
@@ -2383,11 +3065,7 @@ 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 QtProtobufFieldEnum = SimpleSInt32Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint32, QtProtobuf::int64>;
     SimpleSInt32Int64MapMessage();
     ~SimpleSInt32Int64MapMessage();
@@ -2406,6 +3084,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt32Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt32Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt32Int64MapMessage_QtProtobufNested
 
 class SimpleSInt64Int64MapMessage_QtProtobufData;
 class SimpleSInt64Int64MapMessage : public QProtobufMessage
@@ -2416,11 +3103,7 @@ 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 QtProtobufFieldEnum = SimpleSInt64Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint64, QtProtobuf::int64>;
     SimpleSInt64Int64MapMessage();
     ~SimpleSInt64Int64MapMessage();
@@ -2439,6 +3122,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt64Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64Int64MapMessage_QtProtobufNested
 
 class SimpleInt32Int64MapMessage_QtProtobufData;
 class SimpleInt32Int64MapMessage : public QProtobufMessage
@@ -2449,11 +3141,7 @@ 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 QtProtobufFieldEnum = SimpleInt32Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int32, QtProtobuf::int64>;
     SimpleInt32Int64MapMessage();
     ~SimpleInt32Int64MapMessage();
@@ -2472,6 +3160,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt32Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt32Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 3,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt32Int64MapMessage_QtProtobufNested
 
 class SimpleInt64Int64MapMessage_QtProtobufData;
 class SimpleInt64Int64MapMessage : public QProtobufMessage
@@ -2482,11 +3179,7 @@ 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 QtProtobufFieldEnum = SimpleInt64Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int64, QtProtobuf::int64>;
     SimpleInt64Int64MapMessage();
     ~SimpleInt64Int64MapMessage();
@@ -2505,6 +3198,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt64Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 4,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64Int64MapMessage_QtProtobufNested
 
 class SimpleUInt32Int64MapMessage_QtProtobufData;
 class SimpleUInt32Int64MapMessage : public QProtobufMessage
@@ -2515,11 +3217,7 @@ 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 QtProtobufFieldEnum = SimpleUInt32Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint32, QtProtobuf::int64>;
     SimpleUInt32Int64MapMessage();
     ~SimpleUInt32Int64MapMessage();
@@ -2538,6 +3236,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt32Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt32Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt32Int64MapMessage_QtProtobufNested
 
 class SimpleUInt64Int64MapMessage_QtProtobufData;
 class SimpleUInt64Int64MapMessage : public QProtobufMessage
@@ -2548,11 +3255,7 @@ 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 QtProtobufFieldEnum = SimpleUInt64Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint64, QtProtobuf::int64>;
     SimpleUInt64Int64MapMessage();
     ~SimpleUInt64Int64MapMessage();
@@ -2571,6 +3274,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt64Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64Int64MapMessage_QtProtobufNested
 
 class SimpleFixed32Int64MapMessage_QtProtobufData;
 class SimpleFixed32Int64MapMessage : public QProtobufMessage
@@ -2581,11 +3293,7 @@ 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 QtProtobufFieldEnum = SimpleFixed32Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed32, QtProtobuf::int64>;
     SimpleFixed32Int64MapMessage();
     ~SimpleFixed32Int64MapMessage();
@@ -2604,6 +3312,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed32Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed32Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed32Int64MapMessage_QtProtobufNested
 
 class SimpleFixed64Int64MapMessage_QtProtobufData;
 class SimpleFixed64Int64MapMessage : public QProtobufMessage
@@ -2614,11 +3331,7 @@ 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 QtProtobufFieldEnum = SimpleFixed64Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed64, QtProtobuf::int64>;
     SimpleFixed64Int64MapMessage();
     ~SimpleFixed64Int64MapMessage();
@@ -2637,6 +3350,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed64Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed64Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed64Int64MapMessage_QtProtobufNested
 
 class SimpleSFixed32Int64MapMessage_QtProtobufData;
 class SimpleSFixed32Int64MapMessage : public QProtobufMessage
@@ -2647,11 +3369,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed32Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, QtProtobuf::int64>;
     SimpleSFixed32Int64MapMessage();
     ~SimpleSFixed32Int64MapMessage();
@@ -2670,6 +3388,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed32Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed32Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 9,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed32Int64MapMessage_QtProtobufNested
 
 class SimpleSFixed64Int64MapMessage_QtProtobufData;
 class SimpleSFixed64Int64MapMessage : public QProtobufMessage
@@ -2680,11 +3407,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed64Int64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, QtProtobuf::int64>;
     SimpleSFixed64Int64MapMessage();
     ~SimpleSFixed64Int64MapMessage();
@@ -2703,6 +3426,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed64Int64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed64Int64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 10,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed64Int64MapMessage_QtProtobufNested
 
 class SimpleStringInt64MapMessage_QtProtobufData;
 class SimpleStringInt64MapMessage : public QProtobufMessage
@@ -2713,11 +3445,7 @@ 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 QtProtobufFieldEnum = SimpleStringInt64MapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QString, QtProtobuf::int64>;
     SimpleStringInt64MapMessage();
     ~SimpleStringInt64MapMessage();
@@ -2736,6 +3464,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringInt64MapMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringInt64MapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 13,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringInt64MapMessage_QtProtobufNested
 
 class SimpleSInt32ComplexMessageMapMessage_QtProtobufData;
 class SimpleSInt32ComplexMessageMapMessage : public QProtobufMessage
@@ -2746,11 +3483,7 @@ 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 QtProtobufFieldEnum = SimpleSInt32ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint32, ComplexMessage>;
     SimpleSInt32ComplexMessageMapMessage();
     ~SimpleSInt32ComplexMessageMapMessage();
@@ -2769,6 +3502,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt32ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt32ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt32ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleSInt64ComplexMessageMapMessage_QtProtobufData;
 class SimpleSInt64ComplexMessageMapMessage : public QProtobufMessage
@@ -2779,11 +3521,7 @@ 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 QtProtobufFieldEnum = SimpleSInt64ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sint64, ComplexMessage>;
     SimpleSInt64ComplexMessageMapMessage();
     ~SimpleSInt64ComplexMessageMapMessage();
@@ -2802,6 +3540,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSInt64ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleInt32ComplexMessageMapMessage_QtProtobufData;
 class SimpleInt32ComplexMessageMapMessage : public QProtobufMessage
@@ -2812,11 +3559,7 @@ 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 QtProtobufFieldEnum = SimpleInt32ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int32, ComplexMessage>;
     SimpleInt32ComplexMessageMapMessage();
     ~SimpleInt32ComplexMessageMapMessage();
@@ -2835,6 +3578,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt32ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt32ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 3,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt32ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleInt64ComplexMessageMapMessage_QtProtobufData;
 class SimpleInt64ComplexMessageMapMessage : public QProtobufMessage
@@ -2845,11 +3597,7 @@ 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 QtProtobufFieldEnum = SimpleInt64ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::int64, ComplexMessage>;
     SimpleInt64ComplexMessageMapMessage();
     ~SimpleInt64ComplexMessageMapMessage();
@@ -2868,6 +3616,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleInt64ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 4,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleUInt32ComplexMessageMapMessage_QtProtobufData;
 class SimpleUInt32ComplexMessageMapMessage : public QProtobufMessage
@@ -2878,11 +3635,7 @@ 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 QtProtobufFieldEnum = SimpleUInt32ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint32, ComplexMessage>;
     SimpleUInt32ComplexMessageMapMessage();
     ~SimpleUInt32ComplexMessageMapMessage();
@@ -2901,6 +3654,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt32ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt32ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt32ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleUInt64ComplexMessageMapMessage_QtProtobufData;
 class SimpleUInt64ComplexMessageMapMessage : public QProtobufMessage
@@ -2911,11 +3673,7 @@ 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 QtProtobufFieldEnum = SimpleUInt64ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::uint64, ComplexMessage>;
     SimpleUInt64ComplexMessageMapMessage();
     ~SimpleUInt64ComplexMessageMapMessage();
@@ -2934,6 +3692,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleUInt64ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleFixed32ComplexMessageMapMessage_QtProtobufData;
 class SimpleFixed32ComplexMessageMapMessage : public QProtobufMessage
@@ -2944,11 +3711,7 @@ 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 QtProtobufFieldEnum = SimpleFixed32ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed32, ComplexMessage>;
     SimpleFixed32ComplexMessageMapMessage();
     ~SimpleFixed32ComplexMessageMapMessage();
@@ -2967,6 +3730,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed32ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed32ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed32ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleFixed64ComplexMessageMapMessage_QtProtobufData;
 class SimpleFixed64ComplexMessageMapMessage : public QProtobufMessage
@@ -2977,11 +3749,7 @@ 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 QtProtobufFieldEnum = SimpleFixed64ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::fixed64, ComplexMessage>;
     SimpleFixed64ComplexMessageMapMessage();
     ~SimpleFixed64ComplexMessageMapMessage();
@@ -3000,6 +3768,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixed64ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleFixed64ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixed64ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleSFixed32ComplexMessageMapMessage_QtProtobufData;
 class SimpleSFixed32ComplexMessageMapMessage : public QProtobufMessage
@@ -3010,11 +3787,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed32ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed32, ComplexMessage>;
     SimpleSFixed32ComplexMessageMapMessage();
     ~SimpleSFixed32ComplexMessageMapMessage();
@@ -3033,6 +3806,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed32ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed32ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 9,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed32ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleSFixed64ComplexMessageMapMessage_QtProtobufData;
 class SimpleSFixed64ComplexMessageMapMessage : public QProtobufMessage
@@ -3043,11 +3825,7 @@ 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 QtProtobufFieldEnum = SimpleSFixed64ComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QtProtobuf::sfixed64, ComplexMessage>;
     SimpleSFixed64ComplexMessageMapMessage();
     ~SimpleSFixed64ComplexMessageMapMessage();
@@ -3066,6 +3844,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixed64ComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleSFixed64ComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 10,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixed64ComplexMessageMapMessage_QtProtobufNested
 
 class SimpleStringComplexMessageMapMessage_QtProtobufData;
 class SimpleStringComplexMessageMapMessage : public QProtobufMessage
@@ -3076,11 +3863,7 @@ 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 QtProtobufFieldEnum = SimpleStringComplexMessageMapMessage_QtProtobufNested::QtProtobufFieldEnum;
     using MapFieldEntry = QHash<QString, ComplexMessage>;
     SimpleStringComplexMessageMapMessage();
     ~SimpleStringComplexMessageMapMessage();
@@ -3099,6 +3882,15 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringComplexMessageMapMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringComplexMessageMapMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    MapFieldProtoFieldNumber = 13,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringComplexMessageMapMessage_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleSInt32StringMapMessage)
diff --git a/tests/auto/protobufgen/data/expected_result/no-options/oneofmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/no-options/oneofmessages.qpb.h
index 7616f57..bcee72b 100644
--- a/tests/auto/protobufgen/data/expected_result/no-options/oneofmessages.qpb.h
+++ b/tests/auto/protobufgen/data/expected_result/no-options/oneofmessages.qpb.h
@@ -22,8 +22,19 @@
 namespace qtprotobufnamespace::tests {
 class OneofSimpleMessage;
 using OneofSimpleMessageRepeated = QList<OneofSimpleMessage>;
+namespace OneofSimpleMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+enum class TestOneofFields;
+} // namespace OneofSimpleMessage_QtProtobufNested
+
 class OneofComplexMessage;
 using OneofComplexMessageRepeated = QList<OneofComplexMessage>;
+namespace OneofComplexMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+enum class TestOneofFields;
+enum class SecondOneofFields;
+} // namespace OneofComplexMessage_QtProtobufNested
+
 
 class OneofSimpleMessage_QtProtobufData;
 class OneofSimpleMessage : public QProtobufMessage
@@ -37,19 +48,8 @@ class OneofSimpleMessage : public QProtobufMessage
     Q_PROPERTY(bool hasTestOneofFieldSecondInt READ hasTestOneofFieldSecondInt)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestOneofFieldIntProtoFieldNumber = 1,
-        TestOneofFieldSecondIntProtoFieldNumber = 2,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
-    enum class TestOneofFields {
-        UninitializedField = QtProtobuf::InvalidFieldNumber,
-        TestOneofFieldInt = 1,
-        TestOneofFieldSecondInt = 2,
-    };
-    Q_ENUM(TestOneofFields)
-
+    using QtProtobufFieldEnum = OneofSimpleMessage_QtProtobufNested::QtProtobufFieldEnum;
+    using TestOneofFields = OneofSimpleMessage_QtProtobufNested::TestOneofFields;
     OneofSimpleMessage();
     ~OneofSimpleMessage();
     OneofSimpleMessage(const OneofSimpleMessage &other);
@@ -77,6 +77,23 @@ private:
     void setTestOneofFieldSecondInt_p(QtProtobuf::int32 testOneofFieldSecondInt);
     QExplicitlySharedDataPointer<OneofSimpleMessage_QtProtobufData> dptr;
 };
+namespace OneofSimpleMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestOneofFieldIntProtoFieldNumber = 1,
+    TestOneofFieldSecondIntProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+enum class TestOneofFields {
+    UninitializedField = QtProtobuf::InvalidFieldNumber,
+    TestOneofFieldInt = 1,
+    TestOneofFieldSecondInt = 2,
+};
+Q_ENUM_NS(TestOneofFields)
+
+} // namespace OneofSimpleMessage_QtProtobufNested
 
 class OneofComplexMessage_QtProtobufData;
 class OneofComplexMessage : public QProtobufMessage
@@ -101,35 +118,9 @@ class OneofComplexMessage : public QProtobufMessage
     Q_PROPERTY(bool hasTestSnakeCaseField READ hasTestSnakeCaseField)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-        TestOneofFieldIntProtoFieldNumber = 42,
-        TestOneofComplexFieldProtoFieldNumber = 3,
-        TestOneofSecondComplexFieldProtoFieldNumber = 4,
-        SecondFieldIntProtoFieldNumber = 43,
-        SecondComplexFieldProtoFieldNumber = 5,
-        SecondSecondComplexFieldProtoFieldNumber = 6,
-        TestSnakeCaseFieldProtoFieldNumber = 7,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
-    enum class TestOneofFields {
-        UninitializedField = QtProtobuf::InvalidFieldNumber,
-        TestOneofFieldInt = 42,
-        TestOneofComplexField = 3,
-        TestOneofSecondComplexField = 4,
-    };
-    Q_ENUM(TestOneofFields)
-
-    enum class SecondOneofFields {
-        UninitializedField = QtProtobuf::InvalidFieldNumber,
-        SecondFieldInt = 43,
-        SecondComplexField = 5,
-        SecondSecondComplexField = 6,
-        TestSnakeCaseField = 7,
-    };
-    Q_ENUM(SecondOneofFields)
-
+    using QtProtobufFieldEnum = OneofComplexMessage_QtProtobufNested::QtProtobufFieldEnum;
+    using TestOneofFields = OneofComplexMessage_QtProtobufNested::TestOneofFields;
+    using SecondOneofFields = OneofComplexMessage_QtProtobufNested::SecondOneofFields;
     OneofComplexMessage();
     ~OneofComplexMessage();
     OneofComplexMessage(const OneofComplexMessage &other);
@@ -192,6 +183,39 @@ private:
     void setTestSnakeCaseField_p(QtProtobuf::int32 testSnakeCaseField);
     QExplicitlySharedDataPointer<OneofComplexMessage_QtProtobufData> dptr;
 };
+namespace OneofComplexMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+    TestOneofFieldIntProtoFieldNumber = 42,
+    TestOneofComplexFieldProtoFieldNumber = 3,
+    TestOneofSecondComplexFieldProtoFieldNumber = 4,
+    SecondFieldIntProtoFieldNumber = 43,
+    SecondComplexFieldProtoFieldNumber = 5,
+    SecondSecondComplexFieldProtoFieldNumber = 6,
+    TestSnakeCaseFieldProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+enum class TestOneofFields {
+    UninitializedField = QtProtobuf::InvalidFieldNumber,
+    TestOneofFieldInt = 42,
+    TestOneofComplexField = 3,
+    TestOneofSecondComplexField = 4,
+};
+Q_ENUM_NS(TestOneofFields)
+
+enum class SecondOneofFields {
+    UninitializedField = QtProtobuf::InvalidFieldNumber,
+    SecondFieldInt = 43,
+    SecondComplexField = 5,
+    SecondSecondComplexField = 6,
+    TestSnakeCaseField = 7,
+};
+Q_ENUM_NS(SecondOneofFields)
+
+} // namespace OneofComplexMessage_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::OneofSimpleMessage)
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 3a1c60b..8d01a7a 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
@@ -21,36 +21,100 @@
 namespace qtprotobufnamespace::tests {
 class RepeatedStringMessage;
 using RepeatedStringMessageRepeated = QList<RepeatedStringMessage>;
+namespace RepeatedStringMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedStringMessage_QtProtobufNested
+
 class RepeatedDoubleMessage;
 using RepeatedDoubleMessageRepeated = QList<RepeatedDoubleMessage>;
+namespace RepeatedDoubleMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedDoubleMessage_QtProtobufNested
+
 class RepeatedBytesMessage;
 using RepeatedBytesMessageRepeated = QList<RepeatedBytesMessage>;
+namespace RepeatedBytesMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedBytesMessage_QtProtobufNested
+
 class RepeatedFloatMessage;
 using RepeatedFloatMessageRepeated = QList<RepeatedFloatMessage>;
+namespace RepeatedFloatMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedFloatMessage_QtProtobufNested
+
 class RepeatedComplexMessage;
 using RepeatedComplexMessageRepeated = QList<RepeatedComplexMessage>;
+namespace RepeatedComplexMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedComplexMessage_QtProtobufNested
+
 class RepeatedSIntMessage;
 using RepeatedSIntMessageRepeated = QList<RepeatedSIntMessage>;
+namespace RepeatedSIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedSIntMessage_QtProtobufNested
+
 class RepeatedIntMessage;
 using RepeatedIntMessageRepeated = QList<RepeatedIntMessage>;
+namespace RepeatedIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedIntMessage_QtProtobufNested
+
 class RepeatedUIntMessage;
 using RepeatedUIntMessageRepeated = QList<RepeatedUIntMessage>;
+namespace RepeatedUIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedUIntMessage_QtProtobufNested
+
 class RepeatedSInt64Message;
 using RepeatedSInt64MessageRepeated = QList<RepeatedSInt64Message>;
+namespace RepeatedSInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedSInt64Message_QtProtobufNested
+
 class RepeatedInt64Message;
 using RepeatedInt64MessageRepeated = QList<RepeatedInt64Message>;
+namespace RepeatedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedInt64Message_QtProtobufNested
+
 class RepeatedUInt64Message;
 using RepeatedUInt64MessageRepeated = QList<RepeatedUInt64Message>;
+namespace RepeatedUInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedUInt64Message_QtProtobufNested
+
 class RepeatedFixedIntMessage;
 using RepeatedFixedIntMessageRepeated = QList<RepeatedFixedIntMessage>;
+namespace RepeatedFixedIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedFixedIntMessage_QtProtobufNested
+
 class RepeatedSFixedIntMessage;
 using RepeatedSFixedIntMessageRepeated = QList<RepeatedSFixedIntMessage>;
+namespace RepeatedSFixedIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedSFixedIntMessage_QtProtobufNested
+
 class RepeatedFixedInt64Message;
 using RepeatedFixedInt64MessageRepeated = QList<RepeatedFixedInt64Message>;
+namespace RepeatedFixedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedFixedInt64Message_QtProtobufNested
+
 class RepeatedSFixedInt64Message;
 using RepeatedSFixedInt64MessageRepeated = QList<RepeatedSFixedInt64Message>;
+namespace RepeatedSFixedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedSFixedInt64Message_QtProtobufNested
+
 class RepeatedBoolMessage;
 using RepeatedBoolMessageRepeated = QList<RepeatedBoolMessage>;
+namespace RepeatedBoolMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedBoolMessage_QtProtobufNested
+
 
 class RepeatedStringMessage_QtProtobufData;
 class RepeatedStringMessage : public QProtobufMessage
@@ -61,11 +125,7 @@ class RepeatedStringMessage : public QProtobufMessage
     Q_PROPERTY(QStringList testRepeatedString READ testRepeatedString WRITE setTestRepeatedString SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedStringProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedStringMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedStringMessage();
     ~RepeatedStringMessage();
     RepeatedStringMessage(const RepeatedStringMessage &other);
@@ -83,6 +143,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedStringMessage_QtProtobufData> dptr;
 };
+namespace RepeatedStringMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedStringProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedStringMessage_QtProtobufNested
 
 class RepeatedDoubleMessage_QtProtobufData;
 class RepeatedDoubleMessage : public QProtobufMessage
@@ -93,11 +162,7 @@ class RepeatedDoubleMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::doubleList testRepeatedDouble READ testRepeatedDouble WRITE setTestRepeatedDouble SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedDoubleProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedDoubleMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedDoubleMessage();
     ~RepeatedDoubleMessage();
     RepeatedDoubleMessage(const RepeatedDoubleMessage &other);
@@ -115,6 +180,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedDoubleMessage_QtProtobufData> dptr;
 };
+namespace RepeatedDoubleMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedDoubleProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedDoubleMessage_QtProtobufNested
 
 class RepeatedBytesMessage_QtProtobufData;
 class RepeatedBytesMessage : public QProtobufMessage
@@ -125,11 +199,7 @@ class RepeatedBytesMessage : public QProtobufMessage
     Q_PROPERTY(QByteArrayList testRepeatedBytes READ testRepeatedBytes WRITE setTestRepeatedBytes SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedBytesProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedBytesMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedBytesMessage();
     ~RepeatedBytesMessage();
     RepeatedBytesMessage(const RepeatedBytesMessage &other);
@@ -147,6 +217,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedBytesMessage_QtProtobufData> dptr;
 };
+namespace RepeatedBytesMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedBytesProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedBytesMessage_QtProtobufNested
 
 class RepeatedFloatMessage_QtProtobufData;
 class RepeatedFloatMessage : public QProtobufMessage
@@ -157,11 +236,7 @@ class RepeatedFloatMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::floatList testRepeatedFloat READ testRepeatedFloat WRITE setTestRepeatedFloat SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedFloatProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedFloatMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedFloatMessage();
     ~RepeatedFloatMessage();
     RepeatedFloatMessage(const RepeatedFloatMessage &other);
@@ -179,6 +254,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedFloatMessage_QtProtobufData> dptr;
 };
+namespace RepeatedFloatMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedFloatProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedFloatMessage_QtProtobufNested
 
 class RepeatedComplexMessage_QtProtobufData;
 class RepeatedComplexMessage : public QProtobufMessage
@@ -189,11 +273,7 @@ class RepeatedComplexMessage : public QProtobufMessage
     Q_PROPERTY(qtprotobufnamespace::tests::ComplexMessageRepeated testRepeatedComplexData READ testRepeatedComplex WRITE setTestRepeatedComplex SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedComplexProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedComplexMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedComplexMessage();
     ~RepeatedComplexMessage();
     RepeatedComplexMessage(const RepeatedComplexMessage &other);
@@ -211,6 +291,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedComplexMessage_QtProtobufData> dptr;
 };
+namespace RepeatedComplexMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedComplexProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedComplexMessage_QtProtobufNested
 
 class RepeatedSIntMessage_QtProtobufData;
 class RepeatedSIntMessage : public QProtobufMessage
@@ -221,11 +310,7 @@ class RepeatedSIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedSIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedSIntMessage();
     ~RepeatedSIntMessage();
     RepeatedSIntMessage(const RepeatedSIntMessage &other);
@@ -243,6 +328,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedSIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedSIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedSIntMessage_QtProtobufNested
 
 class RepeatedIntMessage_QtProtobufData;
 class RepeatedIntMessage : public QProtobufMessage
@@ -253,11 +347,7 @@ class RepeatedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedIntMessage();
     ~RepeatedIntMessage();
     RepeatedIntMessage(const RepeatedIntMessage &other);
@@ -275,6 +365,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedIntMessage_QtProtobufNested
 
 class RepeatedUIntMessage_QtProtobufData;
 class RepeatedUIntMessage : public QProtobufMessage
@@ -285,11 +384,7 @@ class RepeatedUIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedUIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedUIntMessage();
     ~RepeatedUIntMessage();
     RepeatedUIntMessage(const RepeatedUIntMessage &other);
@@ -307,6 +402,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedUIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedUIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedUIntMessage_QtProtobufNested
 
 class RepeatedSInt64Message_QtProtobufData;
 class RepeatedSInt64Message : public QProtobufMessage
@@ -317,11 +421,7 @@ class RepeatedSInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedSInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedSInt64Message();
     ~RepeatedSInt64Message();
     RepeatedSInt64Message(const RepeatedSInt64Message &other);
@@ -339,6 +439,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedSInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedSInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedSInt64Message_QtProtobufNested
 
 class RepeatedInt64Message_QtProtobufData;
 class RepeatedInt64Message : public QProtobufMessage
@@ -349,11 +458,7 @@ class RepeatedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedInt64Message();
     ~RepeatedInt64Message();
     RepeatedInt64Message(const RepeatedInt64Message &other);
@@ -371,6 +476,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedInt64Message_QtProtobufNested
 
 class RepeatedUInt64Message_QtProtobufData;
 class RepeatedUInt64Message : public QProtobufMessage
@@ -381,11 +495,7 @@ class RepeatedUInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedUInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedUInt64Message();
     ~RepeatedUInt64Message();
     RepeatedUInt64Message(const RepeatedUInt64Message &other);
@@ -403,6 +513,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedUInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedUInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedUInt64Message_QtProtobufNested
 
 class RepeatedFixedIntMessage_QtProtobufData;
 class RepeatedFixedIntMessage : public QProtobufMessage
@@ -413,11 +532,7 @@ class RepeatedFixedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedFixedIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedFixedIntMessage();
     ~RepeatedFixedIntMessage();
     RepeatedFixedIntMessage(const RepeatedFixedIntMessage &other);
@@ -435,6 +550,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedFixedIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedFixedIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedFixedIntMessage_QtProtobufNested
 
 class RepeatedSFixedIntMessage_QtProtobufData;
 class RepeatedSFixedIntMessage : public QProtobufMessage
@@ -445,11 +569,7 @@ class RepeatedSFixedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedSFixedIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedSFixedIntMessage();
     ~RepeatedSFixedIntMessage();
     RepeatedSFixedIntMessage(const RepeatedSFixedIntMessage &other);
@@ -467,6 +587,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedSFixedIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedSFixedIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedSFixedIntMessage_QtProtobufNested
 
 class RepeatedFixedInt64Message_QtProtobufData;
 class RepeatedFixedInt64Message : public QProtobufMessage
@@ -477,11 +606,7 @@ class RepeatedFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedFixedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedFixedInt64Message();
     ~RepeatedFixedInt64Message();
     RepeatedFixedInt64Message(const RepeatedFixedInt64Message &other);
@@ -499,6 +624,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedFixedInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedFixedInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedFixedInt64Message_QtProtobufNested
 
 class RepeatedSFixedInt64Message_QtProtobufData;
 class RepeatedSFixedInt64Message : public QProtobufMessage
@@ -509,11 +643,7 @@ class RepeatedSFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedSFixedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedSFixedInt64Message();
     ~RepeatedSFixedInt64Message();
     RepeatedSFixedInt64Message(const RepeatedSFixedInt64Message &other);
@@ -531,6 +661,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedSFixedInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedSFixedInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedSFixedInt64Message_QtProtobufNested
 
 class RepeatedBoolMessage_QtProtobufData;
 class RepeatedBoolMessage : public QProtobufMessage
@@ -541,11 +680,7 @@ class RepeatedBoolMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::boolList testRepeatedBool READ testRepeatedBool WRITE setTestRepeatedBool SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedBoolProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedBoolMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedBoolMessage();
     ~RepeatedBoolMessage();
     RepeatedBoolMessage(const RepeatedBoolMessage &other);
@@ -563,6 +698,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedBoolMessage_QtProtobufData> dptr;
 };
+namespace RepeatedBoolMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedBoolProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedBoolMessage_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedStringMessage)
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 d297877..8c8d4fc 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
@@ -20,32 +20,88 @@
 namespace qtprotobufnamespace::tests {
 class RepeatedNonPackedIntMessage;
 using RepeatedNonPackedIntMessageRepeated = QList<RepeatedNonPackedIntMessage>;
+namespace RepeatedNonPackedIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedIntMessage_QtProtobufNested
+
 class RepeatedNonPackedSIntMessage;
 using RepeatedNonPackedSIntMessageRepeated = QList<RepeatedNonPackedSIntMessage>;
+namespace RepeatedNonPackedSIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedSIntMessage_QtProtobufNested
+
 class RepeatedNonPackedUIntMessage;
 using RepeatedNonPackedUIntMessageRepeated = QList<RepeatedNonPackedUIntMessage>;
+namespace RepeatedNonPackedUIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedUIntMessage_QtProtobufNested
+
 class RepeatedNonPackedInt64Message;
 using RepeatedNonPackedInt64MessageRepeated = QList<RepeatedNonPackedInt64Message>;
+namespace RepeatedNonPackedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedInt64Message_QtProtobufNested
+
 class RepeatedNonPackedSInt64Message;
 using RepeatedNonPackedSInt64MessageRepeated = QList<RepeatedNonPackedSInt64Message>;
+namespace RepeatedNonPackedSInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedSInt64Message_QtProtobufNested
+
 class RepeatedNonPackedUInt64Message;
 using RepeatedNonPackedUInt64MessageRepeated = QList<RepeatedNonPackedUInt64Message>;
+namespace RepeatedNonPackedUInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedUInt64Message_QtProtobufNested
+
 class RepeatedNonPackedFixedIntMessage;
 using RepeatedNonPackedFixedIntMessageRepeated = QList<RepeatedNonPackedFixedIntMessage>;
+namespace RepeatedNonPackedFixedIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedFixedIntMessage_QtProtobufNested
+
 class RepeatedNonPackedSFixedIntMessage;
 using RepeatedNonPackedSFixedIntMessageRepeated = QList<RepeatedNonPackedSFixedIntMessage>;
+namespace RepeatedNonPackedSFixedIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedSFixedIntMessage_QtProtobufNested
+
 class RepeatedNonPackedFixedInt64Message;
 using RepeatedNonPackedFixedInt64MessageRepeated = QList<RepeatedNonPackedFixedInt64Message>;
+namespace RepeatedNonPackedFixedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedFixedInt64Message_QtProtobufNested
+
 class RepeatedNonPackedSFixedInt64Message;
 using RepeatedNonPackedSFixedInt64MessageRepeated = QList<RepeatedNonPackedSFixedInt64Message>;
+namespace RepeatedNonPackedSFixedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedSFixedInt64Message_QtProtobufNested
+
 class RepeatedNonPackedBoolMessage;
 using RepeatedNonPackedBoolMessageRepeated = QList<RepeatedNonPackedBoolMessage>;
+namespace RepeatedNonPackedBoolMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedBoolMessage_QtProtobufNested
+
 class RepeatedNonPackedDoubleMessage;
 using RepeatedNonPackedDoubleMessageRepeated = QList<RepeatedNonPackedDoubleMessage>;
+namespace RepeatedNonPackedDoubleMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedDoubleMessage_QtProtobufNested
+
 class RepeatedNonPackedFloatMessage;
 using RepeatedNonPackedFloatMessageRepeated = QList<RepeatedNonPackedFloatMessage>;
+namespace RepeatedNonPackedFloatMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedFloatMessage_QtProtobufNested
+
 class NonPackedIntMessageWithExtraMember;
 using NonPackedIntMessageWithExtraMemberRepeated = QList<NonPackedIntMessageWithExtraMember>;
+namespace NonPackedIntMessageWithExtraMember_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace NonPackedIntMessageWithExtraMember_QtProtobufNested
+
 
 class RepeatedNonPackedIntMessage_QtProtobufData;
 class RepeatedNonPackedIntMessage : public QProtobufMessage
@@ -56,11 +112,7 @@ class RepeatedNonPackedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedIntMessage();
     ~RepeatedNonPackedIntMessage();
     RepeatedNonPackedIntMessage(const RepeatedNonPackedIntMessage &other);
@@ -78,6 +130,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedIntMessage_QtProtobufNested
 
 class RepeatedNonPackedSIntMessage_QtProtobufData;
 class RepeatedNonPackedSIntMessage : public QProtobufMessage
@@ -88,11 +149,7 @@ class RepeatedNonPackedSIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedSIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedSIntMessage();
     ~RepeatedNonPackedSIntMessage();
     RepeatedNonPackedSIntMessage(const RepeatedNonPackedSIntMessage &other);
@@ -110,6 +167,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedSIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedSIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedSIntMessage_QtProtobufNested
 
 class RepeatedNonPackedUIntMessage_QtProtobufData;
 class RepeatedNonPackedUIntMessage : public QProtobufMessage
@@ -120,11 +186,7 @@ class RepeatedNonPackedUIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedUIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedUIntMessage();
     ~RepeatedNonPackedUIntMessage();
     RepeatedNonPackedUIntMessage(const RepeatedNonPackedUIntMessage &other);
@@ -142,6 +204,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedUIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedUIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedUIntMessage_QtProtobufNested
 
 class RepeatedNonPackedInt64Message_QtProtobufData;
 class RepeatedNonPackedInt64Message : public QProtobufMessage
@@ -152,11 +223,7 @@ class RepeatedNonPackedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedInt64Message();
     ~RepeatedNonPackedInt64Message();
     RepeatedNonPackedInt64Message(const RepeatedNonPackedInt64Message &other);
@@ -174,6 +241,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedInt64Message_QtProtobufNested
 
 class RepeatedNonPackedSInt64Message_QtProtobufData;
 class RepeatedNonPackedSInt64Message : public QProtobufMessage
@@ -184,11 +260,7 @@ class RepeatedNonPackedSInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedSInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedSInt64Message();
     ~RepeatedNonPackedSInt64Message();
     RepeatedNonPackedSInt64Message(const RepeatedNonPackedSInt64Message &other);
@@ -206,6 +278,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedSInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedSInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedSInt64Message_QtProtobufNested
 
 class RepeatedNonPackedUInt64Message_QtProtobufData;
 class RepeatedNonPackedUInt64Message : public QProtobufMessage
@@ -216,11 +297,7 @@ class RepeatedNonPackedUInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedUInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedUInt64Message();
     ~RepeatedNonPackedUInt64Message();
     RepeatedNonPackedUInt64Message(const RepeatedNonPackedUInt64Message &other);
@@ -238,6 +315,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedUInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedUInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedUInt64Message_QtProtobufNested
 
 class RepeatedNonPackedFixedIntMessage_QtProtobufData;
 class RepeatedNonPackedFixedIntMessage : public QProtobufMessage
@@ -248,11 +334,7 @@ class RepeatedNonPackedFixedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedFixedIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedFixedIntMessage();
     ~RepeatedNonPackedFixedIntMessage();
     RepeatedNonPackedFixedIntMessage(const RepeatedNonPackedFixedIntMessage &other);
@@ -270,6 +352,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedFixedIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedFixedIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedFixedIntMessage_QtProtobufNested
 
 class RepeatedNonPackedSFixedIntMessage_QtProtobufData;
 class RepeatedNonPackedSFixedIntMessage : public QProtobufMessage
@@ -280,11 +371,7 @@ class RepeatedNonPackedSFixedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedSFixedIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedSFixedIntMessage();
     ~RepeatedNonPackedSFixedIntMessage();
     RepeatedNonPackedSFixedIntMessage(const RepeatedNonPackedSFixedIntMessage &other);
@@ -302,6 +389,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedSFixedIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedSFixedIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedSFixedIntMessage_QtProtobufNested
 
 class RepeatedNonPackedFixedInt64Message_QtProtobufData;
 class RepeatedNonPackedFixedInt64Message : public QProtobufMessage
@@ -312,11 +408,7 @@ class RepeatedNonPackedFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedFixedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedFixedInt64Message();
     ~RepeatedNonPackedFixedInt64Message();
     RepeatedNonPackedFixedInt64Message(const RepeatedNonPackedFixedInt64Message &other);
@@ -334,6 +426,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedFixedInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedFixedInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedFixedInt64Message_QtProtobufNested
 
 class RepeatedNonPackedSFixedInt64Message_QtProtobufData;
 class RepeatedNonPackedSFixedInt64Message : public QProtobufMessage
@@ -344,11 +445,7 @@ class RepeatedNonPackedSFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedSFixedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedSFixedInt64Message();
     ~RepeatedNonPackedSFixedInt64Message();
     RepeatedNonPackedSFixedInt64Message(const RepeatedNonPackedSFixedInt64Message &other);
@@ -366,6 +463,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedSFixedInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedSFixedInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedSFixedInt64Message_QtProtobufNested
 
 class RepeatedNonPackedBoolMessage_QtProtobufData;
 class RepeatedNonPackedBoolMessage : public QProtobufMessage
@@ -376,11 +482,7 @@ class RepeatedNonPackedBoolMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::boolList testRepeatedBool READ testRepeatedBool WRITE setTestRepeatedBool SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedBoolProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedBoolMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedBoolMessage();
     ~RepeatedNonPackedBoolMessage();
     RepeatedNonPackedBoolMessage(const RepeatedNonPackedBoolMessage &other);
@@ -398,6 +500,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedBoolMessage_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedBoolMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedBoolProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedBoolMessage_QtProtobufNested
 
 class RepeatedNonPackedDoubleMessage_QtProtobufData;
 class RepeatedNonPackedDoubleMessage : public QProtobufMessage
@@ -408,11 +519,7 @@ class RepeatedNonPackedDoubleMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::doubleList testRepeatedDouble READ testRepeatedDouble WRITE setTestRepeatedDouble SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedDoubleProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedDoubleMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedDoubleMessage();
     ~RepeatedNonPackedDoubleMessage();
     RepeatedNonPackedDoubleMessage(const RepeatedNonPackedDoubleMessage &other);
@@ -430,6 +537,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedDoubleMessage_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedDoubleMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedDoubleProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedDoubleMessage_QtProtobufNested
 
 class RepeatedNonPackedFloatMessage_QtProtobufData;
 class RepeatedNonPackedFloatMessage : public QProtobufMessage
@@ -440,11 +556,7 @@ class RepeatedNonPackedFloatMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::floatList testRepeatedFloat READ testRepeatedFloat WRITE setTestRepeatedFloat SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedFloatProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedFloatMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedFloatMessage();
     ~RepeatedNonPackedFloatMessage();
     RepeatedNonPackedFloatMessage(const RepeatedNonPackedFloatMessage &other);
@@ -462,6 +574,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedFloatMessage_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedFloatMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedFloatProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedFloatMessage_QtProtobufNested
 
 class NonPackedIntMessageWithExtraMember_QtProtobufData;
 class NonPackedIntMessageWithExtraMember : public QProtobufMessage
@@ -473,12 +594,7 @@ class NonPackedIntMessageWithExtraMember : public QProtobufMessage
     Q_PROPERTY(QString extra READ extra WRITE setExtra SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-        ExtraProtoFieldNumber = 2,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = NonPackedIntMessageWithExtraMember_QtProtobufNested::QtProtobufFieldEnum;
     NonPackedIntMessageWithExtraMember();
     ~NonPackedIntMessageWithExtraMember();
     NonPackedIntMessageWithExtraMember(const NonPackedIntMessageWithExtraMember &other);
@@ -499,6 +615,16 @@ public:
 private:
     QExplicitlySharedDataPointer<NonPackedIntMessageWithExtraMember_QtProtobufData> dptr;
 };
+namespace NonPackedIntMessageWithExtraMember_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+    ExtraProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace NonPackedIntMessageWithExtraMember_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedIntMessage)
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 d297877..8c8d4fc 100644
--- a/tests/auto/protobufgen/data/expected_result/packed/repeatednonpackedmessages.qpb.h
+++ b/tests/auto/protobufgen/data/expected_result/packed/repeatednonpackedmessages.qpb.h
@@ -20,32 +20,88 @@
 namespace qtprotobufnamespace::tests {
 class RepeatedNonPackedIntMessage;
 using RepeatedNonPackedIntMessageRepeated = QList<RepeatedNonPackedIntMessage>;
+namespace RepeatedNonPackedIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedIntMessage_QtProtobufNested
+
 class RepeatedNonPackedSIntMessage;
 using RepeatedNonPackedSIntMessageRepeated = QList<RepeatedNonPackedSIntMessage>;
+namespace RepeatedNonPackedSIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedSIntMessage_QtProtobufNested
+
 class RepeatedNonPackedUIntMessage;
 using RepeatedNonPackedUIntMessageRepeated = QList<RepeatedNonPackedUIntMessage>;
+namespace RepeatedNonPackedUIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedUIntMessage_QtProtobufNested
+
 class RepeatedNonPackedInt64Message;
 using RepeatedNonPackedInt64MessageRepeated = QList<RepeatedNonPackedInt64Message>;
+namespace RepeatedNonPackedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedInt64Message_QtProtobufNested
+
 class RepeatedNonPackedSInt64Message;
 using RepeatedNonPackedSInt64MessageRepeated = QList<RepeatedNonPackedSInt64Message>;
+namespace RepeatedNonPackedSInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedSInt64Message_QtProtobufNested
+
 class RepeatedNonPackedUInt64Message;
 using RepeatedNonPackedUInt64MessageRepeated = QList<RepeatedNonPackedUInt64Message>;
+namespace RepeatedNonPackedUInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedUInt64Message_QtProtobufNested
+
 class RepeatedNonPackedFixedIntMessage;
 using RepeatedNonPackedFixedIntMessageRepeated = QList<RepeatedNonPackedFixedIntMessage>;
+namespace RepeatedNonPackedFixedIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedFixedIntMessage_QtProtobufNested
+
 class RepeatedNonPackedSFixedIntMessage;
 using RepeatedNonPackedSFixedIntMessageRepeated = QList<RepeatedNonPackedSFixedIntMessage>;
+namespace RepeatedNonPackedSFixedIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedSFixedIntMessage_QtProtobufNested
+
 class RepeatedNonPackedFixedInt64Message;
 using RepeatedNonPackedFixedInt64MessageRepeated = QList<RepeatedNonPackedFixedInt64Message>;
+namespace RepeatedNonPackedFixedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedFixedInt64Message_QtProtobufNested
+
 class RepeatedNonPackedSFixedInt64Message;
 using RepeatedNonPackedSFixedInt64MessageRepeated = QList<RepeatedNonPackedSFixedInt64Message>;
+namespace RepeatedNonPackedSFixedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedSFixedInt64Message_QtProtobufNested
+
 class RepeatedNonPackedBoolMessage;
 using RepeatedNonPackedBoolMessageRepeated = QList<RepeatedNonPackedBoolMessage>;
+namespace RepeatedNonPackedBoolMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedBoolMessage_QtProtobufNested
+
 class RepeatedNonPackedDoubleMessage;
 using RepeatedNonPackedDoubleMessageRepeated = QList<RepeatedNonPackedDoubleMessage>;
+namespace RepeatedNonPackedDoubleMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedDoubleMessage_QtProtobufNested
+
 class RepeatedNonPackedFloatMessage;
 using RepeatedNonPackedFloatMessageRepeated = QList<RepeatedNonPackedFloatMessage>;
+namespace RepeatedNonPackedFloatMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedNonPackedFloatMessage_QtProtobufNested
+
 class NonPackedIntMessageWithExtraMember;
 using NonPackedIntMessageWithExtraMemberRepeated = QList<NonPackedIntMessageWithExtraMember>;
+namespace NonPackedIntMessageWithExtraMember_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace NonPackedIntMessageWithExtraMember_QtProtobufNested
+
 
 class RepeatedNonPackedIntMessage_QtProtobufData;
 class RepeatedNonPackedIntMessage : public QProtobufMessage
@@ -56,11 +112,7 @@ class RepeatedNonPackedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedIntMessage();
     ~RepeatedNonPackedIntMessage();
     RepeatedNonPackedIntMessage(const RepeatedNonPackedIntMessage &other);
@@ -78,6 +130,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedIntMessage_QtProtobufNested
 
 class RepeatedNonPackedSIntMessage_QtProtobufData;
 class RepeatedNonPackedSIntMessage : public QProtobufMessage
@@ -88,11 +149,7 @@ class RepeatedNonPackedSIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedSIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedSIntMessage();
     ~RepeatedNonPackedSIntMessage();
     RepeatedNonPackedSIntMessage(const RepeatedNonPackedSIntMessage &other);
@@ -110,6 +167,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedSIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedSIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedSIntMessage_QtProtobufNested
 
 class RepeatedNonPackedUIntMessage_QtProtobufData;
 class RepeatedNonPackedUIntMessage : public QProtobufMessage
@@ -120,11 +186,7 @@ class RepeatedNonPackedUIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedUIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedUIntMessage();
     ~RepeatedNonPackedUIntMessage();
     RepeatedNonPackedUIntMessage(const RepeatedNonPackedUIntMessage &other);
@@ -142,6 +204,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedUIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedUIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedUIntMessage_QtProtobufNested
 
 class RepeatedNonPackedInt64Message_QtProtobufData;
 class RepeatedNonPackedInt64Message : public QProtobufMessage
@@ -152,11 +223,7 @@ class RepeatedNonPackedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::int64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedInt64Message();
     ~RepeatedNonPackedInt64Message();
     RepeatedNonPackedInt64Message(const RepeatedNonPackedInt64Message &other);
@@ -174,6 +241,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedInt64Message_QtProtobufNested
 
 class RepeatedNonPackedSInt64Message_QtProtobufData;
 class RepeatedNonPackedSInt64Message : public QProtobufMessage
@@ -184,11 +260,7 @@ class RepeatedNonPackedSInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedSInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedSInt64Message();
     ~RepeatedNonPackedSInt64Message();
     RepeatedNonPackedSInt64Message(const RepeatedNonPackedSInt64Message &other);
@@ -206,6 +278,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedSInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedSInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedSInt64Message_QtProtobufNested
 
 class RepeatedNonPackedUInt64Message_QtProtobufData;
 class RepeatedNonPackedUInt64Message : public QProtobufMessage
@@ -216,11 +297,7 @@ class RepeatedNonPackedUInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::uint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedUInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedUInt64Message();
     ~RepeatedNonPackedUInt64Message();
     RepeatedNonPackedUInt64Message(const RepeatedNonPackedUInt64Message &other);
@@ -238,6 +315,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedUInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedUInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedUInt64Message_QtProtobufNested
 
 class RepeatedNonPackedFixedIntMessage_QtProtobufData;
 class RepeatedNonPackedFixedIntMessage : public QProtobufMessage
@@ -248,11 +334,7 @@ class RepeatedNonPackedFixedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedFixedIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedFixedIntMessage();
     ~RepeatedNonPackedFixedIntMessage();
     RepeatedNonPackedFixedIntMessage(const RepeatedNonPackedFixedIntMessage &other);
@@ -270,6 +352,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedFixedIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedFixedIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedFixedIntMessage_QtProtobufNested
 
 class RepeatedNonPackedSFixedIntMessage_QtProtobufData;
 class RepeatedNonPackedSFixedIntMessage : public QProtobufMessage
@@ -280,11 +371,7 @@ class RepeatedNonPackedSFixedIntMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedSFixedIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedSFixedIntMessage();
     ~RepeatedNonPackedSFixedIntMessage();
     RepeatedNonPackedSFixedIntMessage(const RepeatedNonPackedSFixedIntMessage &other);
@@ -302,6 +389,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedSFixedIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedSFixedIntMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedSFixedIntMessage_QtProtobufNested
 
 class RepeatedNonPackedFixedInt64Message_QtProtobufData;
 class RepeatedNonPackedFixedInt64Message : public QProtobufMessage
@@ -312,11 +408,7 @@ class RepeatedNonPackedFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::fixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedFixedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedFixedInt64Message();
     ~RepeatedNonPackedFixedInt64Message();
     RepeatedNonPackedFixedInt64Message(const RepeatedNonPackedFixedInt64Message &other);
@@ -334,6 +426,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedFixedInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedFixedInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedFixedInt64Message_QtProtobufNested
 
 class RepeatedNonPackedSFixedInt64Message_QtProtobufData;
 class RepeatedNonPackedSFixedInt64Message : public QProtobufMessage
@@ -344,11 +445,7 @@ class RepeatedNonPackedSFixedInt64Message : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::sfixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedSFixedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedSFixedInt64Message();
     ~RepeatedNonPackedSFixedInt64Message();
     RepeatedNonPackedSFixedInt64Message(const RepeatedNonPackedSFixedInt64Message &other);
@@ -366,6 +463,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedSFixedInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedSFixedInt64Message_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedSFixedInt64Message_QtProtobufNested
 
 class RepeatedNonPackedBoolMessage_QtProtobufData;
 class RepeatedNonPackedBoolMessage : public QProtobufMessage
@@ -376,11 +482,7 @@ class RepeatedNonPackedBoolMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::boolList testRepeatedBool READ testRepeatedBool WRITE setTestRepeatedBool SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedBoolProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedBoolMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedBoolMessage();
     ~RepeatedNonPackedBoolMessage();
     RepeatedNonPackedBoolMessage(const RepeatedNonPackedBoolMessage &other);
@@ -398,6 +500,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedBoolMessage_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedBoolMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedBoolProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedBoolMessage_QtProtobufNested
 
 class RepeatedNonPackedDoubleMessage_QtProtobufData;
 class RepeatedNonPackedDoubleMessage : public QProtobufMessage
@@ -408,11 +519,7 @@ class RepeatedNonPackedDoubleMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::doubleList testRepeatedDouble READ testRepeatedDouble WRITE setTestRepeatedDouble SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedDoubleProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedDoubleMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedDoubleMessage();
     ~RepeatedNonPackedDoubleMessage();
     RepeatedNonPackedDoubleMessage(const RepeatedNonPackedDoubleMessage &other);
@@ -430,6 +537,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedDoubleMessage_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedDoubleMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedDoubleProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedDoubleMessage_QtProtobufNested
 
 class RepeatedNonPackedFloatMessage_QtProtobufData;
 class RepeatedNonPackedFloatMessage : public QProtobufMessage
@@ -440,11 +556,7 @@ class RepeatedNonPackedFloatMessage : public QProtobufMessage
     Q_PROPERTY(QtProtobuf::floatList testRepeatedFloat READ testRepeatedFloat WRITE setTestRepeatedFloat SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedFloatProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedNonPackedFloatMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedNonPackedFloatMessage();
     ~RepeatedNonPackedFloatMessage();
     RepeatedNonPackedFloatMessage(const RepeatedNonPackedFloatMessage &other);
@@ -462,6 +574,15 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedNonPackedFloatMessage_QtProtobufData> dptr;
 };
+namespace RepeatedNonPackedFloatMessage_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedFloatProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedNonPackedFloatMessage_QtProtobufNested
 
 class NonPackedIntMessageWithExtraMember_QtProtobufData;
 class NonPackedIntMessageWithExtraMember : public QProtobufMessage
@@ -473,12 +594,7 @@ class NonPackedIntMessageWithExtraMember : public QProtobufMessage
     Q_PROPERTY(QString extra READ extra WRITE setExtra SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-        ExtraProtoFieldNumber = 2,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = NonPackedIntMessageWithExtraMember_QtProtobufNested::QtProtobufFieldEnum;
     NonPackedIntMessageWithExtraMember();
     ~NonPackedIntMessageWithExtraMember();
     NonPackedIntMessageWithExtraMember(const NonPackedIntMessageWithExtraMember &other);
@@ -499,6 +615,16 @@ public:
 private:
     QExplicitlySharedDataPointer<NonPackedIntMessageWithExtraMember_QtProtobufData> dptr;
 };
+namespace NonPackedIntMessageWithExtraMember_QtProtobufNested {
+Q_NAMESPACE
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+    ExtraProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace NonPackedIntMessageWithExtraMember_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedNonPackedIntMessage)
diff --git a/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.h b/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.h
index 6409927..75e7c67 100644
--- a/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.h
+++ b/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.h
@@ -33,7 +33,8 @@
 
 namespace TestEnumGadget {
 Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT)
-QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT void registerTypes();
+QML_NAMED_ELEMENT(TestEnum)
+
 enum TestEnum : int32_t {
     LOCAL_ENUM_VALUE0 = 0,
     LOCAL_ENUM_VALUE1 = 1,
@@ -41,16 +42,34 @@ enum TestEnum : int32_t {
     LOCAL_ENUM_VALUE3 = 5,
 };
 Q_ENUM_NS(TestEnum)
+
 using TestEnumRepeated = QList<TestEnum>;
-};
+QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT void registerTypes();
+} // namespace TestEnumGadget
 class EmptyMessage;
 using EmptyMessageRepeated = QList<EmptyMessage>;
+namespace EmptyMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace EmptyMessage_QtProtobufNested
+
 class SimpleIntMessage;
 using SimpleIntMessageRepeated = QList<SimpleIntMessage>;
+namespace SimpleIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleIntMessage_QtProtobufNested
+
 class NoPackageExternalMessage;
 using NoPackageExternalMessageRepeated = QList<NoPackageExternalMessage>;
+namespace NoPackageExternalMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace NoPackageExternalMessage_QtProtobufNested
+
 class NoPackageMessage;
 using NoPackageMessageRepeated = QList<NoPackageMessage>;
+namespace NoPackageMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace NoPackageMessage_QtProtobufNested
+
 
 class EmptyMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT EmptyMessage : public QProtobufMessage
@@ -61,6 +80,7 @@ class QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT EmptyMessage : public QProt
     QML_VALUE_TYPE(emptyMessage)
 
 public:
+    using QtProtobufFieldEnum = EmptyMessage_QtProtobufNested::QtProtobufFieldEnum;
     EmptyMessage();
     ~EmptyMessage();
     EmptyMessage(const EmptyMessage &other);
@@ -74,6 +94,11 @@ public:
 private:
     QExplicitlySharedDataPointer<EmptyMessage_QtProtobufData> dptr;
 };
+namespace EmptyMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(EmptyMessage)
+
+} // namespace EmptyMessage_QtProtobufNested
 
 class SimpleIntMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT SimpleIntMessage : public QProtobufMessage
@@ -86,11 +111,7 @@ class QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT SimpleIntMessage : public Q
     Q_PROPERTY(int testFieldInt READ testFieldInt_p WRITE setTestFieldInt_p SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleIntMessage();
     ~SimpleIntMessage();
     SimpleIntMessage(const SimpleIntMessage &other);
@@ -109,6 +130,16 @@ private:
     void setTestFieldInt_p(const int &testFieldInt);
     QExplicitlySharedDataPointer<SimpleIntMessage_QtProtobufData> dptr;
 };
+namespace SimpleIntMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleIntMessage)
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleIntMessage_QtProtobufNested
 
 class NoPackageExternalMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT NoPackageExternalMessage : public QProtobufMessage
@@ -121,11 +152,7 @@ class QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT NoPackageExternalMessage :
     Q_PROPERTY(SimpleIntMessageExt testField READ testField WRITE setTestField)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = NoPackageExternalMessage_QtProtobufNested::QtProtobufFieldEnum;
     NoPackageExternalMessage();
     ~NoPackageExternalMessage();
     NoPackageExternalMessage(const NoPackageExternalMessage &other);
@@ -145,6 +172,16 @@ private:
     void setTestField_p(SimpleIntMessageExt *testField);
     QExplicitlySharedDataPointer<NoPackageExternalMessage_QtProtobufData> dptr;
 };
+namespace NoPackageExternalMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(NoPackageExternalMessage)
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace NoPackageExternalMessage_QtProtobufNested
 
 class NoPackageMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT NoPackageMessage : public QProtobufMessage
@@ -157,11 +194,7 @@ class QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT NoPackageMessage : public Q
     Q_PROPERTY(SimpleIntMessage testField READ testField WRITE setTestField)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = NoPackageMessage_QtProtobufNested::QtProtobufFieldEnum;
     NoPackageMessage();
     ~NoPackageMessage();
     NoPackageMessage(const NoPackageMessage &other);
@@ -181,6 +214,16 @@ private:
     void setTestField_p(SimpleIntMessage *testField);
     QExplicitlySharedDataPointer<NoPackageMessage_QtProtobufData> dptr;
 };
+namespace NoPackageMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(NoPackageMessage)
+
+enum class QtProtobufFieldEnum {
+    TestFieldProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace NoPackageMessage_QtProtobufNested
 
 Q_DECLARE_METATYPE(EmptyMessage)
 Q_DECLARE_METATYPE(SimpleIntMessage)
diff --git a/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage_uri_testplugin.cpp b/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage_uri_testplugin.cpp
deleted file mode 100644
index 17fa5be..0000000
--- a/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage_uri_testplugin.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
-
-#include <QtQml/qqmlextensionplugin.h>
-#include <QtQml/qqml.h>
-#include <QtQml/qqmlengine.h>
-#include <QtProtobuf/qtprotobuftypes.h>
-#include "nopackage.qpb.h"
-#include "nopackageexternal.qpb.h"
-
-#if defined(QT_SHARED) || !defined(QT_STATIC)
-#  define QPB_QML_EXPORT Q_DECL_EXPORT
-#else
-#  define QPB_QML_EXPORT
-#endif
-
-extern void qml_register_types_nopackage_uri_test();
-Q_GHS_KEEP_REFERENCE(qml_register_types_nopackage_uri_test);
-
-class QPB_QML_EXPORT NopackageUriTestPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
-
-public:
-    NopackageUriTestPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
-
-    void registerTypes(const char *uri) override
-    {
-        Q_ASSERT(uri == QLatin1String("nopackage.uri.test"));
-        volatile auto registration = &qml_register_types_nopackage_uri_test;
-        Q_UNUSED(registration);
-        qmlRegisterModule(uri, 1, 0);
-        qmlRegisterUncreatableMetaObject(
-            ::TestEnumGadget::staticMetaObject,
-            uri, 1, 0, "TestEnum", "You can only use the nested enums of TestEnum, but not create its instances in QML scope.");
-        qRegisterProtobufTypes();
-    }
-
-};
-#include "nopackage_uri_testplugin.moc"
diff --git a/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackageexternal.qpb.h b/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackageexternal.qpb.h
index 1c40299..900c749 100644
--- a/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackageexternal.qpb.h
+++ b/tests/auto/protobufgen/data/expected_result/qml-no-package/nopackageexternal.qpb.h
@@ -31,6 +31,10 @@
 
 class SimpleIntMessageExt;
 using SimpleIntMessageExtRepeated = QList<SimpleIntMessageExt>;
+namespace SimpleIntMessageExt_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleIntMessageExt_QtProtobufNested
+
 
 class SimpleIntMessageExt_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT SimpleIntMessageExt : public QProtobufMessage
@@ -43,11 +47,7 @@ class QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT SimpleIntMessageExt : publi
     Q_PROPERTY(int testFieldInt READ testFieldInt_p WRITE setTestFieldInt_p SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleIntMessageExt_QtProtobufNested::QtProtobufFieldEnum;
     SimpleIntMessageExt();
     ~SimpleIntMessageExt();
     SimpleIntMessageExt(const SimpleIntMessageExt &other);
@@ -66,6 +66,16 @@ private:
     void setTestFieldInt_p(const int &testFieldInt);
     QExplicitlySharedDataPointer<SimpleIntMessageExt_QtProtobufData> dptr;
 };
+namespace SimpleIntMessageExt_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleIntMessageExt)
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleIntMessageExt_QtProtobufNested
 
 Q_DECLARE_METATYPE(SimpleIntMessageExt)
 #endif // QPROTOBUF_NOPACKAGEEXTERNAL_H
diff --git a/tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.h
index 263cba4..7b5890a 100644
--- a/tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.h
+++ b/tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.h
@@ -32,38 +32,106 @@
 namespace qtprotobufnamespace::tests {
 class EmptyMessage;
 using EmptyMessageRepeated = QList<EmptyMessage>;
+namespace EmptyMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace EmptyMessage_QtProtobufNested
+
 class SimpleBoolMessage;
 using SimpleBoolMessageRepeated = QList<SimpleBoolMessage>;
+namespace SimpleBoolMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleBoolMessage_QtProtobufNested
+
 class SimpleIntMessage;
 using SimpleIntMessageRepeated = QList<SimpleIntMessage>;
+namespace SimpleIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleIntMessage_QtProtobufNested
+
 class SimpleSIntMessage;
 using SimpleSIntMessageRepeated = QList<SimpleSIntMessage>;
+namespace SimpleSIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSIntMessage_QtProtobufNested
+
 class SimpleUIntMessage;
 using SimpleUIntMessageRepeated = QList<SimpleUIntMessage>;
+namespace SimpleUIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUIntMessage_QtProtobufNested
+
 class SimpleInt64Message;
 using SimpleInt64MessageRepeated = QList<SimpleInt64Message>;
+namespace SimpleInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleInt64Message_QtProtobufNested
+
 class SimpleSInt64Message;
 using SimpleSInt64MessageRepeated = QList<SimpleSInt64Message>;
+namespace SimpleSInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSInt64Message_QtProtobufNested
+
 class SimpleUInt64Message;
 using SimpleUInt64MessageRepeated = QList<SimpleUInt64Message>;
+namespace SimpleUInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleUInt64Message_QtProtobufNested
+
 class SimpleStringMessage;
 using SimpleStringMessageRepeated = QList<SimpleStringMessage>;
+namespace SimpleStringMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleStringMessage_QtProtobufNested
+
 class SimpleFloatMessage;
 using SimpleFloatMessageRepeated = QList<SimpleFloatMessage>;
+namespace SimpleFloatMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFloatMessage_QtProtobufNested
+
 class SimpleDoubleMessage;
 using SimpleDoubleMessageRepeated = QList<SimpleDoubleMessage>;
+namespace SimpleDoubleMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleDoubleMessage_QtProtobufNested
+
 class SimpleBytesMessage;
 using SimpleBytesMessageRepeated = QList<SimpleBytesMessage>;
+namespace SimpleBytesMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleBytesMessage_QtProtobufNested
+
 class SimpleFixedInt32Message;
 using SimpleFixedInt32MessageRepeated = QList<SimpleFixedInt32Message>;
+namespace SimpleFixedInt32Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixedInt32Message_QtProtobufNested
+
 class SimpleFixedInt64Message;
 using SimpleFixedInt64MessageRepeated = QList<SimpleFixedInt64Message>;
+namespace SimpleFixedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFixedInt64Message_QtProtobufNested
+
 class SimpleSFixedInt32Message;
 using SimpleSFixedInt32MessageRepeated = QList<SimpleSFixedInt32Message>;
+namespace SimpleSFixedInt32Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixedInt32Message_QtProtobufNested
+
 class SimpleSFixedInt64Message;
 using SimpleSFixedInt64MessageRepeated = QList<SimpleSFixedInt64Message>;
+namespace SimpleSFixedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleSFixedInt64Message_QtProtobufNested
+
 class ComplexMessage;
 using ComplexMessageRepeated = QList<ComplexMessage>;
+namespace ComplexMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace ComplexMessage_QtProtobufNested
+
 
 class EmptyMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT EmptyMessage : public QProtobufMessage
@@ -74,6 +142,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT EmptyMessage : public QProtobufMessag
     QML_VALUE_TYPE(emptyMessage)
 
 public:
+    using QtProtobufFieldEnum = EmptyMessage_QtProtobufNested::QtProtobufFieldEnum;
     EmptyMessage();
     ~EmptyMessage();
     EmptyMessage(const EmptyMessage &other);
@@ -87,6 +156,11 @@ public:
 private:
     QExplicitlySharedDataPointer<EmptyMessage_QtProtobufData> dptr;
 };
+namespace EmptyMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(EmptyMessage)
+
+} // namespace EmptyMessage_QtProtobufNested
 
 class SimpleBoolMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleBoolMessage : public QProtobufMessage
@@ -98,11 +172,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleBoolMessage : public QProtobufM
     Q_PROPERTY(bool testFieldBool READ testFieldBool WRITE setTestFieldBool SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldBoolProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleBoolMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleBoolMessage();
     ~SimpleBoolMessage();
     SimpleBoolMessage(const SimpleBoolMessage &other);
@@ -119,6 +189,16 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleBoolMessage_QtProtobufData> dptr;
 };
+namespace SimpleBoolMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleBoolMessage)
+
+enum class QtProtobufFieldEnum {
+    TestFieldBoolProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleBoolMessage_QtProtobufNested
 
 class SimpleIntMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleIntMessage : public QProtobufMessage
@@ -131,11 +211,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleIntMessage : public QProtobufMe
     Q_PROPERTY(int testFieldInt READ testFieldInt_p WRITE setTestFieldInt_p SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleIntMessage();
     ~SimpleIntMessage();
     SimpleIntMessage(const SimpleIntMessage &other);
@@ -154,6 +230,16 @@ private:
     void setTestFieldInt_p(const int &testFieldInt);
     QExplicitlySharedDataPointer<SimpleIntMessage_QtProtobufData> dptr;
 };
+namespace SimpleIntMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleIntMessage)
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleIntMessage_QtProtobufNested
 
 class SimpleSIntMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleSIntMessage : public QProtobufMessage
@@ -165,11 +251,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleSIntMessage : public QProtobufM
     Q_PROPERTY(QtProtobuf::sint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleSIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleSIntMessage();
     ~SimpleSIntMessage();
     SimpleSIntMessage(const SimpleSIntMessage &other);
@@ -186,6 +268,16 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSIntMessage_QtProtobufData> dptr;
 };
+namespace SimpleSIntMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleSIntMessage)
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSIntMessage_QtProtobufNested
 
 class SimpleUIntMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleUIntMessage : public QProtobufMessage
@@ -197,11 +289,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleUIntMessage : public QProtobufM
     Q_PROPERTY(QtProtobuf::uint32 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleUIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleUIntMessage();
     ~SimpleUIntMessage();
     SimpleUIntMessage(const SimpleUIntMessage &other);
@@ -218,6 +306,16 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUIntMessage_QtProtobufData> dptr;
 };
+namespace SimpleUIntMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleUIntMessage)
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUIntMessage_QtProtobufNested
 
 class SimpleInt64Message_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleInt64Message : public QProtobufMessage
@@ -229,11 +327,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleInt64Message : public QProtobuf
     Q_PROPERTY(QtProtobuf::int64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleInt64Message();
     ~SimpleInt64Message();
     SimpleInt64Message(const SimpleInt64Message &other);
@@ -250,6 +344,16 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleInt64Message_QtProtobufData> dptr;
 };
+namespace SimpleInt64Message_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleInt64Message)
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleInt64Message_QtProtobufNested
 
 class SimpleSInt64Message_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleSInt64Message : public QProtobufMessage
@@ -261,11 +365,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleSInt64Message : public QProtobu
     Q_PROPERTY(QtProtobuf::sint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE false)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleSInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleSInt64Message();
     ~SimpleSInt64Message();
     SimpleSInt64Message(const SimpleSInt64Message &other);
@@ -282,6 +382,16 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSInt64Message_QtProtobufData> dptr;
 };
+namespace SimpleSInt64Message_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleSInt64Message)
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSInt64Message_QtProtobufNested
 
 class SimpleUInt64Message_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleUInt64Message : public QProtobufMessage
@@ -293,11 +403,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleUInt64Message : public QProtobu
     Q_PROPERTY(QtProtobuf::uint64 testFieldInt READ testFieldInt WRITE setTestFieldInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleUInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleUInt64Message();
     ~SimpleUInt64Message();
     SimpleUInt64Message(const SimpleUInt64Message &other);
@@ -314,6 +420,16 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleUInt64Message_QtProtobufData> dptr;
 };
+namespace SimpleUInt64Message_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleUInt64Message)
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleUInt64Message_QtProtobufNested
 
 class SimpleStringMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleStringMessage : public QProtobufMessage
@@ -325,11 +441,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleStringMessage : public QProtobu
     Q_PROPERTY(QString testFieldString READ testFieldString WRITE setTestFieldString SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldStringProtoFieldNumber = 6,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleStringMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleStringMessage();
     ~SimpleStringMessage();
     SimpleStringMessage(const SimpleStringMessage &other);
@@ -346,6 +458,16 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleStringMessage_QtProtobufData> dptr;
 };
+namespace SimpleStringMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleStringMessage)
+
+enum class QtProtobufFieldEnum {
+    TestFieldStringProtoFieldNumber = 6,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleStringMessage_QtProtobufNested
 
 class SimpleFloatMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleFloatMessage : public QProtobufMessage
@@ -357,11 +479,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleFloatMessage : public QProtobuf
     Q_PROPERTY(float testFieldFloat READ testFieldFloat WRITE setTestFieldFloat SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldFloatProtoFieldNumber = 7,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleFloatMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleFloatMessage();
     ~SimpleFloatMessage();
     SimpleFloatMessage(const SimpleFloatMessage &other);
@@ -378,6 +496,16 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFloatMessage_QtProtobufData> dptr;
 };
+namespace SimpleFloatMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleFloatMessage)
+
+enum class QtProtobufFieldEnum {
+    TestFieldFloatProtoFieldNumber = 7,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFloatMessage_QtProtobufNested
 
 class SimpleDoubleMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleDoubleMessage : public QProtobufMessage
@@ -389,11 +517,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleDoubleMessage : public QProtobu
     Q_PROPERTY(double testFieldDouble READ testFieldDouble WRITE setTestFieldDouble SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldDoubleProtoFieldNumber = 8,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleDoubleMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleDoubleMessage();
     ~SimpleDoubleMessage();
     SimpleDoubleMessage(const SimpleDoubleMessage &other);
@@ -410,6 +534,16 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleDoubleMessage_QtProtobufData> dptr;
 };
+namespace SimpleDoubleMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleDoubleMessage)
+
+enum class QtProtobufFieldEnum {
+    TestFieldDoubleProtoFieldNumber = 8,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleDoubleMessage_QtProtobufNested
 
 class SimpleBytesMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleBytesMessage : public QProtobufMessage
@@ -421,11 +555,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleBytesMessage : public QProtobuf
     Q_PROPERTY(QByteArray testFieldBytes READ testFieldBytes WRITE setTestFieldBytes SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldBytesProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleBytesMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleBytesMessage();
     ~SimpleBytesMessage();
     SimpleBytesMessage(const SimpleBytesMessage &other);
@@ -442,6 +572,16 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleBytesMessage_QtProtobufData> dptr;
 };
+namespace SimpleBytesMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleBytesMessage)
+
+enum class QtProtobufFieldEnum {
+    TestFieldBytesProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleBytesMessage_QtProtobufNested
 
 class SimpleFixedInt32Message_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleFixedInt32Message : public QProtobufMessage
@@ -454,11 +594,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleFixedInt32Message : public QPro
     Q_PROPERTY(unsigned int testFieldFixedInt32 READ testFieldFixedInt32_p WRITE setTestFieldFixedInt32_p SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldFixedInt32ProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleFixedInt32Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleFixedInt32Message();
     ~SimpleFixedInt32Message();
     SimpleFixedInt32Message(const SimpleFixedInt32Message &other);
@@ -477,6 +613,16 @@ private:
     void setTestFieldFixedInt32_p(const unsigned int &testFieldFixedInt32);
     QExplicitlySharedDataPointer<SimpleFixedInt32Message_QtProtobufData> dptr;
 };
+namespace SimpleFixedInt32Message_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleFixedInt32Message)
+
+enum class QtProtobufFieldEnum {
+    TestFieldFixedInt32ProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixedInt32Message_QtProtobufNested
 
 class SimpleFixedInt64Message_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleFixedInt64Message : public QProtobufMessage
@@ -488,11 +634,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleFixedInt64Message : public QPro
     Q_PROPERTY(QtProtobuf::fixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldFixedInt64ProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleFixedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleFixedInt64Message();
     ~SimpleFixedInt64Message();
     SimpleFixedInt64Message(const SimpleFixedInt64Message &other);
@@ -509,6 +651,16 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFixedInt64Message_QtProtobufData> dptr;
 };
+namespace SimpleFixedInt64Message_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleFixedInt64Message)
+
+enum class QtProtobufFieldEnum {
+    TestFieldFixedInt64ProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFixedInt64Message_QtProtobufNested
 
 class SimpleSFixedInt32Message_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleSFixedInt32Message : public QProtobufMessage
@@ -521,11 +673,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleSFixedInt32Message : public QPr
     Q_PROPERTY(int testFieldFixedInt32 READ testFieldFixedInt32_p WRITE setTestFieldFixedInt32_p SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldFixedInt32ProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleSFixedInt32Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleSFixedInt32Message();
     ~SimpleSFixedInt32Message();
     SimpleSFixedInt32Message(const SimpleSFixedInt32Message &other);
@@ -544,6 +692,16 @@ private:
     void setTestFieldFixedInt32_p(const int &testFieldFixedInt32);
     QExplicitlySharedDataPointer<SimpleSFixedInt32Message_QtProtobufData> dptr;
 };
+namespace SimpleSFixedInt32Message_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleSFixedInt32Message)
+
+enum class QtProtobufFieldEnum {
+    TestFieldFixedInt32ProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixedInt32Message_QtProtobufNested
 
 class SimpleSFixedInt64Message_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleSFixedInt64Message : public QProtobufMessage
@@ -555,11 +713,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleSFixedInt64Message : public QPr
     Q_PROPERTY(QtProtobuf::sfixed64 testFieldFixedInt64 READ testFieldFixedInt64 WRITE setTestFieldFixedInt64 SCRIPTABLE false)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldFixedInt64ProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleSFixedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     SimpleSFixedInt64Message();
     ~SimpleSFixedInt64Message();
     SimpleSFixedInt64Message(const SimpleSFixedInt64Message &other);
@@ -576,6 +730,16 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleSFixedInt64Message_QtProtobufData> dptr;
 };
+namespace SimpleSFixedInt64Message_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleSFixedInt64Message)
+
+enum class QtProtobufFieldEnum {
+    TestFieldFixedInt64ProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleSFixedInt64Message_QtProtobufNested
 
 class ComplexMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT ComplexMessage : public QProtobufMessage
@@ -590,12 +754,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT ComplexMessage : public QProtobufMess
     Q_PROPERTY(int testFieldInt READ testFieldInt_p WRITE setTestFieldInt_p SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestFieldIntProtoFieldNumber = 1,
-        TestComplexFieldProtoFieldNumber = 2,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = ComplexMessage_QtProtobufNested::QtProtobufFieldEnum;
     ComplexMessage();
     ~ComplexMessage();
     ComplexMessage(const ComplexMessage &other);
@@ -620,6 +779,17 @@ private:
     void setTestComplexField_p(SimpleStringMessage *testComplexField);
     QExplicitlySharedDataPointer<ComplexMessage_QtProtobufData> dptr;
 };
+namespace ComplexMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(ComplexMessage)
+
+enum class QtProtobufFieldEnum {
+    TestFieldIntProtoFieldNumber = 1,
+    TestComplexFieldProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace ComplexMessage_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::EmptyMessage)
diff --git a/tests/auto/protobufgen/data/expected_result/qmlgen/enummessages.qpb.cpp b/tests/auto/protobufgen/data/expected_result/qmlgen/enummessages.qpb.cpp
index 7072e6a..ddf3ae5 100644
--- a/tests/auto/protobufgen/data/expected_result/qmlgen/enummessages.qpb.cpp
+++ b/tests/auto/protobufgen/data/expected_result/qmlgen/enummessages.qpb.cpp
@@ -27,7 +27,7 @@ class SimpleEnumMessage_QtProtobufData : public QSharedData
 public:
     SimpleEnumMessage_QtProtobufData()
         : QSharedData(),
-          m_localEnum(SimpleEnumMessage::LocalEnum::LOCAL_ENUM_VALUE0)
+          m_localEnum(SimpleEnumMessage_QtProtobufNested::LocalEnum::LOCAL_ENUM_VALUE0)
     {
     }
 
@@ -37,7 +37,7 @@ public:
     {
     }
 
-    SimpleEnumMessage::LocalEnum m_localEnum;
+    SimpleEnumMessage_QtProtobufNested::LocalEnum m_localEnum;
 };
 
 SimpleEnumMessage::~SimpleEnumMessage() = default;
@@ -83,9 +83,9 @@ void SimpleEnumMessage::registerTypes()
 {
     qRegisterMetaType<SimpleEnumMessage>();
     qRegisterMetaType<SimpleEnumMessageRepeated>();
-    qRegisterProtobufEnumType<SimpleEnumMessage::LocalEnum>();
-    qRegisterMetaType<SimpleEnumMessage::LocalEnum>();
-    qRegisterMetaType<SimpleEnumMessage::LocalEnumRepeated>();
+    qRegisterProtobufEnumType<SimpleEnumMessage_QtProtobufNested::LocalEnum>();
+    qRegisterMetaType<LocalEnum>();
+    qRegisterMetaType<LocalEnumRepeated>();
 }
 
 SimpleEnumMessage::SimpleEnumMessage()
@@ -127,12 +127,12 @@ bool SimpleEnumMessage::operator !=(const SimpleEnumMessage &other) const
     return !this->operator ==(other);
 }
 
-SimpleEnumMessage::LocalEnum SimpleEnumMessage::localEnum() const
+SimpleEnumMessage_QtProtobufNested::LocalEnum SimpleEnumMessage::localEnum() const
 {
     return dptr->m_localEnum;
 }
 
-void SimpleEnumMessage::setLocalEnum(const SimpleEnumMessage::LocalEnum &localEnum)
+void SimpleEnumMessage::setLocalEnum(const SimpleEnumMessage_QtProtobufNested::LocalEnum &localEnum)
 {
     if (dptr->m_localEnum != localEnum) {
         dptr.detach();
@@ -155,7 +155,7 @@ public:
     {
     }
 
-    RepeatedEnumMessage::LocalEnumRepeated m_localEnumList;
+    RepeatedEnumMessage_QtProtobufNested::LocalEnumRepeated m_localEnumList;
 };
 
 RepeatedEnumMessage::~RepeatedEnumMessage() = default;
@@ -201,9 +201,9 @@ void RepeatedEnumMessage::registerTypes()
 {
     qRegisterMetaType<RepeatedEnumMessage>();
     qRegisterMetaType<RepeatedEnumMessageRepeated>();
-    qRegisterProtobufEnumType<RepeatedEnumMessage::LocalEnum>();
-    qRegisterMetaType<RepeatedEnumMessage::LocalEnum>();
-    qRegisterMetaType<RepeatedEnumMessage::LocalEnumRepeated>();
+    qRegisterProtobufEnumType<RepeatedEnumMessage_QtProtobufNested::LocalEnum>();
+    qRegisterMetaType<LocalEnum>();
+    qRegisterMetaType<LocalEnumRepeated>();
 }
 
 RepeatedEnumMessage::RepeatedEnumMessage()
@@ -245,18 +245,18 @@ bool RepeatedEnumMessage::operator !=(const RepeatedEnumMessage &other) const
     return !this->operator ==(other);
 }
 
-RepeatedEnumMessage::LocalEnumRepeated RepeatedEnumMessage::localEnumList() const
+RepeatedEnumMessage_QtProtobufNested::LocalEnumRepeated RepeatedEnumMessage::localEnumList() const
 {
     return dptr->m_localEnumList;
 }
 
-RepeatedEnumMessage::LocalEnumRepeated &RepeatedEnumMessage::localEnumList()
+RepeatedEnumMessage_QtProtobufNested::LocalEnumRepeated &RepeatedEnumMessage::localEnumList()
 {
     dptr.detach();
     return dptr->m_localEnumList;
 }
 
-void RepeatedEnumMessage::setLocalEnumList(const RepeatedEnumMessage::LocalEnumRepeated &localEnumList)
+void RepeatedEnumMessage::setLocalEnumList(const RepeatedEnumMessage_QtProtobufNested::LocalEnumRepeated &localEnumList)
 {
     if (dptr->m_localEnumList != localEnumList) {
         dptr.detach();
@@ -558,11 +558,11 @@ class NestedEnumMessage_QtProtobufData : public QSharedData
 public:
     NestedEnumMessage_QtProtobufData()
         : QSharedData(),
-          m_localEnumField(MixedEnumUsageMessage::LocalEnum::LOCAL_ENUM_VALUE0),
-          m_localEnumField2(RepeatedEnumMessage::LocalEnum::LOCAL_ENUM_VALUE0),
-          m_localEnumField3(MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolder::LocalEnum::NESTED_LOCAL_ENUM_VALUE0),
-          m_localEnumField4(MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1::LocalEnum::NESTED_LEVEL1_LOCAL_ENUM_VALUE0),
-          m_localEnumField5(MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::NestedEnumHolderLevel2::LocalEnum::NESTED_LEVEL2_LOCAL_ENUM_VALUE0)
+          m_localEnumField(MixedEnumUsageMessage_QtProtobufNested::LocalEnum::LOCAL_ENUM_VALUE0),
+          m_localEnumField2(RepeatedEnumMessage_QtProtobufNested::LocalEnum::LOCAL_ENUM_VALUE0),
+          m_localEnumField3(MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolder_QtProtobufNested::LocalEnum::NESTED_LOCAL_ENUM_VALUE0),
+          m_localEnumField4(MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::LocalEnum::NESTED_LEVEL1_LOCAL_ENUM_VALUE0),
+          m_localEnumField5(MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::NestedEnumHolderLevel2_QtProtobufNested::LocalEnum::NESTED_LEVEL2_LOCAL_ENUM_VALUE0)
     {
     }
 
@@ -576,11 +576,11 @@ public:
     {
     }
 
-    MixedEnumUsageMessage::LocalEnum m_localEnumField;
-    RepeatedEnumMessage::LocalEnum m_localEnumField2;
-    MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolder::LocalEnum m_localEnumField3;
-    MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1::LocalEnum m_localEnumField4;
-    MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::NestedEnumHolderLevel2::LocalEnum m_localEnumField5;
+    MixedEnumUsageMessage_QtProtobufNested::LocalEnum m_localEnumField;
+    RepeatedEnumMessage_QtProtobufNested::LocalEnum m_localEnumField2;
+    MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolder_QtProtobufNested::LocalEnum m_localEnumField3;
+    MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::LocalEnum m_localEnumField4;
+    MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::NestedEnumHolderLevel2_QtProtobufNested::LocalEnum m_localEnumField5;
 };
 
 NestedEnumMessage::~NestedEnumMessage() = default;
@@ -687,32 +687,32 @@ bool NestedEnumMessage::operator !=(const NestedEnumMessage &other) const
     return !this->operator ==(other);
 }
 
-MixedEnumUsageMessage::LocalEnum NestedEnumMessage::localEnumField() const
+MixedEnumUsageMessage_QtProtobufNested::LocalEnum NestedEnumMessage::localEnumField() const
 {
     return dptr->m_localEnumField;
 }
 
-RepeatedEnumMessage::LocalEnum NestedEnumMessage::localEnumField2() const
+RepeatedEnumMessage_QtProtobufNested::LocalEnum NestedEnumMessage::localEnumField2() const
 {
     return dptr->m_localEnumField2;
 }
 
-MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolder::LocalEnum NestedEnumMessage::localEnumField3() const
+MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolder_QtProtobufNested::LocalEnum NestedEnumMessage::localEnumField3() const
 {
     return dptr->m_localEnumField3;
 }
 
-MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1::LocalEnum NestedEnumMessage::localEnumField4() const
+MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::LocalEnum NestedEnumMessage::localEnumField4() const
 {
     return dptr->m_localEnumField4;
 }
 
-MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::NestedEnumHolderLevel2::LocalEnum NestedEnumMessage::localEnumField5() const
+MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::NestedEnumHolderLevel2_QtProtobufNested::LocalEnum NestedEnumMessage::localEnumField5() const
 {
     return dptr->m_localEnumField5;
 }
 
-void NestedEnumMessage::setLocalEnumField(const MixedEnumUsageMessage::LocalEnum &localEnumField)
+void NestedEnumMessage::setLocalEnumField(const MixedEnumUsageMessage_QtProtobufNested::LocalEnum &localEnumField)
 {
     if (dptr->m_localEnumField != localEnumField) {
         dptr.detach();
@@ -720,7 +720,7 @@ void NestedEnumMessage::setLocalEnumField(const MixedEnumUsageMessage::LocalEnum
     }
 }
 
-void NestedEnumMessage::setLocalEnumField2(const RepeatedEnumMessage::LocalEnum &localEnumField2)
+void NestedEnumMessage::setLocalEnumField2(const RepeatedEnumMessage_QtProtobufNested::LocalEnum &localEnumField2)
 {
     if (dptr->m_localEnumField2 != localEnumField2) {
         dptr.detach();
@@ -728,7 +728,7 @@ void NestedEnumMessage::setLocalEnumField2(const RepeatedEnumMessage::LocalEnum
     }
 }
 
-void NestedEnumMessage::setLocalEnumField3(const MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolder::LocalEnum &localEnumField3)
+void NestedEnumMessage::setLocalEnumField3(const MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolder_QtProtobufNested::LocalEnum &localEnumField3)
 {
     if (dptr->m_localEnumField3 != localEnumField3) {
         dptr.detach();
@@ -736,7 +736,7 @@ void NestedEnumMessage::setLocalEnumField3(const MixedEnumUsageMessage_QtProtobu
     }
 }
 
-void NestedEnumMessage::setLocalEnumField4(const MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1::LocalEnum &localEnumField4)
+void NestedEnumMessage::setLocalEnumField4(const MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::LocalEnum &localEnumField4)
 {
     if (dptr->m_localEnumField4 != localEnumField4) {
         dptr.detach();
@@ -744,7 +744,7 @@ void NestedEnumMessage::setLocalEnumField4(const MixedEnumUsageMessage_QtProtobu
     }
 }
 
-void NestedEnumMessage::setLocalEnumField5(const MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::NestedEnumHolderLevel2::LocalEnum &localEnumField5)
+void NestedEnumMessage::setLocalEnumField5(const MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::NestedEnumHolderLevel2_QtProtobufNested::LocalEnum &localEnumField5)
 {
     if (dptr->m_localEnumField5 != localEnumField5) {
         dptr.detach();
@@ -759,7 +759,7 @@ class MixedEnumUsageMessage_QtProtobufData : public QSharedData
 public:
     MixedEnumUsageMessage_QtProtobufData()
         : QSharedData(),
-          m_localEnum(MixedEnumUsageMessage::LocalEnum::LOCAL_ENUM_VALUE0)
+          m_localEnum(MixedEnumUsageMessage_QtProtobufNested::LocalEnum::LOCAL_ENUM_VALUE0)
     {
     }
 
@@ -772,8 +772,8 @@ public:
     {
     }
 
-    MixedEnumUsageMessage::LocalEnum m_localEnum;
-    MixedEnumUsageMessage::LocalEnumRepeated m_localEnumList;
+    MixedEnumUsageMessage_QtProtobufNested::LocalEnum m_localEnum;
+    MixedEnumUsageMessage_QtProtobufNested::LocalEnumRepeated m_localEnumList;
     MixedEnumUsageMessage::LocalEnumMapEntry m_localEnumMap;
     MixedEnumUsageMessage_QtProtobufNested::NestedEnumMessageRepeated m_msgList;
 };
@@ -833,11 +833,11 @@ void MixedEnumUsageMessage::registerTypes()
 {
     qRegisterMetaType<MixedEnumUsageMessage>();
     qRegisterMetaType<MixedEnumUsageMessageRepeated>();
-    qRegisterProtobufEnumType<MixedEnumUsageMessage::LocalEnum>();
-    qRegisterMetaType<MixedEnumUsageMessage::LocalEnum>();
-    qRegisterMetaType<MixedEnumUsageMessage::LocalEnumRepeated>();
+    qRegisterProtobufEnumType<MixedEnumUsageMessage_QtProtobufNested::LocalEnum>();
+    qRegisterMetaType<LocalEnum>();
+    qRegisterMetaType<LocalEnumRepeated>();
     qRegisterMetaType<MixedEnumUsageMessage::LocalEnumMapEntry>();
-    qRegisterProtobufMapType<QString, MixedEnumUsageMessage::LocalEnum>();
+    qRegisterProtobufMapType<QString, MixedEnumUsageMessage_QtProtobufNested::LocalEnum>();
 }
 
 MixedEnumUsageMessage::MixedEnumUsageMessage()
@@ -882,17 +882,17 @@ bool MixedEnumUsageMessage::operator !=(const MixedEnumUsageMessage &other) cons
     return !this->operator ==(other);
 }
 
-MixedEnumUsageMessage::LocalEnum MixedEnumUsageMessage::localEnum() const
+MixedEnumUsageMessage_QtProtobufNested::LocalEnum MixedEnumUsageMessage::localEnum() const
 {
     return dptr->m_localEnum;
 }
 
-MixedEnumUsageMessage::LocalEnumRepeated MixedEnumUsageMessage::localEnumList() const
+MixedEnumUsageMessage_QtProtobufNested::LocalEnumRepeated MixedEnumUsageMessage::localEnumList() const
 {
     return dptr->m_localEnumList;
 }
 
-MixedEnumUsageMessage::LocalEnumRepeated &MixedEnumUsageMessage::localEnumList()
+MixedEnumUsageMessage_QtProtobufNested::LocalEnumRepeated &MixedEnumUsageMessage::localEnumList()
 {
     dptr.detach();
     return dptr->m_localEnumList;
@@ -920,7 +920,7 @@ MixedEnumUsageMessage_QtProtobufNested::NestedEnumMessageRepeated &MixedEnumUsag
     return dptr->m_msgList;
 }
 
-void MixedEnumUsageMessage::setLocalEnum(const MixedEnumUsageMessage::LocalEnum &localEnum)
+void MixedEnumUsageMessage::setLocalEnum(const MixedEnumUsageMessage_QtProtobufNested::LocalEnum &localEnum)
 {
     if (dptr->m_localEnum != localEnum) {
         dptr.detach();
@@ -928,7 +928,7 @@ void MixedEnumUsageMessage::setLocalEnum(const MixedEnumUsageMessage::LocalEnum
     }
 }
 
-void MixedEnumUsageMessage::setLocalEnumList(const MixedEnumUsageMessage::LocalEnumRepeated &localEnumList)
+void MixedEnumUsageMessage::setLocalEnumList(const MixedEnumUsageMessage_QtProtobufNested::LocalEnumRepeated &localEnumList)
 {
     if (dptr->m_localEnumList != localEnumList) {
         dptr.detach();
@@ -1100,7 +1100,7 @@ class StepChildEnumMessage_QtProtobufData : public QSharedData
 public:
     StepChildEnumMessage_QtProtobufData()
         : QSharedData(),
-          m_localStepChildEnum(SimpleEnumMessage::LocalEnum::LOCAL_ENUM_VALUE0)
+          m_localStepChildEnum(SimpleEnumMessage_QtProtobufNested::LocalEnum::LOCAL_ENUM_VALUE0)
     {
     }
 
@@ -1111,8 +1111,8 @@ public:
     {
     }
 
-    SimpleEnumMessage::LocalEnum m_localStepChildEnum;
-    SimpleEnumMessage::LocalEnumRepeated m_localStepChildList;
+    SimpleEnumMessage_QtProtobufNested::LocalEnum m_localStepChildEnum;
+    SimpleEnumMessage_QtProtobufNested::LocalEnumRepeated m_localStepChildList;
 };
 
 StepChildEnumMessage::~StepChildEnumMessage() = default;
@@ -1204,23 +1204,23 @@ bool StepChildEnumMessage::operator !=(const StepChildEnumMessage &other) const
     return !this->operator ==(other);
 }
 
-SimpleEnumMessage::LocalEnum StepChildEnumMessage::localStepChildEnum() const
+SimpleEnumMessage_QtProtobufNested::LocalEnum StepChildEnumMessage::localStepChildEnum() const
 {
     return dptr->m_localStepChildEnum;
 }
 
-SimpleEnumMessage::LocalEnumRepeated StepChildEnumMessage::localStepChildList() const
+SimpleEnumMessage_QtProtobufNested::LocalEnumRepeated StepChildEnumMessage::localStepChildList() const
 {
     return dptr->m_localStepChildList;
 }
 
-SimpleEnumMessage::LocalEnumRepeated &StepChildEnumMessage::localStepChildList()
+SimpleEnumMessage_QtProtobufNested::LocalEnumRepeated &StepChildEnumMessage::localStepChildList()
 {
     dptr.detach();
     return dptr->m_localStepChildList;
 }
 
-void StepChildEnumMessage::setLocalStepChildEnum(const SimpleEnumMessage::LocalEnum &localStepChildEnum)
+void StepChildEnumMessage::setLocalStepChildEnum(const SimpleEnumMessage_QtProtobufNested::LocalEnum &localStepChildEnum)
 {
     if (dptr->m_localStepChildEnum != localStepChildEnum) {
         dptr.detach();
@@ -1228,7 +1228,7 @@ void StepChildEnumMessage::setLocalStepChildEnum(const SimpleEnumMessage::LocalE
     }
 }
 
-void StepChildEnumMessage::setLocalStepChildList(const SimpleEnumMessage::LocalEnumRepeated &localStepChildList)
+void StepChildEnumMessage::setLocalStepChildList(const SimpleEnumMessage_QtProtobufNested::LocalEnumRepeated &localStepChildList)
 {
     if (dptr->m_localStepChildList != localStepChildList) {
         dptr.detach();
@@ -1236,6 +1236,238 @@ void StepChildEnumMessage::setLocalStepChildList(const SimpleEnumMessage::LocalE
     }
 }
 
+
+class A_QtProtobufData : public QSharedData
+{
+public:
+    A_QtProtobufData()
+        : QSharedData(),
+          m_val(B_QtProtobufNested::BEnum::BVal0)
+    {
+    }
+
+    A_QtProtobufData(const A_QtProtobufData &other)
+        : QSharedData(other),
+          m_val(other.m_val)
+    {
+    }
+
+    B_QtProtobufNested::BEnum m_val;
+};
+
+A::~A() = default;
+
+static constexpr struct {
+    QtProtobufPrivate::QProtobufPropertyOrdering::Data data;
+    const std::array<uint, 5> qt_protobuf_A_uint_data;
+    const char qt_protobuf_A_char_data[33];
+} qt_protobuf_A_metadata {
+    // data
+    {
+        0, /* = version */
+        1, /* = num fields */
+        2, /* = field number offset */
+        3, /* = property index offset */
+        4, /* = field flags offset */
+        27, /* = message full name length */
+    },
+    // uint_data
+    {
+        // JSON name offsets:
+        28, /* = val */
+        32, /* = end-of-string-marker */
+        // Field numbers:
+        1, /* = val */
+        // Property indices:
+        0, /* = val */
+        // Field flags:
+        QtProtobufPrivate::NoFlags, /* = val */
+    },
+    // char_data
+    /* metadata char_data: */
+    "qtprotobufnamespace.tests.A\0" /* = full message name */
+    /* field char_data: */
+    "val\0"
+};
+
+const QtProtobufPrivate::QProtobufPropertyOrdering A::propertyOrdering = {
+    &qt_protobuf_A_metadata.data
+};
+
+void A::registerTypes()
+{
+    qRegisterMetaType<A>();
+    qRegisterMetaType<ARepeated>();
+}
+
+A::A()
+    : QProtobufMessage(&A::staticMetaObject),
+      dptr(new A_QtProtobufData)
+{
+}
+
+A::A(const A &other)
+    : QProtobufMessage(other),
+      dptr(other.dptr)
+{
+}
+A &A::operator =(const A &other)
+{
+    QProtobufMessage::operator=(other);
+    dptr = other.dptr;
+    return *this;
+}
+A::A(A &&other) noexcept
+    : QProtobufMessage(std::move(other)),
+      dptr(std::move(other.dptr))
+{
+}
+A &A::operator =(A &&other) noexcept
+{
+    QProtobufMessage::operator=(std::move(other));
+    dptr.swap(other.dptr);
+    return *this;
+}
+bool A::operator ==(const A &other) const
+{
+    return QProtobufMessage::isEqual(*this, other)
+        && dptr->m_val == other.dptr->m_val;
+}
+
+bool A::operator !=(const A &other) const
+{
+    return !this->operator ==(other);
+}
+
+B_QtProtobufNested::BEnum A::val() const
+{
+    return dptr->m_val;
+}
+
+void A::setVal(const B_QtProtobufNested::BEnum &val)
+{
+    if (dptr->m_val != val) {
+        dptr.detach();
+        dptr->m_val = val;
+    }
+}
+
+
+class B_QtProtobufData : public QSharedData
+{
+public:
+    B_QtProtobufData()
+        : QSharedData(),
+          m_val(A_QtProtobufNested::AEnum::AVal0)
+    {
+    }
+
+    B_QtProtobufData(const B_QtProtobufData &other)
+        : QSharedData(other),
+          m_val(other.m_val)
+    {
+    }
+
+    A_QtProtobufNested::AEnum m_val;
+};
+
+B::~B() = default;
+
+static constexpr struct {
+    QtProtobufPrivate::QProtobufPropertyOrdering::Data data;
+    const std::array<uint, 5> qt_protobuf_B_uint_data;
+    const char qt_protobuf_B_char_data[33];
+} qt_protobuf_B_metadata {
+    // data
+    {
+        0, /* = version */
+        1, /* = num fields */
+        2, /* = field number offset */
+        3, /* = property index offset */
+        4, /* = field flags offset */
+        27, /* = message full name length */
+    },
+    // uint_data
+    {
+        // JSON name offsets:
+        28, /* = val */
+        32, /* = end-of-string-marker */
+        // Field numbers:
+        1, /* = val */
+        // Property indices:
+        0, /* = val */
+        // Field flags:
+        QtProtobufPrivate::NoFlags, /* = val */
+    },
+    // char_data
+    /* metadata char_data: */
+    "qtprotobufnamespace.tests.B\0" /* = full message name */
+    /* field char_data: */
+    "val\0"
+};
+
+const QtProtobufPrivate::QProtobufPropertyOrdering B::propertyOrdering = {
+    &qt_protobuf_B_metadata.data
+};
+
+void B::registerTypes()
+{
+    qRegisterMetaType<B>();
+    qRegisterMetaType<BRepeated>();
+}
+
+B::B()
+    : QProtobufMessage(&B::staticMetaObject),
+      dptr(new B_QtProtobufData)
+{
+}
+
+B::B(const B &other)
+    : QProtobufMessage(other),
+      dptr(other.dptr)
+{
+}
+B &B::operator =(const B &other)
+{
+    QProtobufMessage::operator=(other);
+    dptr = other.dptr;
+    return *this;
+}
+B::B(B &&other) noexcept
+    : QProtobufMessage(std::move(other)),
+      dptr(std::move(other.dptr))
+{
+}
+B &B::operator =(B &&other) noexcept
+{
+    QProtobufMessage::operator=(std::move(other));
+    dptr.swap(other.dptr);
+    return *this;
+}
+bool B::operator ==(const B &other) const
+{
+    return QProtobufMessage::isEqual(*this, other)
+        && dptr->m_val == other.dptr->m_val;
+}
+
+bool B::operator !=(const B &other) const
+{
+    return !this->operator ==(other);
+}
+
+A_QtProtobufNested::AEnum B::val() const
+{
+    return dptr->m_val;
+}
+
+void B::setVal(const A_QtProtobufNested::AEnum &val)
+{
+    if (dptr->m_val != val) {
+        dptr.detach();
+        dptr->m_val = val;
+    }
+}
+
 } // namespace qtprotobufnamespace::tests
 
 #include "moc_enummessages.qpb.cpp"
diff --git a/tests/auto/protobufgen/data/expected_result/qmlgen/enummessages.qpb.h b/tests/auto/protobufgen/data/expected_result/qmlgen/enummessages.qpb.h
index f1377b2..887f183 100644
--- a/tests/auto/protobufgen/data/expected_result/qmlgen/enummessages.qpb.h
+++ b/tests/auto/protobufgen/data/expected_result/qmlgen/enummessages.qpb.h
@@ -33,7 +33,8 @@ namespace qtprotobufnamespace::tests {
 
 namespace TestEnumGadget {
 Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
-QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT void registerTypes();
+QML_NAMED_ELEMENT(TestEnum)
+
 enum TestEnum : int32_t {
     TEST_ENUM_VALUE0 = 0,
     TEST_ENUM_VALUE1 = 1,
@@ -42,42 +43,107 @@ enum TestEnum : int32_t {
     TEST_ENUM_VALUE4 = 3,
 };
 Q_ENUM_NS(TestEnum)
+
 using TestEnumRepeated = QList<TestEnum>;
-};
+QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT void registerTypes();
+} // namespace TestEnumGadget
 
 namespace TestEnumSecondInFileGadget {
 Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
-QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT void registerTypes();
+QML_NAMED_ELEMENT(TestEnumSecondInFile)
+
 enum TestEnumSecondInFile : int32_t {
     TEST_ENUM_SIF_VALUE0 = 0,
     TEST_ENUM_SIF_VALUE1 = 1,
     TEST_ENUM_SIF_VALUE2 = 2,
 };
 Q_ENUM_NS(TestEnumSecondInFile)
+
 using TestEnumSecondInFileRepeated = QList<TestEnumSecondInFile>;
-};
+QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT void registerTypes();
+} // namespace TestEnumSecondInFileGadget
 class SimpleEnumMessage;
 using SimpleEnumMessageRepeated = QList<SimpleEnumMessage>;
+namespace SimpleEnumMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+enum LocalEnum : int32_t;
+using LocalEnumRepeated = QList<LocalEnum>;
+} // namespace SimpleEnumMessage_QtProtobufNested
+
 class RepeatedEnumMessage;
 using RepeatedEnumMessageRepeated = QList<RepeatedEnumMessage>;
+namespace RepeatedEnumMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+enum LocalEnum : int32_t;
+using LocalEnumRepeated = QList<LocalEnum>;
+} // namespace RepeatedEnumMessage_QtProtobufNested
+
 class MixedEnumUsageMessage;
 using MixedEnumUsageMessageRepeated = QList<MixedEnumUsageMessage>;
 namespace MixedEnumUsageMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+enum LocalEnum : int32_t;
+using LocalEnumRepeated = QList<LocalEnum>;
 class NestedEnumHolder;
 using NestedEnumHolderRepeated = QList<NestedEnumHolder>;
+namespace NestedEnumHolder_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+enum LocalEnum : int32_t;
+using LocalEnumRepeated = QList<LocalEnum>;
+} // namespace NestedEnumHolder_QtProtobufNested
+
 class NestedEnumHolderLevel1;
 using NestedEnumHolderLevel1Repeated = QList<NestedEnumHolderLevel1>;
 namespace NestedEnumHolderLevel1_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+enum LocalEnum : int32_t;
+using LocalEnumRepeated = QList<LocalEnum>;
 class NestedEnumHolderLevel2;
 using NestedEnumHolderLevel2Repeated = QList<NestedEnumHolderLevel2>;
+namespace NestedEnumHolderLevel2_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+enum LocalEnum : int32_t;
+using LocalEnumRepeated = QList<LocalEnum>;
+} // namespace NestedEnumHolderLevel2_QtProtobufNested
+
 } // namespace NestedEnumHolderLevel1_QtProtobufNested
+
 class NestedEnumMessage;
 using NestedEnumMessageRepeated = QList<NestedEnumMessage>;
+namespace NestedEnumMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace NestedEnumMessage_QtProtobufNested
+
 } // namespace MixedEnumUsageMessage_QtProtobufNested
+
 class SimpleFileEnumMessage;
 using SimpleFileEnumMessageRepeated = QList<SimpleFileEnumMessage>;
+namespace SimpleFileEnumMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace SimpleFileEnumMessage_QtProtobufNested
+
 class StepChildEnumMessage;
 using StepChildEnumMessageRepeated = QList<StepChildEnumMessage>;
+namespace StepChildEnumMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace StepChildEnumMessage_QtProtobufNested
+
+class A;
+using ARepeated = QList<A>;
+namespace A_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+enum AEnum : int32_t;
+using AEnumRepeated = QList<AEnum>;
+} // namespace A_QtProtobufNested
+
+class B;
+using BRepeated = QList<B>;
+namespace B_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+enum BEnum : int32_t;
+using BEnumRepeated = QList<BEnum>;
+} // namespace B_QtProtobufNested
+
 
 class SimpleEnumMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleEnumMessage : public QProtobufMessage
@@ -89,18 +155,8 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleEnumMessage : public QProtobufM
     Q_PROPERTY(LocalEnum localEnum READ localEnum WRITE setLocalEnum SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        LocalEnumProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
-    enum LocalEnum : int32_t {
-        LOCAL_ENUM_VALUE0 = 0,
-        LOCAL_ENUM_VALUE1 = 1,
-        LOCAL_ENUM_VALUE2 = 2,
-        LOCAL_ENUM_VALUE3 = 3,
-    };
-    Q_ENUM(LocalEnum)
+    using QtProtobufFieldEnum = SimpleEnumMessage_QtProtobufNested::QtProtobufFieldEnum;
+    using LocalEnum = SimpleEnumMessage_QtProtobufNested::LocalEnum;
     using LocalEnumRepeated = QList<LocalEnum>;
     SimpleEnumMessage();
     ~SimpleEnumMessage();
@@ -111,13 +167,32 @@ public:
     bool operator ==(const SimpleEnumMessage &other) const;
     bool operator !=(const SimpleEnumMessage &other) const;
 
-    SimpleEnumMessage::LocalEnum localEnum() const;
-    void setLocalEnum(const SimpleEnumMessage::LocalEnum &localEnum);
+    SimpleEnumMessage_QtProtobufNested::LocalEnum localEnum() const;
+    void setLocalEnum(const SimpleEnumMessage_QtProtobufNested::LocalEnum &localEnum);
     static void registerTypes();
 
 private:
     QExplicitlySharedDataPointer<SimpleEnumMessage_QtProtobufData> dptr;
 };
+namespace SimpleEnumMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleEnumMessage)
+
+enum class QtProtobufFieldEnum {
+    LocalEnumProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+enum LocalEnum : int32_t {
+    LOCAL_ENUM_VALUE0 = 0,
+    LOCAL_ENUM_VALUE1 = 1,
+    LOCAL_ENUM_VALUE2 = 2,
+    LOCAL_ENUM_VALUE3 = 3,
+};
+Q_ENUM_NS(LocalEnum)
+
+using LocalEnumRepeated = QList<LocalEnum>;
+} // namespace SimpleEnumMessage_QtProtobufNested
 
 class RepeatedEnumMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedEnumMessage : public QProtobufMessage
@@ -129,18 +204,8 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedEnumMessage : public QProtobu
     Q_PROPERTY(qtprotobufnamespace::tests::RepeatedEnumMessage::LocalEnumRepeated localEnumList READ localEnumList WRITE setLocalEnumList SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        LocalEnumListProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
-    enum LocalEnum : int32_t {
-        LOCAL_ENUM_VALUE0 = 0,
-        LOCAL_ENUM_VALUE1 = 1,
-        LOCAL_ENUM_VALUE2 = 2,
-        LOCAL_ENUM_VALUE3 = 3,
-    };
-    Q_ENUM(LocalEnum)
+    using QtProtobufFieldEnum = RepeatedEnumMessage_QtProtobufNested::QtProtobufFieldEnum;
+    using LocalEnum = RepeatedEnumMessage_QtProtobufNested::LocalEnum;
     using LocalEnumRepeated = QList<LocalEnum>;
     RepeatedEnumMessage();
     ~RepeatedEnumMessage();
@@ -151,14 +216,33 @@ public:
     bool operator ==(const RepeatedEnumMessage &other) const;
     bool operator !=(const RepeatedEnumMessage &other) const;
 
-    RepeatedEnumMessage::LocalEnumRepeated localEnumList() const;
-    RepeatedEnumMessage::LocalEnumRepeated &localEnumList();
-    void setLocalEnumList(const RepeatedEnumMessage::LocalEnumRepeated &localEnumList);
+    RepeatedEnumMessage_QtProtobufNested::LocalEnumRepeated localEnumList() const;
+    RepeatedEnumMessage_QtProtobufNested::LocalEnumRepeated &localEnumList();
+    void setLocalEnumList(const RepeatedEnumMessage_QtProtobufNested::LocalEnumRepeated &localEnumList);
     static void registerTypes();
 
 private:
     QExplicitlySharedDataPointer<RepeatedEnumMessage_QtProtobufData> dptr;
 };
+namespace RepeatedEnumMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(RepeatedEnumMessage)
+
+enum class QtProtobufFieldEnum {
+    LocalEnumListProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+enum LocalEnum : int32_t {
+    LOCAL_ENUM_VALUE0 = 0,
+    LOCAL_ENUM_VALUE1 = 1,
+    LOCAL_ENUM_VALUE2 = 2,
+    LOCAL_ENUM_VALUE3 = 3,
+};
+Q_ENUM_NS(LocalEnum)
+
+using LocalEnumRepeated = QList<LocalEnum>;
+} // namespace RepeatedEnumMessage_QtProtobufNested
 
 class MixedEnumUsageMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT MixedEnumUsageMessage : public QProtobufMessage
@@ -173,21 +257,8 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT MixedEnumUsageMessage : public QProto
     Q_PROPERTY(qtprotobufnamespace::tests::MixedEnumUsageMessage::NestedEnumMessageRepeated msgListData READ msgList WRITE setMsgList SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        LocalEnumProtoFieldNumber = 1,
-        LocalEnumListProtoFieldNumber = 2,
-        LocalEnumMapProtoFieldNumber = 3,
-        MsgListProtoFieldNumber = 4,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
-    enum LocalEnum : int32_t {
-        LOCAL_ENUM_VALUE0 = 0,
-        LOCAL_ENUM_VALUE1 = 1,
-        LOCAL_ENUM_VALUE2 = 2,
-        LOCAL_ENUM_VALUE3 = 3,
-    };
-    Q_ENUM(LocalEnum)
+    using QtProtobufFieldEnum = MixedEnumUsageMessage_QtProtobufNested::QtProtobufFieldEnum;
+    using LocalEnum = MixedEnumUsageMessage_QtProtobufNested::LocalEnum;
     using LocalEnumRepeated = QList<LocalEnum>;
     using NestedEnumHolder = MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolder;
     using NestedEnumHolderRepeated = MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderRepeated;
@@ -195,7 +266,7 @@ public:
     using NestedEnumHolderLevel1Repeated = MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1Repeated;
     using NestedEnumMessage = MixedEnumUsageMessage_QtProtobufNested::NestedEnumMessage;
     using NestedEnumMessageRepeated = MixedEnumUsageMessage_QtProtobufNested::NestedEnumMessageRepeated;
-    using LocalEnumMapEntry = QHash<QString, MixedEnumUsageMessage::LocalEnum>;
+    using LocalEnumMapEntry = QHash<QString, MixedEnumUsageMessage_QtProtobufNested::LocalEnum>;
     MixedEnumUsageMessage();
     ~MixedEnumUsageMessage();
     MixedEnumUsageMessage(const MixedEnumUsageMessage &other);
@@ -205,18 +276,18 @@ public:
     bool operator ==(const MixedEnumUsageMessage &other) const;
     bool operator !=(const MixedEnumUsageMessage &other) const;
 
-    MixedEnumUsageMessage::LocalEnum localEnum() const;
+    MixedEnumUsageMessage_QtProtobufNested::LocalEnum localEnum() const;
 
-    MixedEnumUsageMessage::LocalEnumRepeated localEnumList() const;
-    MixedEnumUsageMessage::LocalEnumRepeated &localEnumList();
+    MixedEnumUsageMessage_QtProtobufNested::LocalEnumRepeated localEnumList() const;
+    MixedEnumUsageMessage_QtProtobufNested::LocalEnumRepeated &localEnumList();
 
     MixedEnumUsageMessage::LocalEnumMapEntry localEnumMap() const;
     MixedEnumUsageMessage::LocalEnumMapEntry &localEnumMap();
 
     MixedEnumUsageMessage_QtProtobufNested::NestedEnumMessageRepeated msgList() const;
     MixedEnumUsageMessage_QtProtobufNested::NestedEnumMessageRepeated &msgList();
-    void setLocalEnum(const MixedEnumUsageMessage::LocalEnum &localEnum);
-    void setLocalEnumList(const MixedEnumUsageMessage::LocalEnumRepeated &localEnumList);
+    void setLocalEnum(const MixedEnumUsageMessage_QtProtobufNested::LocalEnum &localEnum);
+    void setLocalEnumList(const MixedEnumUsageMessage_QtProtobufNested::LocalEnumRepeated &localEnumList);
     void setLocalEnumMap(const MixedEnumUsageMessage::LocalEnumMapEntry &localEnumMap);
     void setMsgList(const MixedEnumUsageMessage_QtProtobufNested::NestedEnumMessageRepeated &msgList);
     static void registerTypes();
@@ -225,6 +296,26 @@ private:
     QExplicitlySharedDataPointer<MixedEnumUsageMessage_QtProtobufData> dptr;
 };
 namespace MixedEnumUsageMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(MixedEnumUsageMessage)
+
+enum class QtProtobufFieldEnum {
+    LocalEnumProtoFieldNumber = 1,
+    LocalEnumListProtoFieldNumber = 2,
+    LocalEnumMapProtoFieldNumber = 3,
+    MsgListProtoFieldNumber = 4,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+enum LocalEnum : int32_t {
+    LOCAL_ENUM_VALUE0 = 0,
+    LOCAL_ENUM_VALUE1 = 1,
+    LOCAL_ENUM_VALUE2 = 2,
+    LOCAL_ENUM_VALUE3 = 3,
+};
+Q_ENUM_NS(LocalEnum)
+
+using LocalEnumRepeated = QList<LocalEnum>;
 
 class NestedEnumHolder_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT NestedEnumHolder : public QProtobufMessage
@@ -235,13 +326,8 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT NestedEnumHolder : public QProtobufMe
     QML_VALUE_TYPE(nestedEnumHolder)
 
 public:
-    enum LocalEnum : int32_t {
-        NESTED_LOCAL_ENUM_VALUE0 = 0,
-        NESTED_LOCAL_ENUM_VALUE1 = 1,
-        NESTED_LOCAL_ENUM_VALUE2 = 2,
-        NESTED_LOCAL_ENUM_VALUE3 = 3,
-    };
-    Q_ENUM(LocalEnum)
+    using QtProtobufFieldEnum = NestedEnumHolder_QtProtobufNested::QtProtobufFieldEnum;
+    using LocalEnum = NestedEnumHolder_QtProtobufNested::LocalEnum;
     using LocalEnumRepeated = QList<LocalEnum>;
     NestedEnumHolder();
     ~NestedEnumHolder();
@@ -256,6 +342,20 @@ public:
 private:
     QExplicitlySharedDataPointer<NestedEnumHolder_QtProtobufData> dptr;
 };
+namespace NestedEnumHolder_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(NestedEnumHolder)
+
+enum LocalEnum : int32_t {
+    NESTED_LOCAL_ENUM_VALUE0 = 0,
+    NESTED_LOCAL_ENUM_VALUE1 = 1,
+    NESTED_LOCAL_ENUM_VALUE2 = 2,
+    NESTED_LOCAL_ENUM_VALUE3 = 3,
+};
+Q_ENUM_NS(LocalEnum)
+
+using LocalEnumRepeated = QList<LocalEnum>;
+} // namespace NestedEnumHolder_QtProtobufNested
 
 class NestedEnumHolderLevel1_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT NestedEnumHolderLevel1 : public QProtobufMessage
@@ -266,11 +366,8 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT NestedEnumHolderLevel1 : public QProt
     QML_VALUE_TYPE(nestedEnumHolderLevel1)
 
 public:
-    enum LocalEnum : int32_t {
-        NESTED_LEVEL1_LOCAL_ENUM_VALUE0 = 0,
-        NESTED_LEVEL1_LOCAL_ENUM_VALUE1 = 1,
-    };
-    Q_ENUM(LocalEnum)
+    using QtProtobufFieldEnum = NestedEnumHolderLevel1_QtProtobufNested::QtProtobufFieldEnum;
+    using LocalEnum = NestedEnumHolderLevel1_QtProtobufNested::LocalEnum;
     using LocalEnumRepeated = QList<LocalEnum>;
     using NestedEnumHolderLevel2 = NestedEnumHolderLevel1_QtProtobufNested::NestedEnumHolderLevel2;
     using NestedEnumHolderLevel2Repeated = NestedEnumHolderLevel1_QtProtobufNested::NestedEnumHolderLevel2Repeated;
@@ -288,6 +385,16 @@ private:
     QExplicitlySharedDataPointer<NestedEnumHolderLevel1_QtProtobufData> dptr;
 };
 namespace NestedEnumHolderLevel1_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(NestedEnumHolderLevel1)
+
+enum LocalEnum : int32_t {
+    NESTED_LEVEL1_LOCAL_ENUM_VALUE0 = 0,
+    NESTED_LEVEL1_LOCAL_ENUM_VALUE1 = 1,
+};
+Q_ENUM_NS(LocalEnum)
+
+using LocalEnumRepeated = QList<LocalEnum>;
 
 class NestedEnumHolderLevel2_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT NestedEnumHolderLevel2 : public QProtobufMessage
@@ -298,11 +405,8 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT NestedEnumHolderLevel2 : public QProt
     QML_VALUE_TYPE(nestedEnumHolderLevel2)
 
 public:
-    enum LocalEnum : int32_t {
-        NESTED_LEVEL2_LOCAL_ENUM_VALUE0 = 0,
-        NESTED_LEVEL2_LOCAL_ENUM_VALUE1 = 1,
-    };
-    Q_ENUM(LocalEnum)
+    using QtProtobufFieldEnum = NestedEnumHolderLevel2_QtProtobufNested::QtProtobufFieldEnum;
+    using LocalEnum = NestedEnumHolderLevel2_QtProtobufNested::LocalEnum;
     using LocalEnumRepeated = QList<LocalEnum>;
     NestedEnumHolderLevel2();
     ~NestedEnumHolderLevel2();
@@ -317,6 +421,18 @@ public:
 private:
     QExplicitlySharedDataPointer<NestedEnumHolderLevel2_QtProtobufData> dptr;
 };
+namespace NestedEnumHolderLevel2_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(NestedEnumHolderLevel2)
+
+enum LocalEnum : int32_t {
+    NESTED_LEVEL2_LOCAL_ENUM_VALUE0 = 0,
+    NESTED_LEVEL2_LOCAL_ENUM_VALUE1 = 1,
+};
+Q_ENUM_NS(LocalEnum)
+
+using LocalEnumRepeated = QList<LocalEnum>;
+} // namespace NestedEnumHolderLevel2_QtProtobufNested
 } // namespace NestedEnumHolderLevel1_QtProtobufNested
 
 class NestedEnumMessage_QtProtobufData;
@@ -333,15 +449,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT NestedEnumMessage : public QProtobufM
     Q_PROPERTY(qtprotobufnamespace::tests::MixedEnumUsageMessage::NestedEnumHolderLevel1::NestedEnumHolderLevel2::LocalEnum localEnumField5 READ localEnumField5 WRITE setLocalEnumField5 SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        LocalEnumFieldProtoFieldNumber = 1,
-        LocalEnumField2ProtoFieldNumber = 2,
-        LocalEnumField3ProtoFieldNumber = 3,
-        LocalEnumField4ProtoFieldNumber = 4,
-        LocalEnumField5ProtoFieldNumber = 5,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = NestedEnumMessage_QtProtobufNested::QtProtobufFieldEnum;
     NestedEnumMessage();
     ~NestedEnumMessage();
     NestedEnumMessage(const NestedEnumMessage &other);
@@ -351,25 +459,39 @@ public:
     bool operator ==(const NestedEnumMessage &other) const;
     bool operator !=(const NestedEnumMessage &other) const;
 
-    MixedEnumUsageMessage::LocalEnum localEnumField() const;
+    MixedEnumUsageMessage_QtProtobufNested::LocalEnum localEnumField() const;
 
-    RepeatedEnumMessage::LocalEnum localEnumField2() const;
+    RepeatedEnumMessage_QtProtobufNested::LocalEnum localEnumField2() const;
 
-    MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolder::LocalEnum localEnumField3() const;
+    MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolder_QtProtobufNested::LocalEnum localEnumField3() const;
 
-    MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1::LocalEnum localEnumField4() const;
+    MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::LocalEnum localEnumField4() const;
 
-    MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::NestedEnumHolderLevel2::LocalEnum localEnumField5() const;
-    void setLocalEnumField(const MixedEnumUsageMessage::LocalEnum &localEnumField);
-    void setLocalEnumField2(const RepeatedEnumMessage::LocalEnum &localEnumField2);
-    void setLocalEnumField3(const MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolder::LocalEnum &localEnumField3);
-    void setLocalEnumField4(const MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1::LocalEnum &localEnumField4);
-    void setLocalEnumField5(const MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::NestedEnumHolderLevel2::LocalEnum &localEnumField5);
+    MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::NestedEnumHolderLevel2_QtProtobufNested::LocalEnum localEnumField5() const;
+    void setLocalEnumField(const MixedEnumUsageMessage_QtProtobufNested::LocalEnum &localEnumField);
+    void setLocalEnumField2(const RepeatedEnumMessage_QtProtobufNested::LocalEnum &localEnumField2);
+    void setLocalEnumField3(const MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolder_QtProtobufNested::LocalEnum &localEnumField3);
+    void setLocalEnumField4(const MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::LocalEnum &localEnumField4);
+    void setLocalEnumField5(const MixedEnumUsageMessage_QtProtobufNested::NestedEnumHolderLevel1_QtProtobufNested::NestedEnumHolderLevel2_QtProtobufNested::LocalEnum &localEnumField5);
     static void registerTypes();
 
 private:
     QExplicitlySharedDataPointer<NestedEnumMessage_QtProtobufData> dptr;
 };
+namespace NestedEnumMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(NestedEnumMessage)
+
+enum class QtProtobufFieldEnum {
+    LocalEnumFieldProtoFieldNumber = 1,
+    LocalEnumField2ProtoFieldNumber = 2,
+    LocalEnumField3ProtoFieldNumber = 3,
+    LocalEnumField4ProtoFieldNumber = 4,
+    LocalEnumField5ProtoFieldNumber = 5,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace NestedEnumMessage_QtProtobufNested
 } // namespace MixedEnumUsageMessage_QtProtobufNested
 
 class SimpleFileEnumMessage_QtProtobufData;
@@ -383,12 +505,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT SimpleFileEnumMessage : public QProto
     Q_PROPERTY(qtprotobufnamespace::tests::TestEnumGadget::TestEnumRepeated globalEnumList READ globalEnumList WRITE setGlobalEnumList SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        GlobalEnumProtoFieldNumber = 1,
-        GlobalEnumListProtoFieldNumber = 2,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = SimpleFileEnumMessage_QtProtobufNested::QtProtobufFieldEnum;
     SimpleFileEnumMessage();
     ~SimpleFileEnumMessage();
     SimpleFileEnumMessage(const SimpleFileEnumMessage &other);
@@ -409,6 +526,17 @@ public:
 private:
     QExplicitlySharedDataPointer<SimpleFileEnumMessage_QtProtobufData> dptr;
 };
+namespace SimpleFileEnumMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(SimpleFileEnumMessage)
+
+enum class QtProtobufFieldEnum {
+    GlobalEnumProtoFieldNumber = 1,
+    GlobalEnumListProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace SimpleFileEnumMessage_QtProtobufNested
 
 class StepChildEnumMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT StepChildEnumMessage : public QProtobufMessage
@@ -421,12 +549,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT StepChildEnumMessage : public QProtob
     Q_PROPERTY(qtprotobufnamespace::tests::SimpleEnumMessage::LocalEnumRepeated localStepChildList READ localStepChildList WRITE setLocalStepChildList SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        LocalStepChildEnumProtoFieldNumber = 1,
-        LocalStepChildListProtoFieldNumber = 2,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = StepChildEnumMessage_QtProtobufNested::QtProtobufFieldEnum;
     StepChildEnumMessage();
     ~StepChildEnumMessage();
     StepChildEnumMessage(const StepChildEnumMessage &other);
@@ -436,17 +559,122 @@ public:
     bool operator ==(const StepChildEnumMessage &other) const;
     bool operator !=(const StepChildEnumMessage &other) const;
 
-    SimpleEnumMessage::LocalEnum localStepChildEnum() const;
+    SimpleEnumMessage_QtProtobufNested::LocalEnum localStepChildEnum() const;
 
-    SimpleEnumMessage::LocalEnumRepeated localStepChildList() const;
-    SimpleEnumMessage::LocalEnumRepeated &localStepChildList();
-    void setLocalStepChildEnum(const SimpleEnumMessage::LocalEnum &localStepChildEnum);
-    void setLocalStepChildList(const SimpleEnumMessage::LocalEnumRepeated &localStepChildList);
+    SimpleEnumMessage_QtProtobufNested::LocalEnumRepeated localStepChildList() const;
+    SimpleEnumMessage_QtProtobufNested::LocalEnumRepeated &localStepChildList();
+    void setLocalStepChildEnum(const SimpleEnumMessage_QtProtobufNested::LocalEnum &localStepChildEnum);
+    void setLocalStepChildList(const SimpleEnumMessage_QtProtobufNested::LocalEnumRepeated &localStepChildList);
     static void registerTypes();
 
 private:
     QExplicitlySharedDataPointer<StepChildEnumMessage_QtProtobufData> dptr;
 };
+namespace StepChildEnumMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(StepChildEnumMessage)
+
+enum class QtProtobufFieldEnum {
+    LocalStepChildEnumProtoFieldNumber = 1,
+    LocalStepChildListProtoFieldNumber = 2,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace StepChildEnumMessage_QtProtobufNested
+
+class A_QtProtobufData;
+class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT A : public QProtobufMessage
+{
+    Q_GADGET
+    Q_PROTOBUF_OBJECT
+    Q_DECLARE_PROTOBUF_SERIALIZERS(A)
+    QML_VALUE_TYPE(a)
+    Q_PROPERTY(qtprotobufnamespace::tests::B::BEnum val READ val WRITE setVal SCRIPTABLE true)
+
+public:
+    using QtProtobufFieldEnum = A_QtProtobufNested::QtProtobufFieldEnum;
+    using AEnum = A_QtProtobufNested::AEnum;
+    using AEnumRepeated = QList<AEnum>;
+    A();
+    ~A();
+    A(const A &other);
+    A &operator =(const A &other);
+    A(A &&other) noexcept;
+    A &operator =(A &&other) noexcept;
+    bool operator ==(const A &other) const;
+    bool operator !=(const A &other) const;
+
+    B_QtProtobufNested::BEnum val() const;
+    void setVal(const B_QtProtobufNested::BEnum &val);
+    static void registerTypes();
+
+private:
+    QExplicitlySharedDataPointer<A_QtProtobufData> dptr;
+};
+namespace A_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(A)
+
+enum class QtProtobufFieldEnum {
+    ValProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+enum AEnum : int32_t {
+    AVal0 = 0,
+    AVal1 = 1,
+};
+Q_ENUM_NS(AEnum)
+
+using AEnumRepeated = QList<AEnum>;
+} // namespace A_QtProtobufNested
+
+class B_QtProtobufData;
+class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT B : public QProtobufMessage
+{
+    Q_GADGET
+    Q_PROTOBUF_OBJECT
+    Q_DECLARE_PROTOBUF_SERIALIZERS(B)
+    QML_VALUE_TYPE(b)
+    Q_PROPERTY(qtprotobufnamespace::tests::A::AEnum val READ val WRITE setVal SCRIPTABLE true)
+
+public:
+    using QtProtobufFieldEnum = B_QtProtobufNested::QtProtobufFieldEnum;
+    using BEnum = B_QtProtobufNested::BEnum;
+    using BEnumRepeated = QList<BEnum>;
+    B();
+    ~B();
+    B(const B &other);
+    B &operator =(const B &other);
+    B(B &&other) noexcept;
+    B &operator =(B &&other) noexcept;
+    bool operator ==(const B &other) const;
+    bool operator !=(const B &other) const;
+
+    A_QtProtobufNested::AEnum val() const;
+    void setVal(const A_QtProtobufNested::AEnum &val);
+    static void registerTypes();
+
+private:
+    QExplicitlySharedDataPointer<B_QtProtobufData> dptr;
+};
+namespace B_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(B)
+
+enum class QtProtobufFieldEnum {
+    ValProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+enum BEnum : int32_t {
+    BVal0 = 0,
+    BVal1 = 1,
+};
+Q_ENUM_NS(BEnum)
+
+using BEnumRepeated = QList<BEnum>;
+} // namespace B_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleEnumMessage)
@@ -458,4 +686,6 @@ Q_DECLARE_METATYPE(qtprotobufnamespace::tests::MixedEnumUsageMessage::NestedEnum
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::MixedEnumUsageMessage::NestedEnumMessage)
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::SimpleFileEnumMessage)
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::StepChildEnumMessage)
+Q_DECLARE_METATYPE(qtprotobufnamespace::tests::A)
+Q_DECLARE_METATYPE(qtprotobufnamespace::tests::B)
 #endif // QPROTOBUF_ENUMMESSAGES_H
diff --git a/tests/auto/protobufgen/data/expected_result/qmlgen/enummessages_protobuftyperegistrations.cpp b/tests/auto/protobufgen/data/expected_result/qmlgen/enummessages_protobuftyperegistrations.cpp
index 73739da..659a722 100644
--- a/tests/auto/protobufgen/data/expected_result/qmlgen/enummessages_protobuftyperegistrations.cpp
+++ b/tests/auto/protobufgen/data/expected_result/qmlgen/enummessages_protobuftyperegistrations.cpp
@@ -15,5 +15,7 @@ static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarNestedEnumMessage(qRegis
 static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarMixedEnumUsageMessage(qRegisterProtobufType<MixedEnumUsageMessage>);
 static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarSimpleFileEnumMessage(qRegisterProtobufType<SimpleFileEnumMessage>);
 static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarStepChildEnumMessage(qRegisterProtobufType<StepChildEnumMessage>);
+static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarA(qRegisterProtobufType<A>);
+static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarB(qRegisterProtobufType<B>);
 } // namespace qtprotobufnamespace::tests
 
diff --git a/tests/auto/protobufgen/data/expected_result/qmlgen/qtprotobufnamespace_testsplugin.cpp b/tests/auto/protobufgen/data/expected_result/qmlgen/qtprotobufnamespace_testsplugin.cpp
deleted file mode 100644
index c57b2c6..0000000
--- a/tests/auto/protobufgen/data/expected_result/qmlgen/qtprotobufnamespace_testsplugin.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
-
-#include <QtQml/qqmlextensionplugin.h>
-#include <QtQml/qqml.h>
-#include <QtQml/qqmlengine.h>
-#include <QtProtobuf/qtprotobuftypes.h>
-#include "basicmessages.qpb.h"
-#include "enummessages.qpb.h"
-#include "repeatedmessages.qpb.h"
-
-#if defined(QT_SHARED) || !defined(QT_STATIC)
-#  define QPB_QML_EXPORT Q_DECL_EXPORT
-#else
-#  define QPB_QML_EXPORT
-#endif
-
-extern void qml_register_types_qtprotobufnamespace_tests();
-Q_GHS_KEEP_REFERENCE(qml_register_types_qtprotobufnamespace_tests);
-
-class QPB_QML_EXPORT QtprotobufnamespaceTestsPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
-
-public:
-    QtprotobufnamespaceTestsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
-
-    void registerTypes(const char *uri) override
-    {
-        Q_ASSERT(uri == QLatin1String("qtprotobufnamespace.tests"));
-        volatile auto registration = &qml_register_types_qtprotobufnamespace_tests;
-        Q_UNUSED(registration);
-        qmlRegisterModule(uri, 1, 0);
-        qmlRegisterUncreatableMetaObject(
-            qtprotobufnamespace::tests::SimpleEnumMessage::staticMetaObject,
-            uri, 1, 0, "SimpleEnumMessage", "You can only use the nested enums of SimpleEnumMessage, but not create its instances in QML scope.");
-        qmlRegisterUncreatableMetaObject(
-            qtprotobufnamespace::tests::RepeatedEnumMessage::staticMetaObject,
-            uri, 1, 0, "RepeatedEnumMessage", "You can only use the nested enums of RepeatedEnumMessage, but not create its instances in QML scope.");
-        qmlRegisterUncreatableMetaObject(
-            qtprotobufnamespace::tests::MixedEnumUsageMessage::staticMetaObject,
-            uri, 1, 0, "MixedEnumUsageMessage", "You can only use the nested enums of MixedEnumUsageMessage, but not create its instances in QML scope.");
-        qmlRegisterUncreatableMetaObject(
-            qtprotobufnamespace::tests::TestEnumGadget::staticMetaObject,
-            uri, 1, 0, "TestEnum", "You can only use the nested enums of TestEnum, but not create its instances in QML scope.");
-        qmlRegisterUncreatableMetaObject(
-            qtprotobufnamespace::tests::TestEnumSecondInFileGadget::staticMetaObject,
-            uri, 1, 0, "TestEnumSecondInFile", "You can only use the nested enums of TestEnumSecondInFile, but not create its instances in QML scope.");
-        qRegisterProtobufTypes();
-    }
-
-};
-#include "qtprotobufnamespace_testsplugin.moc"
diff --git a/tests/auto/protobufgen/data/expected_result/qmlgen/repeatedmessages.qpb.h b/tests/auto/protobufgen/data/expected_result/qmlgen/repeatedmessages.qpb.h
index e938b8e..9bbe53d 100644
--- a/tests/auto/protobufgen/data/expected_result/qmlgen/repeatedmessages.qpb.h
+++ b/tests/auto/protobufgen/data/expected_result/qmlgen/repeatedmessages.qpb.h
@@ -33,36 +33,100 @@
 namespace qtprotobufnamespace::tests {
 class RepeatedStringMessage;
 using RepeatedStringMessageRepeated = QList<RepeatedStringMessage>;
+namespace RepeatedStringMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedStringMessage_QtProtobufNested
+
 class RepeatedDoubleMessage;
 using RepeatedDoubleMessageRepeated = QList<RepeatedDoubleMessage>;
+namespace RepeatedDoubleMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedDoubleMessage_QtProtobufNested
+
 class RepeatedBytesMessage;
 using RepeatedBytesMessageRepeated = QList<RepeatedBytesMessage>;
+namespace RepeatedBytesMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedBytesMessage_QtProtobufNested
+
 class RepeatedFloatMessage;
 using RepeatedFloatMessageRepeated = QList<RepeatedFloatMessage>;
+namespace RepeatedFloatMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedFloatMessage_QtProtobufNested
+
 class RepeatedComplexMessage;
 using RepeatedComplexMessageRepeated = QList<RepeatedComplexMessage>;
+namespace RepeatedComplexMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedComplexMessage_QtProtobufNested
+
 class RepeatedSIntMessage;
 using RepeatedSIntMessageRepeated = QList<RepeatedSIntMessage>;
+namespace RepeatedSIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedSIntMessage_QtProtobufNested
+
 class RepeatedIntMessage;
 using RepeatedIntMessageRepeated = QList<RepeatedIntMessage>;
+namespace RepeatedIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedIntMessage_QtProtobufNested
+
 class RepeatedUIntMessage;
 using RepeatedUIntMessageRepeated = QList<RepeatedUIntMessage>;
+namespace RepeatedUIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedUIntMessage_QtProtobufNested
+
 class RepeatedSInt64Message;
 using RepeatedSInt64MessageRepeated = QList<RepeatedSInt64Message>;
+namespace RepeatedSInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedSInt64Message_QtProtobufNested
+
 class RepeatedInt64Message;
 using RepeatedInt64MessageRepeated = QList<RepeatedInt64Message>;
+namespace RepeatedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedInt64Message_QtProtobufNested
+
 class RepeatedUInt64Message;
 using RepeatedUInt64MessageRepeated = QList<RepeatedUInt64Message>;
+namespace RepeatedUInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedUInt64Message_QtProtobufNested
+
 class RepeatedFixedIntMessage;
 using RepeatedFixedIntMessageRepeated = QList<RepeatedFixedIntMessage>;
+namespace RepeatedFixedIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedFixedIntMessage_QtProtobufNested
+
 class RepeatedSFixedIntMessage;
 using RepeatedSFixedIntMessageRepeated = QList<RepeatedSFixedIntMessage>;
+namespace RepeatedSFixedIntMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedSFixedIntMessage_QtProtobufNested
+
 class RepeatedFixedInt64Message;
 using RepeatedFixedInt64MessageRepeated = QList<RepeatedFixedInt64Message>;
+namespace RepeatedFixedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedFixedInt64Message_QtProtobufNested
+
 class RepeatedSFixedInt64Message;
 using RepeatedSFixedInt64MessageRepeated = QList<RepeatedSFixedInt64Message>;
+namespace RepeatedSFixedInt64Message_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedSFixedInt64Message_QtProtobufNested
+
 class RepeatedBoolMessage;
 using RepeatedBoolMessageRepeated = QList<RepeatedBoolMessage>;
+namespace RepeatedBoolMessage_QtProtobufNested {
+enum class QtProtobufFieldEnum;
+} // namespace RepeatedBoolMessage_QtProtobufNested
+
 
 class RepeatedStringMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedStringMessage : public QProtobufMessage
@@ -74,11 +138,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedStringMessage : public QProto
     Q_PROPERTY(QStringList testRepeatedString READ testRepeatedString WRITE setTestRepeatedString SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedStringProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedStringMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedStringMessage();
     ~RepeatedStringMessage();
     RepeatedStringMessage(const RepeatedStringMessage &other);
@@ -96,6 +156,16 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedStringMessage_QtProtobufData> dptr;
 };
+namespace RepeatedStringMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(RepeatedStringMessage)
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedStringProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedStringMessage_QtProtobufNested
 
 class RepeatedDoubleMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedDoubleMessage : public QProtobufMessage
@@ -107,11 +177,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedDoubleMessage : public QProto
     Q_PROPERTY(QtProtobuf::doubleList testRepeatedDouble READ testRepeatedDouble WRITE setTestRepeatedDouble SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedDoubleProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedDoubleMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedDoubleMessage();
     ~RepeatedDoubleMessage();
     RepeatedDoubleMessage(const RepeatedDoubleMessage &other);
@@ -129,6 +195,16 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedDoubleMessage_QtProtobufData> dptr;
 };
+namespace RepeatedDoubleMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(RepeatedDoubleMessage)
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedDoubleProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedDoubleMessage_QtProtobufNested
 
 class RepeatedBytesMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedBytesMessage : public QProtobufMessage
@@ -140,11 +216,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedBytesMessage : public QProtob
     Q_PROPERTY(QByteArrayList testRepeatedBytes READ testRepeatedBytes WRITE setTestRepeatedBytes SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedBytesProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedBytesMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedBytesMessage();
     ~RepeatedBytesMessage();
     RepeatedBytesMessage(const RepeatedBytesMessage &other);
@@ -162,6 +234,16 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedBytesMessage_QtProtobufData> dptr;
 };
+namespace RepeatedBytesMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(RepeatedBytesMessage)
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedBytesProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedBytesMessage_QtProtobufNested
 
 class RepeatedFloatMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedFloatMessage : public QProtobufMessage
@@ -173,11 +255,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedFloatMessage : public QProtob
     Q_PROPERTY(QtProtobuf::floatList testRepeatedFloat READ testRepeatedFloat WRITE setTestRepeatedFloat SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedFloatProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedFloatMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedFloatMessage();
     ~RepeatedFloatMessage();
     RepeatedFloatMessage(const RepeatedFloatMessage &other);
@@ -195,6 +273,16 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedFloatMessage_QtProtobufData> dptr;
 };
+namespace RepeatedFloatMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(RepeatedFloatMessage)
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedFloatProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedFloatMessage_QtProtobufNested
 
 class RepeatedComplexMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedComplexMessage : public QProtobufMessage
@@ -206,11 +294,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedComplexMessage : public QProt
     Q_PROPERTY(qtprotobufnamespace::tests::ComplexMessageRepeated testRepeatedComplexData READ testRepeatedComplex WRITE setTestRepeatedComplex SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedComplexProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedComplexMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedComplexMessage();
     ~RepeatedComplexMessage();
     RepeatedComplexMessage(const RepeatedComplexMessage &other);
@@ -228,6 +312,16 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedComplexMessage_QtProtobufData> dptr;
 };
+namespace RepeatedComplexMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(RepeatedComplexMessage)
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedComplexProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedComplexMessage_QtProtobufNested
 
 class RepeatedSIntMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedSIntMessage : public QProtobufMessage
@@ -239,11 +333,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedSIntMessage : public QProtobu
     Q_PROPERTY(QtProtobuf::sint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedSIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedSIntMessage();
     ~RepeatedSIntMessage();
     RepeatedSIntMessage(const RepeatedSIntMessage &other);
@@ -261,6 +351,16 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedSIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedSIntMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(RepeatedSIntMessage)
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedSIntMessage_QtProtobufNested
 
 class RepeatedIntMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedIntMessage : public QProtobufMessage
@@ -272,11 +372,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedIntMessage : public QProtobuf
     Q_PROPERTY(QtProtobuf::int32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedIntMessage();
     ~RepeatedIntMessage();
     RepeatedIntMessage(const RepeatedIntMessage &other);
@@ -294,6 +390,16 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedIntMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(RepeatedIntMessage)
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedIntMessage_QtProtobufNested
 
 class RepeatedUIntMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedUIntMessage : public QProtobufMessage
@@ -305,11 +411,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedUIntMessage : public QProtobu
     Q_PROPERTY(QtProtobuf::uint32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedUIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedUIntMessage();
     ~RepeatedUIntMessage();
     RepeatedUIntMessage(const RepeatedUIntMessage &other);
@@ -327,6 +429,16 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedUIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedUIntMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(RepeatedUIntMessage)
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedUIntMessage_QtProtobufNested
 
 class RepeatedSInt64Message_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedSInt64Message : public QProtobufMessage
@@ -338,11 +450,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedSInt64Message : public QProto
     Q_PROPERTY(QtProtobuf::sint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedSInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedSInt64Message();
     ~RepeatedSInt64Message();
     RepeatedSInt64Message(const RepeatedSInt64Message &other);
@@ -360,6 +468,16 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedSInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedSInt64Message_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(RepeatedSInt64Message)
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedSInt64Message_QtProtobufNested
 
 class RepeatedInt64Message_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedInt64Message : public QProtobufMessage
@@ -371,11 +489,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedInt64Message : public QProtob
     Q_PROPERTY(QtProtobuf::int64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedInt64Message();
     ~RepeatedInt64Message();
     RepeatedInt64Message(const RepeatedInt64Message &other);
@@ -393,6 +507,16 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedInt64Message_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(RepeatedInt64Message)
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedInt64Message_QtProtobufNested
 
 class RepeatedUInt64Message_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedUInt64Message : public QProtobufMessage
@@ -404,11 +528,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedUInt64Message : public QProto
     Q_PROPERTY(QtProtobuf::uint64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedUInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedUInt64Message();
     ~RepeatedUInt64Message();
     RepeatedUInt64Message(const RepeatedUInt64Message &other);
@@ -426,6 +546,16 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedUInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedUInt64Message_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(RepeatedUInt64Message)
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedUInt64Message_QtProtobufNested
 
 class RepeatedFixedIntMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedFixedIntMessage : public QProtobufMessage
@@ -437,11 +567,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedFixedIntMessage : public QPro
     Q_PROPERTY(QtProtobuf::fixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedFixedIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedFixedIntMessage();
     ~RepeatedFixedIntMessage();
     RepeatedFixedIntMessage(const RepeatedFixedIntMessage &other);
@@ -459,6 +585,16 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedFixedIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedFixedIntMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(RepeatedFixedIntMessage)
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedFixedIntMessage_QtProtobufNested
 
 class RepeatedSFixedIntMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedSFixedIntMessage : public QProtobufMessage
@@ -470,11 +606,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedSFixedIntMessage : public QPr
     Q_PROPERTY(QtProtobuf::sfixed32List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedSFixedIntMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedSFixedIntMessage();
     ~RepeatedSFixedIntMessage();
     RepeatedSFixedIntMessage(const RepeatedSFixedIntMessage &other);
@@ -492,6 +624,16 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedSFixedIntMessage_QtProtobufData> dptr;
 };
+namespace RepeatedSFixedIntMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(RepeatedSFixedIntMessage)
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedSFixedIntMessage_QtProtobufNested
 
 class RepeatedFixedInt64Message_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedFixedInt64Message : public QProtobufMessage
@@ -503,11 +645,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedFixedInt64Message : public QP
     Q_PROPERTY(QtProtobuf::fixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedFixedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedFixedInt64Message();
     ~RepeatedFixedInt64Message();
     RepeatedFixedInt64Message(const RepeatedFixedInt64Message &other);
@@ -525,6 +663,16 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedFixedInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedFixedInt64Message_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(RepeatedFixedInt64Message)
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedFixedInt64Message_QtProtobufNested
 
 class RepeatedSFixedInt64Message_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedSFixedInt64Message : public QProtobufMessage
@@ -536,11 +684,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedSFixedInt64Message : public Q
     Q_PROPERTY(QtProtobuf::sfixed64List testRepeatedInt READ testRepeatedInt WRITE setTestRepeatedInt SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedIntProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedSFixedInt64Message_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedSFixedInt64Message();
     ~RepeatedSFixedInt64Message();
     RepeatedSFixedInt64Message(const RepeatedSFixedInt64Message &other);
@@ -558,6 +702,16 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedSFixedInt64Message_QtProtobufData> dptr;
 };
+namespace RepeatedSFixedInt64Message_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(RepeatedSFixedInt64Message)
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedIntProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedSFixedInt64Message_QtProtobufNested
 
 class RepeatedBoolMessage_QtProtobufData;
 class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedBoolMessage : public QProtobufMessage
@@ -569,11 +723,7 @@ class QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT RepeatedBoolMessage : public QProtobu
     Q_PROPERTY(QtProtobuf::boolList testRepeatedBool READ testRepeatedBool WRITE setTestRepeatedBool SCRIPTABLE true)
 
 public:
-    enum QtProtobufFieldEnum {
-        TestRepeatedBoolProtoFieldNumber = 1,
-    };
-    Q_ENUM(QtProtobufFieldEnum)
-
+    using QtProtobufFieldEnum = RepeatedBoolMessage_QtProtobufNested::QtProtobufFieldEnum;
     RepeatedBoolMessage();
     ~RepeatedBoolMessage();
     RepeatedBoolMessage(const RepeatedBoolMessage &other);
@@ -591,6 +741,16 @@ public:
 private:
     QExplicitlySharedDataPointer<RepeatedBoolMessage_QtProtobufData> dptr;
 };
+namespace RepeatedBoolMessage_QtProtobufNested {
+Q_NAMESPACE_EXPORT(QPB_TST_QTPROTOBUFGEN_QML_GEN_EXPORT)
+QML_NAMED_ELEMENT(RepeatedBoolMessage)
+
+enum class QtProtobufFieldEnum {
+    TestRepeatedBoolProtoFieldNumber = 1,
+};
+Q_ENUM_NS(QtProtobufFieldEnum)
+
+} // namespace RepeatedBoolMessage_QtProtobufNested
 } // namespace qtprotobufnamespace::tests
 
 Q_DECLARE_METATYPE(qtprotobufnamespace::tests::RepeatedStringMessage)
diff --git a/tests/auto/protobufgen/tst_qtprotobufgen.cpp b/tests/auto/protobufgen/tst_qtprotobufgen.cpp
index 15c4b14..f9472d7 100644
--- a/tests/auto/protobufgen/tst_qtprotobufgen.cpp
+++ b/tests/auto/protobufgen/tst_qtprotobufgen.cpp
@@ -14,10 +14,6 @@
 
 using namespace Qt::StringLiterals;
 
-[[maybe_unused]] const QLatin1StringView
-qmlProtobufTypeRegistration("qtprotobufnamespace_testsplugin.cpp");
-const QLatin1StringView protobuftyperegistrations("_protobuftyperegistrations.cpp");
-[[maybe_unused]] const QLatin1StringView protobufQmlPlugin("_uri_testplugin.cpp");
 const QLatin1StringView cppExtension(".qpb.cpp");
 const QLatin1StringView headerExtension(".qpb.h");
 const QLatin1StringView protocGenQtprotobufKey(" --plugin=protoc-gen-qtprotobuf=");
@@ -200,8 +196,7 @@ void tst_qtprotobufgen::cmakeGeneratedFile_data()
     QTest::addColumn<QString>("folder");
     QTest::addColumn<QString>("extension");
 
-    const QLatin1StringView extensions[]
-            = {protobuftyperegistrations, cppExtension, headerExtension};
+    const QLatin1StringView extensions[] = {cppExtension, headerExtension};
 
     for (const auto extension : extensions) {
         QTest::addRow("repeatednonpackedmessages%s", extension.data())
@@ -251,13 +246,8 @@ void tst_qtprotobufgen::cmakeGeneratedFile_data()
 #endif
     }
 #ifdef HAVE_QML
-    QTest::addRow("nopackage%s", protobufQmlPlugin.data())
-            << "nopackage"
-            << "/qml-no-package/"
-            << QString(protobufQmlPlugin);
-
     const QLatin1StringView qmlExtensions[]
-            = {protobuftyperegistrations, cppExtension,
+            = {cppExtension,
                 headerExtension};
 
     for (const auto extension : qmlExtensions) {
@@ -271,11 +261,6 @@ void tst_qtprotobufgen::cmakeGeneratedFile_data()
                 << "/qmlgen/"
                 << QString(extension);
     }
-
-    QTest::addRow("QML plugin file: %s", qmlProtobufTypeRegistration.data())
-            << ""
-            << "/qmlgen/"
-            << QString(qmlProtobufTypeRegistration);
 #endif
 }
 
@@ -322,7 +307,7 @@ void tst_qtprotobufgen::cmdLineGeneratedFile_data()
     QTest::addColumn<QString>("generatedFolderStructure");
 
     const QLatin1StringView extensions[]
-            = {protobuftyperegistrations, cppExtension, headerExtension};
+            = {cppExtension, headerExtension};
 
     for (const auto extension : extensions) {
         QTest::addRow("basicmessages%s", extension.data())
@@ -382,14 +367,6 @@ void tst_qtprotobufgen::cmdLineGeneratedFile_data()
                 << "";
 #endif
     }
-#ifdef HAVE_QML
-    QTest::addRow("nopackage%s", protobufQmlPlugin.data())
-            << "nopackage"
-            << "QML_URI=nopackage.uri.test;EXPORT_MACRO=TST_QTPROTOBUFGEN_NOPACKAGE_QML_GEN"
-            << "/qml-no-package/"
-            << QString(protobufQmlPlugin)
-            << "";
-#endif
 }
 
 void tst_qtprotobufgen::cmdLineGeneratedFile()
@@ -458,7 +435,7 @@ void tst_qtprotobufgen::cmdLineGeneratedNoOptions_data()
     QTest::addColumn<QString>("extension");
 
     const QLatin1StringView extensions[]
-            = {protobuftyperegistrations, cppExtension, headerExtension};
+            = {cppExtension, headerExtension};
 
     for (const auto extension : extensions) {
         QTest::addRow("annotation%s", extension.data())
diff --git a/tests/auto/protobufqml/enums/qml/tst_enumtypes.qml b/tests/auto/protobufqml/enums/qml/tst_enumtypes.qml
index 305dd90..4c35b51 100644
--- a/tests/auto/protobufqml/enums/qml/tst_enumtypes.qml
+++ b/tests/auto/protobufqml/enums/qml/tst_enumtypes.qml
@@ -18,6 +18,9 @@ TestCase {
     property EnumPack_.simpleEnumMessage localEnumMessage2
     property EnumPack_.mixedEnumUsageMessage localMixedEnumMessage2
 
+    property b shortBName;
+    property a shortAName;
+
     function test_1init() {
         localEnumMessage.localEnum = SimpleEnumMessage.LOCAL_ENUM_VALUE3
         localEnumMessage2.localEnum = EnumPack_.SimpleEnumMessage.LOCAL_ENUM_VALUE3
@@ -46,6 +49,9 @@ TestCase {
                     SimpleEnumMessage.LOCAL_ENUM_VALUE0,
                     SimpleEnumMessage.LOCAL_ENUM_VALUE1
                 ]
+
+        shortBName.val = A.AVal1
+        shortAName.val = B.BVal0
     }
 
     function test_enumValues_data() {
@@ -164,6 +170,10 @@ TestCase {
                     { tag: "EnumPack_.MixedEnumUsageMessage.LocalEnumMapProtoFieldNumber == 3",
                         field: EnumPack_.MixedEnumUsageMessage.LocalEnumMapProtoFieldNumber,
                         answer: 3 },
+                    { tag: "A.AVal0 == 0", field: A.AVal0, answer: 0 },
+                    { tag: "A.AVal1 == 1", field: A.AVal1, answer: 1 },
+                    { tag: "B.BVal0 == 0", field: B.BVal0, answer: 0 },
+                    { tag: "B.BVal1 == 1", field: B.BVal1, answer: 1 }
                 ]
     }
author	Alexey Edelev <alexey.edelev@qt.io>	2023-08-05 17:10:53 +0200
committer	Alexey Edelev <alexey.edelev@qt.io>	2023-08-18 19:01:25 +0200
commit	b089a773e9a9af6f06d1a18cb8776f4a5fedcd1c (patch)
tree	12c6afbbb82c20e69cdde1a64ea3c26d658e9f73
parent	b839d2d7573f2d53164b47e198dcf70dfeb55c1f (diff)