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>

6 files changed, 1 insertions, 190 deletions

diff --git a/examples/qml/imageprovider/ImageProviderCore/qmldir b/examples/qml/imageprovider/ImageProviderCore/qmldir
deleted file mode 100644
index 6be88bccec..0000000000
--- a/examples/qml/imageprovider/ImageProviderCore/qmldir
+++ /dev/null
@@ -1,2 +0,0 @@
-plugin qmlimageproviderplugin
-
diff --git a/examples/qml/imageprovider/imageprovider-example.qml b/examples/qml/imageprovider/imageprovider-example.qml
deleted file mode 100644
index 444a3447a5..0000000000
--- a/examples/qml/imageprovider/imageprovider-example.qml
+++ /dev/null
@@ -1,49 +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 "ImageProviderCore" // import the plugin that registers the color image provider
-
-//![0]
-Column {
-    Image { source: "image://colors/yellow" }
-    Image { source: "image://colors/red" }
-}
-//![0]
-
diff --git a/examples/qml/imageprovider/imageprovider.cpp b/examples/qml/imageprovider/imageprovider.cpp
deleted file mode 100644
index f752691125..0000000000
--- a/examples/qml/imageprovider/imageprovider.cpp
+++ /dev/null
@@ -1,109 +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 demonstration applications 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$
-**
-****************************************************************************/
-
-
-#include <qqmlextensionplugin.h>
-
-#include <qqmlengine.h>
-#include <qquickimageprovider.h>
-#include <QImage>
-#include <QPainter>
-
-//![0]
-class ColorImageProvider : public QQuickImageProvider
-{
-public:
-    ColorImageProvider()
-        : QQuickImageProvider(QQuickImageProvider::Pixmap)
-    {
-    }
-
-    QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
-    {
-        int width = 100;
-        int height = 50;
-
-        if (size)
-            *size = QSize(width, height);
-        QPixmap pixmap(requestedSize.width() > 0 ? requestedSize.width() : width,
-                       requestedSize.height() > 0 ? requestedSize.height() : height); 
-        pixmap.fill(QColor(id).rgba());
-//![0]
-
-        // write the color name
-        QPainter painter(&pixmap);
-        QFont f = painter.font();
-        f.setPixelSize(20);
-        painter.setFont(f);
-        painter.setPen(Qt::black);
-        if (requestedSize.isValid())
-            painter.scale(requestedSize.width() / width, requestedSize.height() / height);
-        painter.drawText(QRectF(0, 0, width, height), Qt::AlignCenter, id);
-
-//![1]
-        return pixmap;
-    }
-};
-//![1]
-
-
-class ImageProviderExtensionPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
-public:
-    void registerTypes(const char *uri)
-    {
-        Q_UNUSED(uri);
-    }
-
-    void initializeEngine(QQmlEngine *engine, const char *uri)
-    {
-        Q_UNUSED(uri);
-        engine->addImageProvider("colors", new ColorImageProvider);
-    }
-
-};
-
-
-#define QQmlExtensionInterface_iid "org.qt-project.Qt.QQmlExtensionInterface"
-
-
-#include "imageprovider.moc"
diff --git a/examples/qml/imageprovider/imageprovider.pro b/examples/qml/imageprovider/imageprovider.pro
deleted file mode 100644
index d1dd321b72..0000000000
--- a/examples/qml/imageprovider/imageprovider.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TEMPLATE = lib
-CONFIG += qt plugin
-QT += qml quick
-
-DESTDIR = ImageProviderCore
-TARGET  = qmlimageproviderplugin
-
-SOURCES += imageprovider.cpp
-
-EXAMPLE_FILES = imageprovider-example.qml
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qml/imageprovider/ImageProviderCore
-qml.files = ImageProviderCore/qmldir
-qml.path = $$[QT_INSTALL_EXAMPLES]/qml/imageprovider/ImageProviderCore
-INSTALLS = target qml
diff --git a/examples/qml/imageprovider/imageprovider.qmlproject b/examples/qml/imageprovider/imageprovider.qmlproject
deleted file mode 100644
index 2bb4016996..0000000000
--- a/examples/qml/imageprovider/imageprovider.qmlproject
+++ /dev/null
@@ -1,14 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-}
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 \