Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	examples/network/bearermonitor/CMakeLists.txt
	examples/network/CMakeLists.txt
	src/corelib/tools/qlinkedlist.h
	src/sql/kernel/qsqldriver_p.h
	src/sql/kernel/qsqlresult_p.h
	src/widgets/kernel/qwidget.cpp
	src/widgets/kernel/qwidget_p.h
	tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
	tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
	tests/auto/tools/moc/allmocs_baseline_in.json

Change-Id: I21a3c34570ae79ea9d30107fae71759d7eac17d9

3 files changed, 9 insertions, 4 deletions

diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index b4fe6a765e..078eea257d 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -377,7 +377,7 @@ void Generator::generateCode()
             isConstructible ? index : 0);
 
     int flags = 0;
-    if (cdef->hasQGadget) {
+    if (cdef->hasQGadget || cdef->hasQNamespace) {
         // Ideally, all the classes could have that flag. But this broke classes generated
         // by qdbusxml2cpp which generate code that require that we call qt_metacall for properties
         flags |= PropertyAccessInStaticMetaCall;
@@ -534,7 +534,7 @@ void Generator::generateCode()
 
     if (isQObject)
         fprintf(out, "    nullptr,\n");
-    else if (cdef->superclassList.size() && !cdef->hasQGadget) // for qobject, we know the super class must have a static metaobject
+    else if (cdef->superclassList.size() && !cdef->hasQGadget && !cdef->hasQNamespace) // for qobject, we know the super class must have a static metaobject
         fprintf(out, "    QMetaObject::SuperData::link<%s::staticMetaObject>(),\n", purestSuperClass.constData());
     else if (cdef->superclassList.size()) // for gadgets we need to query at compile time for it
         fprintf(out, "    QtPrivate::MetaObjectForType<%s>::value(),\n", purestSuperClass.constData());
@@ -1181,7 +1181,7 @@ void Generator::generateStaticMetacall()
             }
             fprintf(out, ");\n");
             fprintf(out, "            if (_a[0]) *reinterpret_cast<%s**>(_a[0]) = _r; } break;\n",
-                    cdef->hasQGadget ? "void" : "QObject");
+                    (cdef->hasQGadget || cdef->hasQNamespace) ? "void" : "QObject");
         }
         fprintf(out, "        default: break;\n");
         fprintf(out, "        }\n");
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index b37674320d..03976771e5 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -943,7 +943,7 @@ void Moc::parse()
         ClassDef def;
         static_cast<BaseDef &>(def) = static_cast<BaseDef>(n);
         def.qualified += def.classname;
-        def.hasQGadget = true;
+        def.hasQNamespace = true;
         auto it = std::find_if(classList.begin(), classList.end(), [&def](const ClassDef &val) {
             return def.classname == val.classname && def.qualified == val.qualified;
         });
@@ -1867,8 +1867,12 @@ QJsonObject ClassDef::toJson() const
     if (!props.isEmpty())
         cls[QLatin1String("properties")] = props;
 
+    if (hasQObject)
+        cls[QLatin1String("object")] = true;
     if (hasQGadget)
         cls[QLatin1String("gadget")] = true;
+    if (hasQNamespace)
+        cls[QLatin1String("namespace")] = true;
 
     QJsonArray superClasses;
 
diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h
index 63caf36d61..743749433f 100644
--- a/src/tools/moc/moc.h
+++ b/src/tools/moc/moc.h
@@ -194,6 +194,7 @@ struct ClassDef : BaseDef {
 
     bool hasQObject = false;
     bool hasQGadget = false;
+    bool hasQNamespace = false;
 
     QJsonObject toJson() const;
 };