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

 Conflicts:
	tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
	tests/auto/quick/qquickloader/tst_qquickloader.cpp

Change-Id: I85fd38cfa00cd60197a1c981bfcc16fcb896cfe9

1 files changed, 2 insertions, 1 deletions

diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index 819a3a73e3..8722a45373 100644
--- a/src/quick/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
@@ -591,8 +591,8 @@ void QQuickLoader::setSource(QQmlV4Function *args)
 
     d->clear();
     QUrl sourceUrl = d->resolveSourceUrl(args);
+    d->disposeInitialPropertyValues();
     if (!ipv->isUndefined()) {
-        d->disposeInitialPropertyValues();
         d->initialPropertyValues.set(args->v4engine(), ipv);
     }
     d->qmlCallingContext.set(scope.engine, scope.engine->qmlContext());
@@ -602,6 +602,7 @@ void QQuickLoader::setSource(QQmlV4Function *args)
 
 void QQuickLoaderPrivate::disposeInitialPropertyValues()
 {
+    initialPropertyValues.clear();
 }
 
 void QQuickLoaderPrivate::load()