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>

examples/qml/qml.pro

@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-SUBDIRS +=imageprovider \
+SUBDIRS += \
           networkaccessmanagerfactory \
           plugins \
           referenceexamples \

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

examples/quick/models/models.pro

@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+SUBDIRS = \
+#    abstractitemmodel \ #Doesn't build right now
+    objectlistmodel \
+    stringlistmodel

examples/quick/modelviews/modelviews.pro

@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-
-browser.file = browser.prx
-SUBDIRS = \
-    browser \
-#    abstractitemmodel \ # Does not build
-    objectlistmodel \
-    stringlistmodel

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

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

examples/quick/views/main.cpp

@@ -38,4 +38,4 @@
 **
 ****************************************************************************/
 #include "../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(modelviews)
+DECLARATIVE_EXAMPLE_MAIN(views)

examples/quick/views/parallax/content/QuitButton.qml

@@ -39,24 +39,14 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../shared" as Examples
-
-Item {
-    height: 480
-    width: 320
-    Examples.LauncherList {
-        id: ll
+Image {
+    source: "quit.png"
+    scale: quitMouse.pressed ? 0.8 : 1.0
+    smooth: quitMouse.pressed
+    MouseArea {
+        id: quitMouse
         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"))
-        }
+        anchors.margins: -10
+        onClicked: Qt.quit()
     }
 }

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

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"))
+            }
+        }
+}

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 {