Merge remote-tracking branch 'origin/5.9' into 5.10 (0d3592aa) · Commits · CodeLinaro / le / external / qtdeclarative · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

qtdeclarative
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

0d3592aa

Commit 0d3592aa authored 7 years ago by Liang Qi

Downloads
- Plain Diff

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

Change-Id: I75b0099b2b9ebb5cfb6f07b43b90b598743ae033

parents b9e3df1c 265b3bea

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

examples/quick/quick.pro 1 addition, 1 deletion

examples/quick/quick.pro
src/qml/doc/src/cppintegration/data.qdoc 0 additions, 2 deletions

src/qml/doc/src/cppintegration/data.qdoc
src/qml/qml/qqmlvmemetaobject_p.h 2 additions, 0 deletions

src/qml/qml/qqmlvmemetaobject_p.h
src/qml/types/qqmllistmodel.cpp 26 additions, 40 deletions

src/qml/types/qqmllistmodel.cpp
src/qml/types/qqmllistmodel_p.h 2 additions, 0 deletions

src/qml/types/qqmllistmodel_p.h
src/qml/types/qqmllistmodel_p_p.h 0 additions, 1 deletion

src/qml/types/qqmllistmodel_p_p.h
src/qml/types/qqmlobjectmodel.cpp 3 additions, 3 deletions

src/qml/types/qqmlobjectmodel.cpp
src/quick/doc/snippets/qml/texteditor.qml 0 additions, 1 deletion

src/quick/doc/snippets/qml/texteditor.qml
src/quick/items/qquickloader.cpp 1 addition, 0 deletions

src/quick/items/qquickloader.cpp
src/quick/scenegraph/coreapi/qsgnode.cpp 3 additions, 0 deletions

src/quick/scenegraph/coreapi/qsgnode.cpp
tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp 5 additions, 5 deletions

tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp
tests/auto/quick/qquickbehaviors/data/ItemWithInnerBehavior.qml 10 additions, 0 deletions

...auto/quick/qquickbehaviors/data/ItemWithInnerBehavior.qml
tests/auto/quick/qquickbehaviors/data/overwrittenbehavior.qml 14 additions, 0 deletions

...s/auto/quick/qquickbehaviors/data/overwrittenbehavior.qml
tests/auto/quick/qquickbehaviors/tst_qquickbehaviors.cpp 9 additions, 0 deletions

tests/auto/quick/qquickbehaviors/tst_qquickbehaviors.cpp

with 76 additions and 53 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment