diff options
4 files changed, 12 insertions, 9 deletions
diff --git a/src/qml/doc/snippets/delegatemodel/visualdatagroup.qml b/src/qml/doc/snippets/delegatemodel/visualdatagroup.qml index ca72e16b35..85ac83ae52 100644 --- a/src/qml/doc/snippets/delegatemodel/visualdatagroup.qml +++ b/src/qml/doc/snippets/delegatemodel/visualdatagroup.qml @@ -39,11 +39,12 @@ ****************************************************************************/ //![0] import QtQuick 2.0 +import QtQml.Models 2.2 Rectangle { width: 200; height: 100 - VisualDataModel { + DelegateModel { id: visualModel model: ListModel { ListElement { name: "Apple" } @@ -51,7 +52,7 @@ Rectangle { } groups: [ - VisualDataGroup { name: "selected" } + DelegateModelGroup { name: "selected" } ] delegate: Rectangle { @@ -61,14 +62,14 @@ Rectangle { Text { text: { var text = "Name: " + name - if (item.VisualDataModel.inSelected) - text += " (" + item.VisualDataModel.selectedIndex + ")" + if (item.DelegateModel.inSelected) + text += " (" + item.DelegateModel.selectedIndex + ")" return text; } } MouseArea { anchors.fill: parent - onClicked: item.VisualDataModel.inSelected = !item.VisualDataModel.inSelected + onClicked: item.DelegateModel.inSelected = !item.DelegateModel.inSelected } } } diff --git a/src/qml/doc/snippets/delegatemodel/visualdatamodel.qml b/src/qml/doc/snippets/delegatemodel/visualdatamodel.qml index cf6b5aafb9..438eafeed1 100644 --- a/src/qml/doc/snippets/delegatemodel/visualdatamodel.qml +++ b/src/qml/doc/snippets/delegatemodel/visualdatamodel.qml @@ -39,11 +39,12 @@ ****************************************************************************/ //![0] import QtQuick 2.0 +import QtQml.Models 2.2 Rectangle { width: 200; height: 100 - VisualDataModel { + DelegateModel { id: visualModel model: ListModel { ListElement { name: "Apple" } diff --git a/src/qml/doc/snippets/delegatemodel/visualdatamodel_rootindex/view.qml b/src/qml/doc/snippets/delegatemodel/visualdatamodel_rootindex/view.qml index f4e18f6ac0..719d16ff7d 100644 --- a/src/qml/doc/snippets/delegatemodel/visualdatamodel_rootindex/view.qml +++ b/src/qml/doc/snippets/delegatemodel/visualdatamodel_rootindex/view.qml @@ -39,13 +39,14 @@ ****************************************************************************/ //![0] import QtQuick 2.0 +import QtQml.Models 2.2 ListView { id: view width: 300 height: 400 - model: VisualDataModel { + model: DelegateModel { model: dirModel delegate: Rectangle { diff --git a/src/qml/types/qquickpackage.cpp b/src/qml/types/qquickpackage.cpp index 5fe73ec0e0..69bf058e6f 100644 --- a/src/qml/types/qquickpackage.cpp +++ b/src/qml/types/qquickpackage.cpp @@ -45,8 +45,8 @@ QT_BEGIN_NAMESPACE \ingroup qtquick-views \brief Specifies a collection of named items - The Package class is used in conjunction with - VisualDataModel to enable delegates with a shared context + The Package type is used in conjunction with + DelegateModel to enable delegates with a shared context to be provided to multiple views. Any item within a Package may be assigned a name via the |