Add QtQml.Models module

The moved Model classes can now be exposed in a QtQml import.

To keep the QtQml import resticted to more core functionality, they are
being exposed in a plugin module.

Change-Id: I0a84642a72c7c9bbf9b6ffd2a6c33549f8e61c29
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

2 files changed, 16 insertions, 14 deletions

diff --git a/examples/quick/views/visualdatamodel/dragselection.qml b/examples/quick/views/visualdatamodel/dragselection.qml
index ec80cc7c16..5578268961 100644
--- a/examples/quick/views/visualdatamodel/dragselection.qml
+++ b/examples/quick/views/visualdatamodel/dragselection.qml
@@ -39,6 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
+import QtQml.Models 2.1
 
 Item {
     id: root
@@ -59,7 +60,7 @@ Item {
 
                 width: 64
                 height: 64
-                enabled: packageRoot.VisualDataModel.inSelected
+                enabled: packageRoot.DelegateModel.inSelected
 
                 drag.target: draggable
 
@@ -83,7 +84,7 @@ Item {
                 }
                 DropArea {
                     anchors.fill: parent
-                    onEntered: selectedItems.move(0, visualModel.items.get(packageRoot.VisualDataModel.itemsIndex), selectedItems.count)
+                    onEntered: selectedItems.move(0, visualModel.items.get(packageRoot.DelegateModel.itemsIndex), selectedItems.count)
                 }
             }
             Item {
@@ -112,7 +113,7 @@ Item {
                 border.width: 2
                 border.color: "#007423"
 
-                state: root.dragging && packageRoot.VisualDataModel.inSelected ? "selected" : "visible"
+                state: root.dragging && packageRoot.DelegateModel.inSelected ? "selected" : "visible"
 
                 Text {
                     anchors.fill: parent
@@ -126,7 +127,7 @@ Item {
                 Rectangle {
                     anchors { right: parent.right; top: parent.top; margins: 3 }
                     width: 12; height: 12
-                    color: packageRoot.VisualDataModel.inSelected ? "black" : "white"
+                    color: packageRoot.DelegateModel.inSelected ? "black" : "white"
                     radius: 6
 
                     border.color: "white"
@@ -134,7 +135,7 @@ Item {
 
                     MouseArea {
                         anchors.fill: parent
-                        onClicked: packageRoot.VisualDataModel.inSelected = !packageRoot.VisualDataModel.inSelected
+                        onClicked: packageRoot.DelegateModel.inSelected = !packageRoot.DelegateModel.inSelected
                     }
                 }
 
@@ -142,19 +143,19 @@ Item {
                     State {
                         name: "selected"
                         ParentChange { target: content; parent: selectionContainer; x: 3; y: 3 }
-                        PropertyChanges { target: packageRoot; VisualDataModel.inItems: visibleContainer.drag.active }
+                        PropertyChanges { target: packageRoot; DelegateModel.inItems: visibleContainer.drag.active }
                         PropertyChanges { target: gradientStart; color: "#017423" }
                         PropertyChanges { target: gradientStart; color: "#007423" }
                     }, State {
                         name: "visible"
-                        PropertyChanges { target: packageRoot; VisualDataModel.inItems: true }
+                        PropertyChanges { target: packageRoot; DelegateModel.inItems: true }
                         ParentChange { target: content; parent: visibleContainer; x: 3; y: 3 }
                         PropertyChanges { target: gradientStart; color: "#8AC953" }
                         PropertyChanges { target: gradientStart; color: "#8BC953" }
                     }
                 ]
                 transitions: Transition {
-                    PropertyAction { target: packageRoot; properties: "VisualDataModel.inItems" }
+                    PropertyAction { target: packageRoot; properties: "DelegateModel.inItems" }
                     ParentAnimation {
                         target: content
                         NumberAnimation { target: content; properties: "x,y"; duration: 500 }
@@ -165,7 +166,7 @@ Item {
         }
     }
 
-    VisualDataModel {
+    DelegateModel {
         id: visualModel
         model: 35
         delegate: packageDelegate
diff --git a/examples/quick/views/visualdatamodel/slideshow.qml b/examples/quick/views/visualdatamodel/slideshow.qml
index 77fe9809d4..d3a4013503 100644
--- a/examples/quick/views/visualdatamodel/slideshow.qml
+++ b/examples/quick/views/visualdatamodel/slideshow.qml
@@ -40,6 +40,7 @@
 
 import QtQuick 2.0
 import QtQuick.XmlListModel 2.0
+import QtQml.Models 2.1
 
 Rectangle {
     id: root
@@ -50,7 +51,7 @@ Rectangle {
 
     color: "black"
 
-    VisualDataModel {
+    DelegateModel {
         id: visualModel
 
         model: XmlListModel {
@@ -97,14 +98,14 @@ Rectangle {
                         name: "inDisplay";
                         ParentChange { target: image; parent: imageContainer; x: 75; y: 75; width: 150; height: 150 }
                         PropertyChanges { target: image; z: 2 }
-                        PropertyChanges { target: delegateItem; VisualDataModel.inItems: false }
+                        PropertyChanges { target: delegateItem; DelegateModel.inItems: false }
                     },
                     State {
                         when: root.displayItem !== delegateItem
                         name: "inList";
                         ParentChange { target: image; parent: delegateItem; x: 2; y: 2; width: 75; height: 75 }
                         PropertyChanges { target: image; z: 1 }
-                        PropertyChanges { target: delegateItem; VisualDataModel.inItems: true }
+                        PropertyChanges { target: delegateItem; DelegateModel.inItems: true }
                     }
                 ]
 
@@ -112,7 +113,7 @@ Rectangle {
                     Transition {
                         from: "inList"
                         SequentialAnimation {
-                            PropertyAction { target: delegateItem; property: "VisualDataModel.inPersistedItems"; value: true }
+                            PropertyAction { target: delegateItem; property: "DelegateModel.inPersistedItems"; value: true }
                             ParentAnimation {
                                 target: image;
                                 via: root
@@ -126,7 +127,7 @@ Rectangle {
                                 target: image
                                 NumberAnimation { target: image; properties: "x,y,width,height"; duration: 1000 }
                             }
-                            PropertyAction { target: delegateItem; property: "VisualDataModel.inPersistedItems"; value: false }
+                            PropertyAction { target: delegateItem; property: "DelegateModel.inPersistedItems"; value: false }
                         }
                     }
                 ]