3 files changed, 7 insertions, 4 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 625e1e6733e..7aa0628168d 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -55,11 +55,12 @@ QT_FOR_EACH_STATIC_TYPE(RETURN_METATYPENAME_STRING)
     return nullptr;
  }
 
- Generator::Generator(ClassDef *classDef, const QList<QByteArray> &metaTypes,
+ Generator::Generator(Moc *moc, ClassDef *classDef, const QList<QByteArray> &metaTypes,
                       const QHash<QByteArray, QByteArray> &knownQObjectClasses,
                       const QHash<QByteArray, QByteArray> &knownGadgets, FILE *outfile,
                       bool requireCompleteTypes)
-     : out(outfile),
+     : parser(moc),
+       out(outfile),
        cdef(classDef),
        metaTypes(metaTypes),
        knownQObjectClasses(knownQObjectClasses),
diff --git a/src/tools/moc/generator.h b/src/tools/moc/generator.h
index ac295577692..91f8e00d61b 100644
--- a/src/tools/moc/generator.h
+++ b/src/tools/moc/generator.h
@@ -10,12 +10,13 @@ QT_BEGIN_NAMESPACE
 
 class Generator
 {
+    Moc *parser = nullptr;
     FILE *out;
     ClassDef *cdef;
     QList<uint> meta_data;
 
 public:
-    Generator(ClassDef *classDef, const QList<QByteArray> &metaTypes,
+    Generator(Moc *moc, ClassDef *classDef, const QList<QByteArray> &metaTypes,
               const QHash<QByteArray, QByteArray> &knownQObjectClasses,
               const QHash<QByteArray, QByteArray> &knownGadgets, FILE *outfile = nullptr,
               bool requireCompleteTypes = false);
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index d04f2d079ee..f8c36a5abdd 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -1136,7 +1136,8 @@ void Moc::generate(FILE *out, FILE *jsonOutput)
 
     fputs("", out);
     for (int i = 0; i < classList.size(); ++i) {
-        Generator generator(&classList[i], metaTypes, knownQObjectClasses, knownGadgets, out, requireCompleteTypes);
+        Generator generator(this, &classList[i], metaTypes, knownQObjectClasses, knownGadgets, out,
+                            requireCompleteTypes);
         generator.generateCode();
 
         // generator.generateCode() should have already registered all strings