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>

1 files changed, 19 insertions, 18 deletions

diff --git a/examples/quick/views/views.qml b/examples/quick/views/views.qml
index d1dda2a777..0724d11456 100644
--- a/examples/quick/views/views.qml
+++ b/examples/quick/views/views.qml
@@ -39,6 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
+import QtQml.Models 2.1
 import "../shared" as Examples
 
 /*!
@@ -51,50 +52,50 @@ import "../shared" as Examples
     are focused on the views side, which is the visual representation of the data in the models.
 
     \section2 GridView and PathView demonstrate usage of these elements to display views.
-    \snippet examples/quick/modelviews/gridview/gridview-example.qml 0
+    \snippet examples/quick/views/gridview/gridview-example.qml 0
 
     \section2 Dynamic List demonstrates animation of runtime additions and removals to a ListView.
 
     The ListView.onAdd signal handler runs an animation when new items are added to the
     view, and the ListView.onRemove another when they are removed.
-    \snippet examples/quick/modelviews/listview/dynamiclist.qml 0
-    \snippet examples/quick/modelviews/listview/dynamiclist.qml 1
+    \snippet examples/quick/views/listview/dynamiclist.qml 0
+    \snippet examples/quick/views/listview/dynamiclist.qml 1
 
     \section2 Expanding Delegates demonstrates delegates that expand when activated.
 
     It has a complex delegate the size and appearance of which can change, displacing
     other items in the view.
-    \snippet examples/quick/modelviews/listview/expandingdelegates.qml 0
-    \snippet examples/quick/modelviews/listview/expandingdelegates.qml 1
-    \snippet examples/quick/modelviews/listview/expandingdelegates.qml 2
-    \snippet examples/quick/modelviews/listview/expandingdelegates.qml 3
+    \snippet examples/quick/views/listview/expandingdelegates.qml 0
+    \snippet examples/quick/views/listview/expandingdelegates.qml 1
+    \snippet examples/quick/views/listview/expandingdelegates.qml 2
+    \snippet examples/quick/views/listview/expandingdelegates.qml 3
 
     \section2 Highlight demonstrates adding a custom highlight to a ListView.
-    \snippet examples/quick/modelviews/listview/highlight.qml 0
+    \snippet examples/quick/views/listview/highlight.qml 0
 
     \section2 Highlight Ranges shows the three different highlight range modes of ListView.
-    \snippet examples/quick/modelviews/listview/highlightranges.qml 0
-    \snippet examples/quick/modelviews/listview/highlightranges.qml 1
-    \snippet examples/quick/modelviews/listview/highlightranges.qml 2
+    \snippet examples/quick/views/listview/highlightranges.qml 0
+    \snippet examples/quick/views/listview/highlightranges.qml 1
+    \snippet examples/quick/views/listview/highlightranges.qml 2
 
     \section2 Sections demonstrates the various section headers and footers available to ListView.
-    \snippet examples/quick/modelviews/listview/sections.qml 0
+    \snippet examples/quick/views/listview/sections.qml 0
 
     \section2 Packages demonstrates using Packages to transition delegates between two views.
 
     It has a Package which defines delegate items for each view and an item that can
     be transferred between delegates.
 
-    \snippet examples/quick/modelviews/package/Delegate.qml 0
+    \snippet examples/quick/views/package/Delegate.qml 0
 
-    A VisualDataModel allows the individual views to access their specific items from
+    A DelegateModel allows the individual views to access their specific items from
     the shared package delegate.
 
-    \snippet examples/quick/modelviews/package/view.qml 0
+    \snippet examples/quick/views/package/view.qml 0
 
-    \section2 VisualItemModel uses a VisualItemModel for the model instead of a ListModel.
+    \section2 ObjectModel uses a ObjectModel for the model instead of a ListModel.
 
-    \snippet examples/quick/modelviews/visualitemmodel/visualitemmodel.qml 0
+    \snippet examples/quick/views/objectmodel/objectmodel.qml 0
     */
 
     Item {
@@ -112,7 +113,7 @@ import "../shared" as Examples
                 addExample("Sections", "ListView section headers and footers", Qt.resolvedUrl("listview/sections.qml"))
                 addExample("Packages", "Transitions between a ListView and GridView", Qt.resolvedUrl("package/view.qml"))
                 addExample("PathView", "A simple PathView", Qt.resolvedUrl("pathview/pathview-example.qml"))
-                addExample("VisualItemModel", "Using a VisualItemModel", Qt.resolvedUrl("visualitemmodel/visualitemmodel.qml"))
+                addExample("ObjectModel", "Using a ObjectModel", Qt.resolvedUrl("objectmodel/objectmodel.qml"))
             }
         }
 }