Move examples around

imageprovider is a QtQuick example. Models and Views examples are now split up,
as one is a collection of C++ examples and the other is banded into a single
QML example.

Task-Number: QTBUG-24133
Change-Id: I81874871bd69ffef6a88df84f3d3f649e0c56bc6
Reviewed-by: hjk <qthjk@ovi.com>

98 files changed, 203 insertions, 79 deletions

diff --git a/examples/qml/qml.pro b/examples/qml/qml.pro
index a66d08a8b7..e6591c895f 100644
--- a/examples/qml/qml.pro
+++ b/examples/qml/qml.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-SUBDIRS +=imageprovider \
+SUBDIRS += \
           networkaccessmanagerfactory \
           plugins \
           referenceexamples \
diff --git a/examples/qml/imageprovider/ImageProviderCore/qmldir b/examples/quick/imageprovider/ImageProviderCore/qmldir
index 6be88bccec..6be88bccec 100644
--- a/examples/qml/imageprovider/ImageProviderCore/qmldir
+++ b/examples/quick/imageprovider/ImageProviderCore/qmldir
diff --git a/examples/qml/imageprovider/imageprovider-example.qml b/examples/quick/imageprovider/imageprovider-example.qml
index 444a3447a5..444a3447a5 100644
--- a/examples/qml/imageprovider/imageprovider-example.qml
+++ b/examples/quick/imageprovider/imageprovider-example.qml
diff --git a/examples/qml/imageprovider/imageprovider.cpp b/examples/quick/imageprovider/imageprovider.cpp
index f752691125..f752691125 100644
--- a/examples/qml/imageprovider/imageprovider.cpp
+++ b/examples/quick/imageprovider/imageprovider.cpp
diff --git a/examples/qml/imageprovider/imageprovider.pro b/examples/quick/imageprovider/imageprovider.pro
index d1dd321b72..8f3e5d2d73 100644
--- a/examples/qml/imageprovider/imageprovider.pro
+++ b/examples/quick/imageprovider/imageprovider.pro
@@ -9,7 +9,7 @@ SOURCES += imageprovider.cpp
 
 EXAMPLE_FILES = imageprovider-example.qml
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qml/imageprovider/ImageProviderCore
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProviderCore
 qml.files = ImageProviderCore/qmldir
-qml.path = $$[QT_INSTALL_EXAMPLES]/qml/imageprovider/ImageProviderCore
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProviderCore
 INSTALLS = target qml
diff --git a/examples/qml/imageprovider/imageprovider.qmlproject b/examples/quick/imageprovider/imageprovider.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/qml/imageprovider/imageprovider.qmlproject
+++ b/examples/quick/imageprovider/imageprovider.qmlproject
diff --git a/examples/quick/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/quick/models/abstractitemmodel/abstractitemmodel.pro
index cde1d2f83c..cde1d2f83c 100644
--- a/examples/quick/modelviews/abstractitemmodel/abstractitemmodel.pro
+++ b/examples/quick/models/abstractitemmodel/abstractitemmodel.pro
diff --git a/examples/quick/modelviews/abstractitemmodel/abstractitemmodel.qrc b/examples/quick/models/abstractitemmodel/abstractitemmodel.qrc
index 4ae861cb3d..4ae861cb3d 100644
--- a/examples/quick/modelviews/abstractitemmodel/abstractitemmodel.qrc
+++ b/examples/quick/models/abstractitemmodel/abstractitemmodel.qrc
diff --git a/examples/quick/modelviews/abstractitemmodel/main.cpp b/examples/quick/models/abstractitemmodel/main.cpp
index 84fea90aa3..84fea90aa3 100644
--- a/examples/quick/modelviews/abstractitemmodel/main.cpp
+++ b/examples/quick/models/abstractitemmodel/main.cpp
diff --git a/examples/quick/modelviews/abstractitemmodel/model.cpp b/examples/quick/models/abstractitemmodel/model.cpp
index 9c24decf2d..9c24decf2d 100644
--- a/examples/quick/modelviews/abstractitemmodel/model.cpp
+++ b/examples/quick/models/abstractitemmodel/model.cpp
diff --git a/examples/quick/modelviews/abstractitemmodel/model.h b/examples/quick/models/abstractitemmodel/model.h
index 9436770b19..9436770b19 100644
--- a/examples/quick/modelviews/abstractitemmodel/model.h
+++ b/examples/quick/models/abstractitemmodel/model.h
diff --git a/examples/quick/modelviews/abstractitemmodel/view.qml b/examples/quick/models/abstractitemmodel/view.qml
index 6a9c90dcfc..6a9c90dcfc 100644
--- a/examples/quick/modelviews/abstractitemmodel/view.qml
+++ b/examples/quick/models/abstractitemmodel/view.qml
diff --git a/examples/quick/models/models.pro b/examples/quick/models/models.pro
new file mode 100644
index 0000000000..60407a679e
--- /dev/null
+++ b/examples/quick/models/models.pro
@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+SUBDIRS = \
+#    abstractitemmodel \ #Doesn't build right now
+    objectlistmodel \
+    stringlistmodel
diff --git a/examples/quick/modelviews/objectlistmodel/dataobject.cpp b/examples/quick/models/objectlistmodel/dataobject.cpp
index e26aa832ca..e26aa832ca 100644
--- a/examples/quick/modelviews/objectlistmodel/dataobject.cpp
+++ b/examples/quick/models/objectlistmodel/dataobject.cpp
diff --git a/examples/quick/modelviews/objectlistmodel/dataobject.h b/examples/quick/models/objectlistmodel/dataobject.h
index 57b5fdabf5..57b5fdabf5 100644
--- a/examples/quick/modelviews/objectlistmodel/dataobject.h
+++ b/examples/quick/models/objectlistmodel/dataobject.h
diff --git a/examples/quick/modelviews/objectlistmodel/main.cpp b/examples/quick/models/objectlistmodel/main.cpp
index 7fc23aff09..7fc23aff09 100644
--- a/examples/quick/modelviews/objectlistmodel/main.cpp
+++ b/examples/quick/models/objectlistmodel/main.cpp
diff --git a/examples/quick/modelviews/objectlistmodel/objectlistmodel.pro b/examples/quick/models/objectlistmodel/objectlistmodel.pro
index 7f323c3999..7f323c3999 100644
--- a/examples/quick/modelviews/objectlistmodel/objectlistmodel.pro
+++ b/examples/quick/models/objectlistmodel/objectlistmodel.pro
diff --git a/examples/quick/modelviews/objectlistmodel/objectlistmodel.qmlproject b/examples/quick/models/objectlistmodel/objectlistmodel.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/quick/modelviews/objectlistmodel/objectlistmodel.qmlproject
+++ b/examples/quick/models/objectlistmodel/objectlistmodel.qmlproject
diff --git a/examples/quick/modelviews/objectlistmodel/objectlistmodel.qrc b/examples/quick/models/objectlistmodel/objectlistmodel.qrc
index 17e9301471..17e9301471 100644
--- a/examples/quick/modelviews/objectlistmodel/objectlistmodel.qrc
+++ b/examples/quick/models/objectlistmodel/objectlistmodel.qrc
diff --git a/examples/quick/modelviews/objectlistmodel/view.qml b/examples/quick/models/objectlistmodel/view.qml
index a62e89329f..a62e89329f 100644
--- a/examples/quick/modelviews/objectlistmodel/view.qml
+++ b/examples/quick/models/objectlistmodel/view.qml
diff --git a/examples/quick/modelviews/stringlistmodel/main.cpp b/examples/quick/models/stringlistmodel/main.cpp
index 780a99cf68..780a99cf68 100644
--- a/examples/quick/modelviews/stringlistmodel/main.cpp
+++ b/examples/quick/models/stringlistmodel/main.cpp
diff --git a/examples/quick/modelviews/stringlistmodel/stringlistmodel.pro b/examples/quick/models/stringlistmodel/stringlistmodel.pro
index 19e62cd1b7..19e62cd1b7 100644
--- a/examples/quick/modelviews/stringlistmodel/stringlistmodel.pro
+++ b/examples/quick/models/stringlistmodel/stringlistmodel.pro
diff --git a/examples/quick/modelviews/stringlistmodel/stringlistmodel.qrc b/examples/quick/models/stringlistmodel/stringlistmodel.qrc
index 17e9301471..17e9301471 100644
--- a/examples/quick/modelviews/stringlistmodel/stringlistmodel.qrc
+++ b/examples/quick/models/stringlistmodel/stringlistmodel.qrc
diff --git a/examples/quick/modelviews/stringlistmodel/view.qml b/examples/quick/models/stringlistmodel/view.qml
index 2d02f0a2d4..2d02f0a2d4 100644
--- a/examples/quick/modelviews/stringlistmodel/view.qml
+++ b/examples/quick/models/stringlistmodel/view.qml
diff --git a/examples/quick/modelviews/modelviews.pro b/examples/quick/modelviews/modelviews.pro
deleted file mode 100644
index 101408f28d..0000000000
--- a/examples/quick/modelviews/modelviews.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-
-browser.file = browser.prx
-SUBDIRS = \
-    browser \
-#    abstractitemmodel \ # Does not build
-    objectlistmodel \
-    stringlistmodel
diff --git a/examples/quick/modelviews/modelviews.qml b/examples/quick/modelviews/modelviews.qml
deleted file mode 100644
index 2df91db7ff..0000000000
--- a/examples/quick/modelviews/modelviews.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "../shared" as Examples
-
-Item {
-    height: 480
-    width: 320
-    Examples.LauncherList {
-        id: ll
-        anchors.fill: parent
-        Component.onCompleted: {
-            addExample("GridView", "A simple GridView", Qt.resolvedUrl("gridview/gridview-example.qml"))
-            addExample("Dynamic List", "A dynamically alterable list", Qt.resolvedUrl("listview/dynamiclist.qml"))
-            addExample("Expanding Delegates", "A ListView with delegates that expand", Qt.resolvedUrl("listview/expandingdelegates.qml"))
-            addExample("Highlight", "A ListView with a custom highlight", Qt.resolvedUrl("listview/highlight.qml"))
-            addExample("Highlight Ranges", "The three highlight ranges of ListView", Qt.resolvedUrl("listview/highlightranges.qml"))
-            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"))
-        }
-    }
-}
diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro
index cb4f7bfc6b..e3691a044b 100644
--- a/examples/quick/quick.pro
+++ b/examples/quick/quick.pro
@@ -6,7 +6,8 @@ SUBDIRS = accessibility \
             imageelements \
             keyinteraction \
             localstorage \
-            modelviews \
+            models \
+            views \
             mousearea \
             positioners \
             righttoleft \
@@ -17,6 +18,7 @@ SUBDIRS = accessibility \
             touchinteraction \
             tutorials \
             customitems \
+            imageprovider \
             window \
             particles \
             demos
diff --git a/examples/quick/modelviews/doc/images/qml-modelviews-example.png b/examples/quick/views/doc/images/qml-modelviews-example.png
index b40334653d..b40334653d 100644
--- a/examples/quick/modelviews/doc/images/qml-modelviews-example.png
+++ b/examples/quick/views/doc/images/qml-modelviews-example.png
diff --git a/examples/quick/modelviews/doc/src/modelviews.qdoc b/examples/quick/views/doc/src/views.qdoc
index b01646607a..fe135db0d7 100644
--- a/examples/quick/modelviews/doc/src/modelviews.qdoc
+++ b/examples/quick/views/doc/src/views.qdoc
@@ -26,13 +26,13 @@
 ****************************************************************************/
 
 /*!
-    \title QtQuick Examples - ModelViews
-    \example quick/modelviews
+    \title QtQuick Examples - Views
+    \example quick/views
     \brief This is a collection of QML model/view examples
     \image qml-modelviews-example.png
     \ingroup qtquickexamples
 
-    This is a collection of small QML examples relating to model and view functionality.
+    This is a collection of small QML examples relating to model and view functionality. They demonstrate how to show data from a model using the QtQuick view types.
 
     \section2 GridView and PathView demonstrate usage of these elements to display views.
     \snippet quick/modelviews/gridview/gridview-example.qml 0
diff --git a/examples/quick/modelviews/gridview/gridview-example.qml b/examples/quick/views/gridview/gridview-example.qml
index 49d1174bee..49d1174bee 100644
--- a/examples/quick/modelviews/gridview/gridview-example.qml
+++ b/examples/quick/views/gridview/gridview-example.qml
diff --git a/examples/quick/modelviews/gridview/pics/AddressBook_48.png b/examples/quick/views/gridview/pics/AddressBook_48.png
index 1ab7c8eec1..1ab7c8eec1 100644
--- a/examples/quick/modelviews/gridview/pics/AddressBook_48.png
+++ b/examples/quick/views/gridview/pics/AddressBook_48.png
diff --git a/examples/quick/modelviews/gridview/pics/AudioPlayer_48.png b/examples/quick/views/gridview/pics/AudioPlayer_48.png
index f4b8689f87..f4b8689f87 100644
--- a/examples/quick/modelviews/gridview/pics/AudioPlayer_48.png
+++ b/examples/quick/views/gridview/pics/AudioPlayer_48.png
diff --git a/examples/quick/modelviews/gridview/pics/Camera_48.png b/examples/quick/views/gridview/pics/Camera_48.png
index c76b524945..c76b524945 100644
--- a/examples/quick/modelviews/gridview/pics/Camera_48.png
+++ b/examples/quick/views/gridview/pics/Camera_48.png
diff --git a/examples/quick/modelviews/gridview/pics/DateBook_48.png b/examples/quick/views/gridview/pics/DateBook_48.png
index 58f5787fb8..58f5787fb8 100644
--- a/examples/quick/modelviews/gridview/pics/DateBook_48.png
+++ b/examples/quick/views/gridview/pics/DateBook_48.png
diff --git a/examples/quick/modelviews/gridview/pics/EMail_48.png b/examples/quick/views/gridview/pics/EMail_48.png
index d6d84a61be..d6d84a61be 100644
--- a/examples/quick/modelviews/gridview/pics/EMail_48.png
+++ b/examples/quick/views/gridview/pics/EMail_48.png
diff --git a/examples/quick/modelviews/gridview/pics/TodoList_48.png b/examples/quick/views/gridview/pics/TodoList_48.png
index 0988448d9b..0988448d9b 100644
--- a/examples/quick/modelviews/gridview/pics/TodoList_48.png
+++ b/examples/quick/views/gridview/pics/TodoList_48.png
diff --git a/examples/quick/modelviews/gridview/pics/VideoPlayer_48.png b/examples/quick/views/gridview/pics/VideoPlayer_48.png
index 52638c50a7..52638c50a7 100644
--- a/examples/quick/modelviews/gridview/pics/VideoPlayer_48.png
+++ b/examples/quick/views/gridview/pics/VideoPlayer_48.png
diff --git a/examples/quick/modelviews/listview/content/PetsModel.qml b/examples/quick/views/listview/content/PetsModel.qml
index 22c7487fe1..22c7487fe1 100644
--- a/examples/quick/modelviews/listview/content/PetsModel.qml
+++ b/examples/quick/views/listview/content/PetsModel.qml
diff --git a/examples/quick/modelviews/listview/content/PressAndHoldButton.qml b/examples/quick/views/listview/content/PressAndHoldButton.qml
index 3b0883d5e1..3b0883d5e1 100644
--- a/examples/quick/modelviews/listview/content/PressAndHoldButton.qml
+++ b/examples/quick/views/listview/content/PressAndHoldButton.qml
diff --git a/examples/quick/modelviews/listview/content/RecipesModel.qml b/examples/quick/views/listview/content/RecipesModel.qml
index e98bff990e..e98bff990e 100644
--- a/examples/quick/modelviews/listview/content/RecipesModel.qml
+++ b/examples/quick/views/listview/content/RecipesModel.qml
diff --git a/examples/quick/modelviews/listview/content/SmallText.qml b/examples/quick/views/listview/content/SmallText.qml
index 506e66bba9..506e66bba9 100644
--- a/examples/quick/modelviews/listview/content/SmallText.qml
+++ b/examples/quick/views/listview/content/SmallText.qml
diff --git a/examples/quick/modelviews/listview/content/TextButton.qml b/examples/quick/views/listview/content/TextButton.qml
index 3b016dcc16..3b016dcc16 100644
--- a/examples/quick/modelviews/listview/content/TextButton.qml
+++ b/examples/quick/views/listview/content/TextButton.qml
diff --git a/examples/quick/modelviews/listview/content/ToggleButton.qml b/examples/quick/views/listview/content/ToggleButton.qml
index 86a5d15d1a..86a5d15d1a 100644
--- a/examples/quick/modelviews/listview/content/ToggleButton.qml
+++ b/examples/quick/views/listview/content/ToggleButton.qml
diff --git a/examples/quick/modelviews/listview/content/pics/arrow-down.png b/examples/quick/views/listview/content/pics/arrow-down.png
index 29d1d4439a..29d1d4439a 100644
--- a/examples/quick/modelviews/listview/content/pics/arrow-down.png
+++ b/examples/quick/views/listview/content/pics/arrow-down.png
diff --git a/examples/quick/modelviews/listview/content/pics/arrow-up.png b/examples/quick/views/listview/content/pics/arrow-up.png
index e437312217..e437312217 100644
--- a/examples/quick/modelviews/listview/content/pics/arrow-up.png
+++ b/examples/quick/views/listview/content/pics/arrow-up.png
diff --git a/examples/quick/modelviews/listview/content/pics/fruit-salad.jpg b/examples/quick/views/listview/content/pics/fruit-salad.jpg
index da5a6b10a2..da5a6b10a2 100644
--- a/examples/quick/modelviews/listview/content/pics/fruit-salad.jpg
+++ b/examples/quick/views/listview/content/pics/fruit-salad.jpg
diff --git a/examples/quick/modelviews/listview/content/pics/hamburger.jpg b/examples/quick/views/listview/content/pics/hamburger.jpg
index d0a15be1bf..d0a15be1bf 100644
--- a/examples/quick/modelviews/listview/content/pics/hamburger.jpg
+++ b/examples/quick/views/listview/content/pics/hamburger.jpg
diff --git a/examples/quick/modelviews/listview/content/pics/lemonade.jpg b/examples/quick/views/listview/content/pics/lemonade.jpg
index db445c9ac8..db445c9ac8 100644
--- a/examples/quick/modelviews/listview/content/pics/lemonade.jpg
+++ b/examples/quick/views/listview/content/pics/lemonade.jpg
diff --git a/examples/quick/modelviews/listview/content/pics/list-delete.png b/examples/quick/views/listview/content/pics/list-delete.png
index df2a147d24..df2a147d24 100644
--- a/examples/quick/modelviews/listview/content/pics/list-delete.png
+++ b/examples/quick/views/listview/content/pics/list-delete.png
diff --git a/examples/quick/modelviews/listview/content/pics/minus-sign.png b/examples/quick/views/listview/content/pics/minus-sign.png
index d6f233d739..d6f233d739 100644
--- a/examples/quick/modelviews/listview/content/pics/minus-sign.png
+++ b/examples/quick/views/listview/content/pics/minus-sign.png
diff --git a/examples/quick/modelviews/listview/content/pics/moreDown.png b/examples/quick/views/listview/content/pics/moreDown.png
index 31a35d5c20..31a35d5c20 100644
--- a/examples/quick/modelviews/listview/content/pics/moreDown.png
+++ b/examples/quick/views/listview/content/pics/moreDown.png
diff --git a/examples/quick/modelviews/listview/content/pics/moreUp.png b/examples/quick/views/listview/content/pics/moreUp.png
index fefb9c9098..fefb9c9098 100644
--- a/examples/quick/modelviews/listview/content/pics/moreUp.png
+++ b/examples/quick/views/listview/content/pics/moreUp.png
diff --git a/examples/quick/modelviews/listview/content/pics/pancakes.jpg b/examples/quick/views/listview/content/pics/pancakes.jpg
index 60c439638e..60c439638e 100644
--- a/examples/quick/modelviews/listview/content/pics/pancakes.jpg
+++ b/examples/quick/views/listview/content/pics/pancakes.jpg
diff --git a/examples/quick/modelviews/listview/content/pics/plus-sign.png b/examples/quick/views/listview/content/pics/plus-sign.png
index 40df1134f8..40df1134f8 100644
--- a/examples/quick/modelviews/listview/content/pics/plus-sign.png
+++ b/examples/quick/views/listview/content/pics/plus-sign.png
diff --git a/examples/quick/modelviews/listview/content/pics/vegetable-soup.jpg b/examples/quick/views/listview/content/pics/vegetable-soup.jpg
index 9dce332041..9dce332041 100644
--- a/examples/quick/modelviews/listview/content/pics/vegetable-soup.jpg
+++ b/examples/quick/views/listview/content/pics/vegetable-soup.jpg
diff --git a/examples/quick/modelviews/listview/dynamiclist.qml b/examples/quick/views/listview/dynamiclist.qml
index 6dd225d7b6..6dd225d7b6 100644
--- a/examples/quick/modelviews/listview/dynamiclist.qml
+++ b/examples/quick/views/listview/dynamiclist.qml
diff --git a/examples/quick/modelviews/listview/expandingdelegates.qml b/examples/quick/views/listview/expandingdelegates.qml
index b6af0f6d17..b6af0f6d17 100644
--- a/examples/quick/modelviews/listview/expandingdelegates.qml
+++ b/examples/quick/views/listview/expandingdelegates.qml
diff --git a/examples/quick/modelviews/listview/highlight.qml b/examples/quick/views/listview/highlight.qml
index bf6c9028c5..bf6c9028c5 100644
--- a/examples/quick/modelviews/listview/highlight.qml
+++ b/examples/quick/views/listview/highlight.qml
diff --git a/examples/quick/modelviews/listview/highlightranges.qml b/examples/quick/views/listview/highlightranges.qml
index f0cc1421f0..f0cc1421f0 100644
--- a/examples/quick/modelviews/listview/highlightranges.qml
+++ b/examples/quick/views/listview/highlightranges.qml
diff --git a/examples/quick/modelviews/listview/sections.qml b/examples/quick/views/listview/sections.qml
index 7a9562fa70..7a9562fa70 100644
--- a/examples/quick/modelviews/listview/sections.qml
+++ b/examples/quick/views/listview/sections.qml
diff --git a/examples/quick/modelviews/main.cpp b/examples/quick/views/main.cpp
index 84d52cbc12..3d41683035 100644
--- a/examples/quick/modelviews/main.cpp
+++ b/examples/quick/views/main.cpp
@@ -38,4 +38,4 @@
 **
 ****************************************************************************/
 #include "../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(modelviews)
+DECLARATIVE_EXAMPLE_MAIN(views)
diff --git a/examples/quick/modelviews/package/Delegate.qml b/examples/quick/views/package/Delegate.qml
index e439716d57..e439716d57 100644
--- a/examples/quick/modelviews/package/Delegate.qml
+++ b/examples/quick/views/package/Delegate.qml
diff --git a/examples/quick/modelviews/package/view.qml b/examples/quick/views/package/view.qml
index f326da4267..f326da4267 100644
--- a/examples/quick/modelviews/package/view.qml
+++ b/examples/quick/views/package/view.qml
diff --git a/examples/quick/modelviews/parallax/content/Clock.qml b/examples/quick/views/parallax/content/Clock.qml
index 05317b1151..05317b1151 100644
--- a/examples/quick/modelviews/parallax/content/Clock.qml
+++ b/examples/quick/views/parallax/content/Clock.qml
diff --git a/examples/quick/modelviews/parallax/content/ParallaxView.qml b/examples/quick/views/parallax/content/ParallaxView.qml
index 2cbb6e6e7c..2cbb6e6e7c 100644
--- a/examples/quick/modelviews/parallax/content/ParallaxView.qml
+++ b/examples/quick/views/parallax/content/ParallaxView.qml
diff --git a/examples/quick/views/parallax/content/QuitButton.qml b/examples/quick/views/parallax/content/QuitButton.qml
new file mode 100644
index 0000000000..8133541b33
--- /dev/null
+++ b/examples/quick/views/parallax/content/QuitButton.qml
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+Image {
+    source: "quit.png"
+    scale: quitMouse.pressed ? 0.8 : 1.0
+    smooth: quitMouse.pressed
+    MouseArea {
+        id: quitMouse
+        anchors.fill: parent
+        anchors.margins: -10
+        onClicked: Qt.quit()
+    }
+}
diff --git a/examples/quick/modelviews/parallax/content/Smiley.qml b/examples/quick/views/parallax/content/Smiley.qml
index d932aaeac0..d932aaeac0 100644
--- a/examples/quick/modelviews/parallax/content/Smiley.qml
+++ b/examples/quick/views/parallax/content/Smiley.qml
diff --git a/examples/quick/modelviews/parallax/content/background.png b/examples/quick/views/parallax/content/background.png
index a885950862..a885950862 100644
--- a/examples/quick/modelviews/parallax/content/background.png
+++ b/examples/quick/views/parallax/content/background.png
diff --git a/examples/quick/modelviews/parallax/content/center.png b/examples/quick/views/parallax/content/center.png
index 7fbd802a44..7fbd802a44 100644
--- a/examples/quick/modelviews/parallax/content/center.png
+++ b/examples/quick/views/parallax/content/center.png
diff --git a/examples/quick/modelviews/parallax/content/clock-night.png b/examples/quick/views/parallax/content/clock-night.png
index cc7151a397..cc7151a397 100644
--- a/examples/quick/modelviews/parallax/content/clock-night.png
+++ b/examples/quick/views/parallax/content/clock-night.png
diff --git a/examples/quick/modelviews/parallax/content/clock.png b/examples/quick/views/parallax/content/clock.png
index 462edacc0e..462edacc0e 100644
--- a/examples/quick/modelviews/parallax/content/clock.png
+++ b/examples/quick/views/parallax/content/clock.png
diff --git a/examples/quick/modelviews/parallax/content/hour.png b/examples/quick/views/parallax/content/hour.png
index f8061a1235..f8061a1235 100644
--- a/examples/quick/modelviews/parallax/content/hour.png
+++ b/examples/quick/views/parallax/content/hour.png
diff --git a/examples/quick/modelviews/parallax/content/minute.png b/examples/quick/views/parallax/content/minute.png
index 1297ec7c2b..1297ec7c2b 100644
--- a/examples/quick/modelviews/parallax/content/minute.png
+++ b/examples/quick/views/parallax/content/minute.png
diff --git a/examples/quick/modelviews/parallax/content/pics/background.jpg b/examples/quick/views/parallax/content/pics/background.jpg
index 61cca2f138..61cca2f138 100644
--- a/examples/quick/modelviews/parallax/content/pics/background.jpg
+++ b/examples/quick/views/parallax/content/pics/background.jpg
diff --git a/examples/quick/modelviews/parallax/content/pics/face-smile.png b/examples/quick/views/parallax/content/pics/face-smile.png
index 3d66d72578..3d66d72578 100644
--- a/examples/quick/modelviews/parallax/content/pics/face-smile.png
+++ b/examples/quick/views/parallax/content/pics/face-smile.png
diff --git a/examples/quick/modelviews/parallax/content/pics/home-page.png b/examples/quick/views/parallax/content/pics/home-page.png
index bd090c3708..bd090c3708 100644
--- a/examples/quick/modelviews/parallax/content/pics/home-page.png
+++ b/examples/quick/views/parallax/content/pics/home-page.png
diff --git a/examples/quick/modelviews/parallax/content/pics/home-page.svg b/examples/quick/views/parallax/content/pics/home-page.svg
index 4f16958844..4f16958844 100644
--- a/examples/quick/modelviews/parallax/content/pics/home-page.svg
+++ b/examples/quick/views/parallax/content/pics/home-page.svg
diff --git a/examples/quick/modelviews/parallax/content/pics/shadow.png b/examples/quick/views/parallax/content/pics/shadow.png
index 8270565e87..8270565e87 100644
--- a/examples/quick/modelviews/parallax/content/pics/shadow.png
+++ b/examples/quick/views/parallax/content/pics/shadow.png
diff --git a/examples/quick/modelviews/parallax/content/pics/yast-joystick.png b/examples/quick/views/parallax/content/pics/yast-joystick.png
index 858cea0301..858cea0301 100644
--- a/examples/quick/modelviews/parallax/content/pics/yast-joystick.png
+++ b/examples/quick/views/parallax/content/pics/yast-joystick.png
diff --git a/examples/quick/modelviews/parallax/content/pics/yast-wol.png b/examples/quick/views/parallax/content/pics/yast-wol.png
index 7712180a3b..7712180a3b 100644
--- a/examples/quick/modelviews/parallax/content/pics/yast-wol.png
+++ b/examples/quick/views/parallax/content/pics/yast-wol.png
diff --git a/examples/quick/modelviews/parallax/content/quit.png b/examples/quick/views/parallax/content/quit.png
index b822057d4e..b822057d4e 100644
--- a/examples/quick/modelviews/parallax/content/quit.png
+++ b/examples/quick/views/parallax/content/quit.png
diff --git a/examples/quick/modelviews/parallax/content/second.png b/examples/quick/views/parallax/content/second.png
index 4aa9fb5e8e..4aa9fb5e8e 100644
--- a/examples/quick/modelviews/parallax/content/second.png
+++ b/examples/quick/views/parallax/content/second.png
diff --git a/examples/quick/modelviews/parallax/parallax.qml b/examples/quick/views/parallax/parallax.qml
index 74ffab86e8..74ffab86e8 100644
--- a/examples/quick/modelviews/parallax/parallax.qml
+++ b/examples/quick/views/parallax/parallax.qml
diff --git a/examples/quick/modelviews/pathview/pathview-example.qml b/examples/quick/views/pathview/pathview-example.qml
index 38ba08cb16..38ba08cb16 100644
--- a/examples/quick/modelviews/pathview/pathview-example.qml
+++ b/examples/quick/views/pathview/pathview-example.qml
diff --git a/examples/quick/modelviews/pathview/pics/AddressBook_48.png b/examples/quick/views/pathview/pics/AddressBook_48.png
index 1ab7c8eec1..1ab7c8eec1 100644
--- a/examples/quick/modelviews/pathview/pics/AddressBook_48.png
+++ b/examples/quick/views/pathview/pics/AddressBook_48.png
diff --git a/examples/quick/modelviews/pathview/pics/AudioPlayer_48.png b/examples/quick/views/pathview/pics/AudioPlayer_48.png
index f4b8689f87..f4b8689f87 100644
--- a/examples/quick/modelviews/pathview/pics/AudioPlayer_48.png
+++ b/examples/quick/views/pathview/pics/AudioPlayer_48.png
diff --git a/examples/quick/modelviews/pathview/pics/Camera_48.png b/examples/quick/views/pathview/pics/Camera_48.png
index c76b524945..c76b524945 100644
--- a/examples/quick/modelviews/pathview/pics/Camera_48.png
+++ b/examples/quick/views/pathview/pics/Camera_48.png
diff --git a/examples/quick/modelviews/pathview/pics/DateBook_48.png b/examples/quick/views/pathview/pics/DateBook_48.png
index 58f5787fb8..58f5787fb8 100644
--- a/examples/quick/modelviews/pathview/pics/DateBook_48.png
+++ b/examples/quick/views/pathview/pics/DateBook_48.png
diff --git a/examples/quick/modelviews/pathview/pics/EMail_48.png b/examples/quick/views/pathview/pics/EMail_48.png
index d6d84a61be..d6d84a61be 100644
--- a/examples/quick/modelviews/pathview/pics/EMail_48.png
+++ b/examples/quick/views/pathview/pics/EMail_48.png
diff --git a/examples/quick/modelviews/pathview/pics/TodoList_48.png b/examples/quick/views/pathview/pics/TodoList_48.png
index 0988448d9b..0988448d9b 100644
--- a/examples/quick/modelviews/pathview/pics/TodoList_48.png
+++ b/examples/quick/views/pathview/pics/TodoList_48.png
diff --git a/examples/quick/modelviews/pathview/pics/VideoPlayer_48.png b/examples/quick/views/pathview/pics/VideoPlayer_48.png
index 52638c50a7..52638c50a7 100644
--- a/examples/quick/modelviews/pathview/pics/VideoPlayer_48.png
+++ b/examples/quick/views/pathview/pics/VideoPlayer_48.png
diff --git a/examples/quick/views/views.pro b/examples/quick/views/views.pro
new file mode 100644
index 0000000000..b424ba66f2
--- /dev/null
+++ b/examples/quick/views/views.pro
@@ -0,0 +1,17 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/views
+qml.files = \
+        views.qml \
+        gridview \
+        listview \
+        package \
+        parallax \
+        pathview \
+        visualdatamodel \
+        visualitemmodel
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/views
+INSTALLS += target qml
diff --git a/examples/quick/views/views.qml b/examples/quick/views/views.qml
new file mode 100644
index 0000000000..9d4464933b
--- /dev/null
+++ b/examples/quick/views/views.qml
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import "../shared" as Examples
+
+/*!
+    \title QtQuick Examples - Views
+    \example quick/views
+    \brief This is a collection of QML model and view examples
+    \image qml-modelviews-example.png
+
+    This is a collection of small QML examples relating to model and view functionality. They
+    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
+
+    \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
+
+    \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
+
+    \section2 Highlight demonstrates adding a custom highlight to a ListView.
+    \snippet examples/quick/modelviews/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
+
+    \section2 Sections demonstrates the various section headers and footers available to ListView.
+    \snippet examples/quick/modelviews/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
+
+    A VisualDataModel allows the individual views to access their specific items from
+    the shared package delegate.
+
+    \snippet examples/quick/modelviews/package/view.qml 0
+
+    \section2 VisualItemModel uses a VisualItemModel for the model instead of a ListModel.
+
+    \snippet examples/quick/modelviews/visualitemmodel/visualitemmodel.qml 0
+    */
+
+    Item {
+        height: 480
+        width: 320
+        Examples.LauncherList {
+            id: ll
+            anchors.fill: parent
+            Component.onCompleted: {
+                addExample("GridView", "A simple GridView", Qt.resolvedUrl("gridview/gridview-example.qml"))
+                addExample("Dynamic List", "A dynamically alterable list", Qt.resolvedUrl("listview/dynamiclist.qml"))
+                addExample("Expanding Delegates", "A ListView with delegates that expand", Qt.resolvedUrl("listview/expandingdelegates.qml"))
+                addExample("Highlight", "A ListView with a custom highlight", Qt.resolvedUrl("listview/highlight.qml"))
+                addExample("Highlight Ranges", "The three highlight ranges of ListView", Qt.resolvedUrl("listview/highlightranges.qml"))
+                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"))
+            }
+        }
+}
diff --git a/examples/quick/modelviews/modelviews.qmlproject b/examples/quick/views/views.qmlproject
index 40f9e568fd..7e6baf0a7f 100644
--- a/examples/quick/modelviews/modelviews.qmlproject
+++ b/examples/quick/views/views.qmlproject
@@ -1,7 +1,7 @@
 import QmlProject 1.1
 
 Project {
-    mainFile: "modelviews.qml"
+    mainFile: "views.qml"
 
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
diff --git a/examples/quick/modelviews/visualdatamodel/dragselection.qml b/examples/quick/views/visualdatamodel/dragselection.qml
index d63b3bd571..d63b3bd571 100644
--- a/examples/quick/modelviews/visualdatamodel/dragselection.qml
+++ b/examples/quick/views/visualdatamodel/dragselection.qml
diff --git a/examples/quick/modelviews/visualdatamodel/slideshow.qml b/examples/quick/views/visualdatamodel/slideshow.qml
index 3f08f974f5..3f08f974f5 100644
--- a/examples/quick/modelviews/visualdatamodel/slideshow.qml
+++ b/examples/quick/views/visualdatamodel/slideshow.qml
diff --git a/examples/quick/modelviews/visualdatamodel/visualdatamodel.qmlproject b/examples/quick/views/visualdatamodel/visualdatamodel.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/quick/modelviews/visualdatamodel/visualdatamodel.qmlproject
+++ b/examples/quick/views/visualdatamodel/visualdatamodel.qmlproject
diff --git a/examples/quick/modelviews/visualitemmodel/visualitemmodel.qml b/examples/quick/views/visualitemmodel/visualitemmodel.qml
index 20119fc88d..20119fc88d 100644
--- a/examples/quick/modelviews/visualitemmodel/visualitemmodel.qml
+++ b/examples/quick/views/visualitemmodel/visualitemmodel.qml