Merge remote-tracking branch 'origin/5.13' into 5.14

Change-Id: Icbc626704f0cb12f84774a717e7050487a74af9c

1 files changed, 17 insertions, 7 deletions

diff --git a/src/ivicore/qivipendingreply.cpp b/src/ivicore/qivipendingreply.cpp
index 2caa926..b0c6edd 100644
--- a/src/ivicore/qivipendingreply.cpp
+++ b/src/ivicore/qivipendingreply.cpp
@@ -73,13 +73,23 @@ void qiviRegisterPendingReplyBasicTypes() {
     if (once)
         return;
 
-    qRegisterMetaType<QIviPendingReplyBase>("QIviPendingReplyBase");
-    QT_FOR_EACH_STATIC_PRIMITIVE_TYPE(QTIVI_ADD_STATIC_METATYPE)
-    QT_FOR_EACH_STATIC_PRIMITIVE_POINTER(QTIVI_ADD_STATIC_METATYPE)
-    QT_FOR_EACH_STATIC_CORE_POINTER(QTIVI_ADD_STATIC_METATYPE)
-    QT_FOR_EACH_STATIC_CORE_TEMPLATE(QTIVI_ADD_STATIC_METATYPE)
-    QT_FOR_EACH_STATIC_CORE_CLASS(QTIVI_ADD_STATIC_METATYPE)
-    QT_FOR_EACH_STATIC_ALIAS_TYPE(QTIVI_ADD_STATIC_METATYPE2)
+    // This function is registered as Q_COREAPP_STARTUP_FUNCTION, which makes sure
+    // it is run after the QCoreApplication constructor to ensure we can register
+    // types.
+    // In case the library is loaded at runtime (because of a qml plugin dependency),
+    // the init function would be registered and executed right away before the
+    // rest of the library is initialized (e.g. the QMetaObject of QIviPendingReplyBase).
+    // The singleshot timer makes sure the registration is done in the next event
+    // loop run, when everything is ready.
+    QMetaObject::invokeMethod(qApp, []() {
+        qRegisterMetaType<QIviPendingReplyBase>("QIviPendingReplyBase");
+        QT_FOR_EACH_STATIC_PRIMITIVE_TYPE(QTIVI_ADD_STATIC_METATYPE)
+        QT_FOR_EACH_STATIC_PRIMITIVE_POINTER(QTIVI_ADD_STATIC_METATYPE)
+        QT_FOR_EACH_STATIC_CORE_POINTER(QTIVI_ADD_STATIC_METATYPE)
+        QT_FOR_EACH_STATIC_CORE_TEMPLATE(QTIVI_ADD_STATIC_METATYPE)
+        QT_FOR_EACH_STATIC_CORE_CLASS(QTIVI_ADD_STATIC_METATYPE)
+        QT_FOR_EACH_STATIC_ALIAS_TYPE(QTIVI_ADD_STATIC_METATYPE2)
+    });
     once = true;
 }