qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Loader: Actually clear initial properties when changing source 

Fixes: QTBUG-79435
Change-Id: Ic99a3b1a9d64426a64117b90a3e11fe99af0d260
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Fabian Kosmale 2019-10-23 10:25:23 +02:00
parent 8bc05e07c8
commit b6d88c73c4
4 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/quick/items/qquickloader.cpp
View File

@ -590,8 +590,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());
@ -601,6 +601,7 @@ void QQuickLoader::setSource(QQmlV4Function *args)
void QQuickLoaderPrivate::disposeInitialPropertyValues()
{
initialPropertyValues.clear();
}
void QQuickLoaderPrivate::load()

4
tests/auto/quick/qquickloader/data/CacheClearTest.qml Normal file
View File

@ -0,0 +1,4 @@
import QtQml 2.12
QtObject {
property int i: 42
}

20
tests/auto/quick/qquickloader/data/initialPropertyValues.11.qml Normal file
View File

@ -0,0 +1,20 @@
import QtQuick 2.0
Item {
id: root
property int oldi: 0
property int i: 0
Loader {
id: loader
objectName: "loader"
active: true
}
Component.onCompleted: {
loader.setSource("CacheClearTest.qml", {i: 12})
root.oldi = loader.item.i
loader.setSource("CacheClearTest.qml")
root.i = loader.item.i // should be 42
}
}

5
tests/auto/quick/qquickloader/tst_qquickloader.cpp
View File

@ -681,6 +681,11 @@ void tst_QQuickLoader::initialPropertyValues_data()
<< QStringList()
<< (QStringList() << "initialValue")
<< (QVariantList() << 6);
QTest::newRow("source url changed, previously initial properties are discared") << testFileUrl("initialPropertyValues.11.qml")
<< QStringList()
<< (QStringList() << "oldi" << "i")
<< (QVariantList() << 12 << 42);
}
void tst_QQuickLoader::initialPropertyValues()