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

Conflicts:
	.qmake.conf

Change-Id: Ibd56abaa0b9d9aac275be41209ba2db3fc79e212

1 files changed, 6 insertions, 2 deletions

diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp
index 148404d..dcc589c 100644
--- a/src/webchannel/qmetaobjectpublisher.cpp
+++ b/src/webchannel/qmetaobjectpublisher.cpp
@@ -454,8 +454,12 @@ void QMetaObjectPublisher::objectDestroyed(const QObject *object)
     Q_ASSERT(removed);
     Q_UNUSED(removed);
 
-    signalHandler.remove(object);
-    signalToPropertyMap.remove(object);
+    // only remove from handler when we initialized the property updates
+    // cf: https://bugreports.qt.io/browse/QTBUG-60250
+    if (propertyUpdatesInitialized) {
+        signalHandler.remove(object);
+        signalToPropertyMap.remove(object);
+    }
     pendingPropertyUpdates.remove(object);
 }