diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 829cd4c79f..c49a65136a 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -84,6 +84,8 @@ static int *queuedConnectionTypes(const QMetaMethod &method)
             typeIds[i] = QMetaType::VoidStar;
         else
             typeIds[i] = metaType.id();
+        if (!typeIds[i] && method.parameterTypeName(i).endsWith('*'))
+            typeIds[i] = QMetaType::VoidStar;
         if (!typeIds[i]) {
             const QByteArray typeName = method.parameterTypeName(i);
             qCWarning(lcConnect,
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index 207aae7608..1b678d8851 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -58,6 +58,7 @@ private slots:
     void connectNotify_connectSlotsByName();
     void connectDisconnectNotify_shadowing();
     void connectReferenceToIncompleteTypes();
+    void connectAutoQueuedIncomplete();
     void emitInDefinedOrder();
     void customTypes();
     void streamCustomTypes();
@@ -893,6 +894,42 @@ void tst_QObject::connectReferenceToIncompleteTypes() {
     QVERIFY(connection);
 }
 
+struct Incomplete2;
+class QObjectWithIncomplete2 : public QObject {
+    Q_OBJECT
+
+public:
+    QObjectWithIncomplete2(QObject *parent=nullptr) : QObject(parent) {}
+signals:
+    void signalWithIncomplete(Incomplete2 *ptr);
+public slots:
+    void slotWithIncomplete(Incomplete2 *) { calledSlot = true; }
+    void run() { Q_EMIT signalWithIncomplete(nullptr); }
+public:
+    bool calledSlot = false;
+};
+
+void tst_QObject::connectAutoQueuedIncomplete()
+{
+    auto objectWithIncomplete1 = new QObjectWithIncomplete2();
+    auto objectWithIncomplete2 = new QObjectWithIncomplete2();
+    auto t = new QThread(this);
+    auto cleanup = qScopeGuard([&](){
+        t->quit();
+        QVERIFY(t->wait());
+        delete objectWithIncomplete1;
+        delete objectWithIncomplete2;
+    });
+
+    t->start();
+    objectWithIncomplete2->moveToThread(t);
+
+    connect(objectWithIncomplete2, &QObjectWithIncomplete2::signalWithIncomplete,
+            objectWithIncomplete1, &QObjectWithIncomplete2::slotWithIncomplete);
+    QMetaObject::invokeMethod(objectWithIncomplete2, "run", Qt::QueuedConnection);
+    QTRY_VERIFY(objectWithIncomplete1->calledSlot);
+}
+
 static void connectDisconnectNotifyTestSlot() {}
 
 void tst_QObject::connectDisconnectNotifyPMF()