diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-09-20 11:38:16 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-20 14:27:41 +0200 |
| commit | 55a671ea73fbe657f360befa221e2c0c15ed4b0e (patch) | |
| tree | 475e5734183e93311c40971a40bb9ea60b816978 /tests/auto/qml/qqmllanguage/data/lazyDeferredSubObject.qml | |
| parent | 2aba6e35dc6f1534a764690382ca56b6cf099185 (diff) | |
| parent | 61716e2bbcc62d7447b4d9e8531ad98737407d12 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/qml/compiler/qv4compileddata.cpp
src/qml/compiler/qv4compileddata_p.h
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4qmlcontext.cpp
src/qml/jsruntime/qv4qmlcontext_p.h
src/qml/jsruntime/qv4regexpobject.cpp
src/qml/jsruntime/qv4regexpobject_p.h
src/qml/types/qqmllistmodel.cpp
src/quick/items/qquickanimatedimage_p.h
src/quick/scenegraph/qsgrenderloop.cpp
tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
Change-Id: If20ef62b2c98bdf656cb2f5d27b1897b754d3dc0
Diffstat (limited to 'tests/auto/qml/qqmllanguage/data/lazyDeferredSubObject.qml')
| -rw-r--r-- | tests/auto/qml/qqmllanguage/data/lazyDeferredSubObject.qml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/data/lazyDeferredSubObject.qml b/tests/auto/qml/qqmllanguage/data/lazyDeferredSubObject.qml new file mode 100644 index 0000000000..2465a18320 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lazyDeferredSubObject.qml @@ -0,0 +1,5 @@ +import QtQml 2.0 +import Test 1.0 +MyLazyDeferredSubObject { + subObject.objectName: 'custom' +} |