diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-31 01:01:32 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-10-31 09:44:09 +0100 |
| commit | 9c050d452961f348c8bcc33e3422aed6316bb18b (patch) | |
| tree | b8af41758d885bfad84ccbd52e24eb1544908fda /tests/auto/quick/qquickloader/data/initialPropertyValues.11.qml | |
| parent | 59760e6ce0da6780fcbdf0b2dc123f989baaa3eb (diff) | |
| parent | bcbc3c9cec1f7d7bb8c9d5f5ea94eb5c81ec2853 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
.qmake.conf
src/qml/common/qv4compileddata_p.h
src/qml/types/qqmlbind.cpp
tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
Change-Id: I6a137907e63445f17a3d6181b832a6bd76135bb2
Diffstat (limited to 'tests/auto/quick/qquickloader/data/initialPropertyValues.11.qml')
| -rw-r--r-- | tests/auto/quick/qquickloader/data/initialPropertyValues.11.qml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickloader/data/initialPropertyValues.11.qml b/tests/auto/quick/qquickloader/data/initialPropertyValues.11.qml new file mode 100644 index 0000000000..ddc874d14c --- /dev/null +++ b/tests/auto/quick/qquickloader/data/initialPropertyValues.11.qml @@ -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 + } +} |