Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I75b0099b2b9ebb5cfb6f07b43b90b598743ae033
Showing
- examples/quick/quick.pro 1 addition, 1 deletionexamples/quick/quick.pro
- src/qml/doc/src/cppintegration/data.qdoc 0 additions, 2 deletionssrc/qml/doc/src/cppintegration/data.qdoc
- src/qml/qml/qqmlvmemetaobject_p.h 2 additions, 0 deletionssrc/qml/qml/qqmlvmemetaobject_p.h
- src/qml/types/qqmllistmodel.cpp 26 additions, 40 deletionssrc/qml/types/qqmllistmodel.cpp
- src/qml/types/qqmllistmodel_p.h 2 additions, 0 deletionssrc/qml/types/qqmllistmodel_p.h
- src/qml/types/qqmllistmodel_p_p.h 0 additions, 1 deletionsrc/qml/types/qqmllistmodel_p_p.h
- src/qml/types/qqmlobjectmodel.cpp 3 additions, 3 deletionssrc/qml/types/qqmlobjectmodel.cpp
- src/quick/doc/snippets/qml/texteditor.qml 0 additions, 1 deletionsrc/quick/doc/snippets/qml/texteditor.qml
- src/quick/items/qquickloader.cpp 1 addition, 0 deletionssrc/quick/items/qquickloader.cpp
- src/quick/scenegraph/coreapi/qsgnode.cpp 3 additions, 0 deletionssrc/quick/scenegraph/coreapi/qsgnode.cpp
- tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp 5 additions, 5 deletionstests/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 deletionstests/auto/quick/qquickbehaviors/tst_qquickbehaviors.cpp
Loading
Please register or sign in to comment