diff --git a/src/core/kernel/qobjectdefs.h b/src/core/kernel/qobjectdefs.h
index e4d3fc9ce..f9a530534 100644
--- a/src/core/kernel/qobjectdefs.h
+++ b/src/core/kernel/qobjectdefs.h
@@ -32,7 +32,7 @@ class QByteArray;
 
 class QString;
 
-#define Q_MOC_OUTPUT_REVISION 66
+#define Q_MOC_OUTPUT_REVISION 67
 
 // The following macros are our "extensions" to C++
 // They are used, strictly speaking, only by the moc.
@@ -359,7 +359,6 @@ struct Q_CORE_EXPORT QMetaObject
 #else
         const QMetaObject **relatedMetaObjects;
 #endif
-        void *extradata; //reserved for future use
     } d;
 };
 
diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp
index f0ed140eb..151105b23 100644
--- a/src/dbus/qdbusabstractadaptor.cpp
+++ b/src/dbus/qdbusabstractadaptor.cpp
@@ -341,7 +341,7 @@ void QDBusAdaptorConnector::qt_static_metacall(QObject *_o, QMetaObject::Call _c
 
 const QMetaObject QDBusAdaptorConnector::staticMetaObject = {
     { &QObject::staticMetaObject, qt_meta_stringdata_QDBusAdaptorConnector,
-      qt_meta_data_QDBusAdaptorConnector, qt_static_metacall, nullptr, nullptr }
+      qt_meta_data_QDBusAdaptorConnector, qt_static_metacall, nullptr }
 };
 
 #ifdef Q_NO_DATA_RELOCATION
diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp
index 0e769876f..78eab8a64 100644
--- a/src/dbus/qdbusmetaobject.cpp
+++ b/src/dbus/qdbusmetaobject.cpp
@@ -464,7 +464,6 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj)
     obj->d.data = uint_data;
     obj->d.relatedMetaObjects = 0;
     obj->d.static_metacall = 0;
-    obj->d.extradata = 0;
     obj->d.stringdata = string_data;
     obj->d.superdata = &QDBusAbstractInterface::staticMetaObject;
 }
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index abd1aa659..1177288c0 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -269,37 +269,6 @@ void Generator::generateCode()
     if (cdef->hasQObject && !isQt)
         generateStaticMetacall();
 
-//
-// Build extra array
-//
-    QList<QByteArray> extraList;
-    for (int i = 0; i < cdef->propertyList.count(); ++i) {
-        const PropertyDef &p = cdef->propertyList.at(i);
-        if (!isVariantType(p.type.constData()) && !metaTypes.contains(p.type) && !p.type.contains('*') &&
-                !p.type.contains('<') && !p.type.contains('>')) {
-            int s = p.type.lastIndexOf("::");
-            if (s > 0) {
-                QByteArray scope = p.type.left(s);
-                if (scope != "Qt" && scope != cdef->classname && !extraList.contains(scope))
-                    extraList += scope;
-            }
-        }
-    }
-    if (!extraList.isEmpty()) {
-        fprintf(out, "#ifdef Q_NO_DATA_RELOCATION\n");
-        fprintf(out, "static const QMetaObjectAccessor qt_meta_extradata_%s[] = {\n    ", qualifiedClassNameIdentifier.constData());
-        for (int i = 0; i < extraList.count(); ++i) {
-            fprintf(out, "    %s::getStaticMetaObject,\n", extraList.at(i).constData());
-        }
-        fprintf(out, "#else\n");
-        fprintf(out, "static const QMetaObject *qt_meta_extradata_%s[] = {\n    ", qualifiedClassNameIdentifier.constData());
-        for (int i = 0; i < extraList.count(); ++i) {
-            fprintf(out, "    &%s::staticMetaObject,\n", extraList.at(i).constData());
-        }
-        fprintf(out, "#endif //Q_NO_DATA_RELOCATION\n");
-        fprintf(out, "    nullptr\n};\n\n");
-    }
-
 //
 // Finally create and initialize the static meta object
 //
@@ -321,10 +290,6 @@ void Generator::generateCode()
     else
         fprintf(out, " nullptr, ");
 
-    if (extraList.isEmpty())
-        fprintf(out, "nullptr, ");
-    else
-        fprintf(out, "qt_meta_extradata_%s, ", qualifiedClassNameIdentifier.constData());
     fprintf(out, "nullptr}\n};\n\n");
 
     if(isQt)
diff --git a/src/tools/qdbus/qdbuscpp2xml.cpp b/src/tools/qdbus/qdbuscpp2xml.cpp
index 78a848378..6391ead67 100644
--- a/src/tools/qdbus/qdbuscpp2xml.cpp
+++ b/src/tools/qdbus/qdbuscpp2xml.cpp
@@ -257,7 +257,6 @@ void MocParser::parse(const char *fname, QIODevice *io, int lineNum)
             mo.d.superdata = &QObject::staticMetaObject;
             mo.d.stringdata = stringdata;
             mo.d.data = data;
-            mo.d.extradata = 0;
             objects.append(mo);
         }
     }