Merge branch 'master' into refactor

Conflicts:
	examples/declarative/cppextensions/qwidgets/qwidgets.pro
	examples/declarative/minehunt/main.cpp
	examples/declarative/minehunt/minehunt.pro
	src/declarative/items/context2d/qsgcontext2d.cpp
	src/declarative/items/qsgflickable.cpp
	src/declarative/items/qsgtextedit.cpp
	src/declarative/items/qsgtextinput.cpp
	src/declarative/particles/qsgangleddirection.cpp
	src/declarative/particles/qsgcumulativedirection.cpp
	src/declarative/particles/qsgcumulativedirection_p.h
	src/declarative/particles/qsgfollowemitter.cpp
	src/declarative/particles/qsgmodelparticle.cpp
	src/declarative/particles/qsgparticlesystem.cpp
	src/qtquick1/util/qdeclarativeview.h
	tests/auto/declarative/examples/examples.pro
	tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp

Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5

36 files changed, 12 insertions, 1532 deletions

diff --git a/examples/declarative/cppextensions/cppextensions.pro b/examples/declarative/cppextensions/cppextensions.pro
index 33762feb32..cde19b5c90 100644
--- a/examples/declarative/cppextensions/cppextensions.pro
+++ b/examples/declarative/cppextensions/cppextensions.pro
@@ -4,7 +4,5 @@ SUBDIRS += \
     imageprovider \
     plugins \
     networkaccessmanagerfactory \
-    qwidgets \
-    qgraphicslayouts \
     referenceexamples
 
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml b/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
index f8f7b0ee55..f4e374191f 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
@@ -37,13 +37,13 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 1.0
+import QtQuick 2.0
 import "ImageProviderCore" // import the plugin that registers the color image provider
 
 //![0]
 Column {
-    Image { source: "source://colors/yellow" }
-    Image { source: "source://colors/red" }
+    Image { source: "image://colors/yellow" }
+    Image { source: "image://colors/red" }
 }
 //![0]
 
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.cpp b/examples/declarative/cppextensions/imageprovider/imageprovider.cpp
index 730ce4b2b6..5078a97b44 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider.cpp
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider.cpp
@@ -42,10 +42,7 @@
 #include <qdeclarativeextensionplugin.h>
 
 #include <qdeclarativeengine.h>
-#include <qdeclarative.h>
-#include <qdeclarativeitem.h>
 #include <qdeclarativeimageprovider.h>
-#include <qdeclarativeview.h>
 #include <QImage>
 #include <QPainter>
 
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
index 5a915034dc..eaa48cd901 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += qt plugin
-QT += declarative qtquick1
+QT += declarative
 
 DESTDIR = ImageProviderCore
 TARGET  = qmlimageproviderplugin
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp b/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp
index 665feac8e3..2da6e3c8fe 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp
+++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp
@@ -44,7 +44,7 @@
 
 #include <QDeclarativeEngine>
 #include <QDeclarativeNetworkAccessManagerFactory>
-#include <QDeclarativeView>
+#include <QSGView>
 
 
 /*
@@ -97,7 +97,7 @@ int main(int argc, char ** argv)
         }
     }
 
-    QDeclarativeView view;
+    QSGView view;
     view.engine()->setNetworkAccessManagerFactory(new MyNetworkAccessManagerFactory);
 
     view.setSource(source);
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
index ba0498eaf8..74d8db321d 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
+++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = networkaccessmanagerfactory
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += declarative network qtquick1
+QT += declarative network
 
 # Input
 SOURCES += main.cpp 
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml b/examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml
index e002ef60e3..e335396f88 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml
+++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 
 Image {
     width: 100
diff --git a/examples/declarative/cppextensions/plugins/README b/examples/declarative/cppextensions/plugins/README
index 95e0eea849..f4f9074059 100644
--- a/examples/declarative/cppextensions/plugins/README
+++ b/examples/declarative/cppextensions/plugins/README
@@ -5,5 +5,5 @@ by a C++ plugin (providing the "Time" type), and by QML files (providing the
 To run:
 
   make install
-  qmlviewer -I . plugins.qml
+  QML_IMPORT_PATH=$PWD qmlscene plugins.qml
 
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
index 465f164dae..59a78946ca 100644
--- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
+++ b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 
 Rectangle {
     id: clock
diff --git a/examples/declarative/cppextensions/plugins/plugins.qml b/examples/declarative/cppextensions/plugins/plugins.qml
index a61af15c9f..4a6f25fe7c 100644
--- a/examples/declarative/cppextensions/plugins/plugins.qml
+++ b/examples/declarative/cppextensions/plugins/plugins.qml
@@ -48,5 +48,6 @@ Clock { // this class is defined in QML (com/nokia/TimeExample/Clock.qml)
 
     hours: time.hour
     minutes: time.minute
+
 }
 //![0]
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro
deleted file mode 100644
index 32e81fe557..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += declarative qtquick1
-
-SOURCES += main.cpp
-RESOURCES += layoutitem.qrc
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml
deleted file mode 100644
index de4d161074..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** 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 Nokia Corporation 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 1.0
-
-LayoutItem {    //Sized by the layout
-    id: resizable
-
-    minimumSize: "100x100"
-    maximumSize: "300x300"
-    preferredSize: "100x100"
-
-    Rectangle { color: "yellow"; anchors.fill: parent }
-
-    Rectangle { 
-        width: 100; height: 100
-        anchors.top: parent.top; anchors.right: parent.right
-        color: "green"
-    }
-}
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qmlproject b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qmlproject
deleted file mode 100644
index d4909f8685..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qrc b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qrc
deleted file mode 100644
index 2e5257866d..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>layoutitem.qml</file>
-</qresource>
-</RCC>
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp
deleted file mode 100644
index db94deaf30..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** 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 Nokia Corporation 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 <QApplication>
-#include <QGraphicsView>
-#include <QGraphicsScene>
-#include <QGraphicsWidget>
-#include <QGraphicsLinearLayout>
-#include <QDeclarativeComponent>
-#include <QDeclarativeEngine>
-
-/* This example demonstrates using a LayoutItem to let QML snippets integrate
-   nicely with existing QGraphicsView applications designed with GraphicsLayouts
-*/
-int main(int argc, char* argv[])
-{
-    QApplication app(argc, argv);
-
-    //Set up a graphics scene with a QGraphicsWidget and Layout
-    QGraphicsView view;
-    QGraphicsScene scene;
-    QGraphicsWidget *widget = new QGraphicsWidget();
-    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout();
-    widget->setLayout(layout);
-    scene.addItem(widget);
-    view.setScene(&scene);
-
-    //Add the QML snippet into the layout
-    QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl(":layoutitem.qml"));
-    QGraphicsLayoutItem* obj = qobject_cast<QGraphicsLayoutItem*>(c.create());
-    layout->addItem(obj);
-
-    widget->setGeometry(QRectF(0,0, 400,400));
-    view.show();
-    return app.exec();
-}
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp
deleted file mode 100644
index 3a073d0c54..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** 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 Nokia Corporation 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 "gridlayout.h"
-
-#include <QGraphicsWidget>
-#include <QDebug>
-
-GridLayoutAttached::GridLayoutAttached(QObject *parent)
-: QObject(parent), m_row(-1), m_column(-1), m_rowspan(1), m_colspan(1), m_alignment(-1), m_rowStretch(-1),
-    m_colStretch(-1), m_rowSpacing(-1), m_colSpacing(-1), m_rowPrefHeight(-1), m_rowMaxHeight(-1), m_rowMinHeight(-1),
-    m_rowFixHeight(-1), m_colPrefwidth(-1), m_colMaxwidth(-1), m_colMinwidth(-1), m_colFixwidth(-1)
-{
-}
-
-void GridLayoutAttached::setAlignment(Qt::Alignment a)
-{
-    if (m_alignment != a) {
-        m_alignment = a;
-        emit alignmentChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), m_alignment);
-    }
-}
-
-QHash<QGraphicsLayoutItem*, GridLayoutAttached*> GraphicsGridLayoutObject::attachedProperties;
-
-GraphicsGridLayoutObject::GraphicsGridLayoutObject(QObject *parent)
-: QObject(parent)
-{
-}
-
-GraphicsGridLayoutObject::~GraphicsGridLayoutObject()
-{
-}
-
-void GraphicsGridLayoutObject::addWidget(QGraphicsWidget *widget)
-{
-    //use attached properties
-    if (QObject *obj = attachedProperties.value(qobject_cast<QGraphicsLayoutItem*>(widget))) {
-        int row = static_cast<GridLayoutAttached *>(obj)->row();
-        int column = static_cast<GridLayoutAttached *>(obj)->column();
-        int rowSpan = static_cast<GridLayoutAttached *>(obj)->rowSpan();
-        int columnSpan = static_cast<GridLayoutAttached *>(obj)->columnSpan();
-        if (row == -1 || column == -1) {
-            qWarning() << "Must set row and column for an item in a grid layout";
-            return;
-        }
-        addItem(widget, row, column, rowSpan, columnSpan);
-    }
-}
-
-void GraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item)
-{
-    //use attached properties
-    if (GridLayoutAttached *obj = attachedProperties.value(item)) {
-        int row = obj->row();
-        int column = obj->column();
-        int rowSpan = obj->rowSpan();
-        int columnSpan = obj->columnSpan();
-        Qt::Alignment alignment = obj->alignment();
-
-        if (row == -1 || column == -1) {
-            qWarning() << "Must set row and column for an item in a grid layout";
-            return;
-        }
-
-        if (obj->rowSpacing() != -1)
-            setRowSpacing(row, obj->rowSpacing());
-        if (obj->columnSpacing() != -1)
-            setColumnSpacing(column, obj->columnSpacing());
-        if (obj->rowStretchFactor() != -1)
-            setRowStretchFactor(row, obj->rowStretchFactor());
-        if (obj->columnStretchFactor() != -1)
-            setColumnStretchFactor(column, obj->columnStretchFactor());
-        if (obj->rowPreferredHeight() != -1)
-            setRowPreferredHeight(row, obj->rowPreferredHeight());
-        if (obj->rowMaximumHeight() != -1)
-            setRowMaximumHeight(row, obj->rowMaximumHeight());
-        if (obj->rowMinimumHeight() != -1)
-            setRowMinimumHeight(row, obj->rowMinimumHeight());
-        if (obj->rowFixedHeight() != -1)
-            setRowFixedHeight(row, obj->rowFixedHeight());
-        if (obj->columnPreferredWidth() != -1)
-            setColumnPreferredWidth(row, obj->columnPreferredWidth());
-        if (obj->columnMaximumWidth() != -1)
-            setColumnMaximumWidth(row, obj->columnMaximumWidth());
-        if (obj->columnMinimumWidth() != -1)
-            setColumnMinimumWidth(row, obj->columnMinimumWidth());
-        if (obj->columnFixedWidth() != -1)
-            setColumnFixedWidth(row, obj->columnFixedWidth());
-
-        addItem(item, row, column, rowSpan, columnSpan);
-
-        if (alignment != -1)
-            setAlignment(item, alignment);
-        QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*, Qt::Alignment)),
-                         this, SLOT(updateAlignment(QGraphicsLayoutItem*, Qt::Alignment)));
-    }
-}
-
-void GraphicsGridLayoutObject::removeAt(int index)
-{
-    QGraphicsLayoutItem *item = itemAt(index);
-    if (item) {
-        GridLayoutAttached *obj = attachedProperties.value(item);
-        obj->disconnect(this);
-        attachedProperties.remove(item);
-    }
-    QGraphicsGridLayout::removeAt(index);
-}
-
-void GraphicsGridLayoutObject::clearChildren()
-{
-    // do not delete the removed items; they will be deleted by the QML engine
-    while (count() > 0)
-        removeAt(count()-1);
-}
-
-qreal GraphicsGridLayoutObject::spacing() const
-{
-    if (verticalSpacing() == horizontalSpacing())
-        return verticalSpacing();
-    return -1; 
-}
-
-qreal GraphicsGridLayoutObject::contentsMargin() const
-{
-    qreal a, b, c, d;
-    getContentsMargins(&a, &b, &c, &d);
-    if (a == b && a == c && a == d)
-        return a;
-    return -1;
-}
-
-void GraphicsGridLayoutObject::setContentsMargin(qreal m)
-{
-    setContentsMargins(m, m, m, m);
-}
-
-void GraphicsGridLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
-{
-    QGraphicsGridLayout::setAlignment(item, alignment);
-}
-
-GridLayoutAttached *GraphicsGridLayoutObject::qmlAttachedProperties(QObject *obj)
-{
-    GridLayoutAttached *rv = new GridLayoutAttached(obj);
-    if (qobject_cast<QGraphicsLayoutItem*>(obj))
-        attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
-    return rv;
-}
-
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.h b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.h
deleted file mode 100644
index 905f2f21f7..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** 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 Nokia Corporation 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$
-**
-****************************************************************************/
-
-#ifndef GRIDLAYOUT_H
-#define GRIDLAYOUT_H
-
-#include <qdeclarative.h>
-
-#include <QGraphicsGridLayout>
-#include <QGraphicsLayoutItem>
-
-class GridLayoutAttached;
-class GraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
-
-    Q_PROPERTY(QDeclarativeListProperty<QGraphicsLayoutItem> children READ children)
-    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
-    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
-    Q_PROPERTY(qreal verticalSpacing READ verticalSpacing WRITE setVerticalSpacing)
-    Q_PROPERTY(qreal horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing)
-    Q_CLASSINFO("DefaultProperty", "children")
-
-public:
-    GraphicsGridLayoutObject(QObject * = 0);
-    ~GraphicsGridLayoutObject();
-
-    QDeclarativeListProperty<QGraphicsLayoutItem> children() { return QDeclarativeListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
-
-    qreal spacing() const;
-    qreal contentsMargin() const;
-    void setContentsMargin(qreal);
-
-    void removeAt(int index);
-
-    static GridLayoutAttached *qmlAttachedProperties(QObject *);
-
-private slots:
-    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    friend class GraphicsLayoutAttached;
-
-    void addWidget(QGraphicsWidget *);
-    void clearChildren();
-    void addLayoutItem(QGraphicsLayoutItem *);
-
-    static void children_append(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
-        static_cast<GraphicsGridLayoutObject*>(prop->object)->addLayoutItem(item);
-    }
-
-    static void children_clear(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
-        static_cast<GraphicsGridLayoutObject*>(prop->object)->clearChildren();
-    }
-
-    static int children_count(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
-        return static_cast<GraphicsGridLayoutObject*>(prop->object)->count();
-    }
-
-    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, int index) {
-        return static_cast<GraphicsGridLayoutObject*>(prop->object)->itemAt(index);
-    }
-
-    static QHash<QGraphicsLayoutItem*, GridLayoutAttached*> attachedProperties;
-};
-
-
-class GridLayoutAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int row READ row WRITE setRow)
-    Q_PROPERTY(int column READ column WRITE setColumn)
-
-    Q_PROPERTY(int rowSpan READ rowSpan WRITE setRowSpan)
-    Q_PROPERTY(int columnSpan READ columnSpan WRITE setColumnSpan)
-    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
-
-    Q_PROPERTY(int rowStretchFactor READ rowStretchFactor WRITE setRowStretchFactor)
-    Q_PROPERTY(int columnStretchFactor READ columnStretchFactor WRITE setColumnStretchFactor)
-    Q_PROPERTY(int rowSpacing READ rowSpacing WRITE setRowSpacing)
-    Q_PROPERTY(int columnSpacing READ columnSpacing WRITE setColumnSpacing)
-
-    Q_PROPERTY(int rowPreferredHeight READ rowPreferredHeight WRITE setRowPreferredHeight)
-    Q_PROPERTY(int rowMinimumHeight READ rowMinimumHeight WRITE setRowMinimumHeight)
-    Q_PROPERTY(int rowMaximumHeight READ rowMaximumHeight WRITE setRowMaximumHeight)
-    Q_PROPERTY(int rowFixedHeight READ rowFixedHeight WRITE setRowFixedHeight)
-
-    Q_PROPERTY(int columnPreferredWidth READ columnPreferredWidth WRITE setColumnPreferredWidth)
-    Q_PROPERTY(int columnMaximumWidth READ columnMaximumWidth WRITE setColumnMaximumWidth)
-    Q_PROPERTY(int columnMinimumWidth READ columnMinimumWidth WRITE setColumnMinimumWidth)
-    Q_PROPERTY(int columnFixedWidth READ columnFixedWidth WRITE setColumnFixedWidth)
-
-public:
-    GridLayoutAttached(QObject *parent);
-
-    int row() const { return m_row; }
-    void setRow(int r) { m_row = r; }
-
-    int column() const { return m_column; }
-    void setColumn(int c) { m_column = c; }
-
-    int rowSpan() const { return m_rowspan; }
-    void setRowSpan(int rs) { m_rowspan = rs; }
-
-    int columnSpan() const { return m_colspan; }
-    void setColumnSpan(int cs) { m_colspan = cs; }
-
-    Qt::Alignment alignment() const { return m_alignment; }
-    void setAlignment(Qt::Alignment a);
-
-    int rowStretchFactor() const { return m_rowStretch; }
-    void setRowStretchFactor(int f) { m_rowStretch = f; }
-    int columnStretchFactor() const { return m_colStretch; }
-    void setColumnStretchFactor(int f) { m_colStretch = f; }
-
-    int rowSpacing() const { return m_rowSpacing; }
-    void setRowSpacing(int s) { m_rowSpacing = s; }
-    int columnSpacing() const { return m_colSpacing; }
-    void setColumnSpacing(int s) { m_colSpacing = s; }
-
-    int rowPreferredHeight() const { return m_rowPrefHeight; }
-    void setRowPreferredHeight(int s) { m_rowPrefHeight = s; }
-
-    int rowMaximumHeight() const { return m_rowMaxHeight; }
-    void setRowMaximumHeight(int s) { m_rowMaxHeight = s; }
-
-    int rowMinimumHeight() const { return m_rowMinHeight; }
-    void setRowMinimumHeight(int s) { m_rowMinHeight = s; }
-
-    int rowFixedHeight() const { return m_rowFixHeight; }
-    void setRowFixedHeight(int s) { m_rowFixHeight = s; }
-
-    int columnPreferredWidth() const { return m_colPrefwidth; }
-    void setColumnPreferredWidth(int s) { m_colPrefwidth = s; }
-
-    int columnMaximumWidth() const { return m_colMaxwidth; }
-    void setColumnMaximumWidth(int s) { m_colMaxwidth = s; }
-
-    int columnMinimumWidth() const { return m_colMinwidth; }
-    void setColumnMinimumWidth(int s) { m_colMinwidth = s; }
-
-    int columnFixedWidth() const { return m_colFixwidth; }
-    void setColumnFixedWidth(int s) { m_colFixwidth = s; }
-
-signals:
-    void alignmentChanged(QGraphicsLayoutItem*, Qt::Alignment);
-
-private:
-    int m_row;
-    int m_column;
-
-    int m_rowspan;
-    int m_colspan;
-    Qt::Alignment m_alignment;
-
-    int m_rowStretch;
-    int m_colStretch;
-    int m_rowSpacing;
-    int m_colSpacing;
-
-    int m_rowPrefHeight;
-    int m_rowMaxHeight;
-    int m_rowMinHeight;
-    int m_rowFixHeight;
-
-    int m_colPrefwidth;
-    int m_colMaxwidth;
-    int m_colMinwidth;
-    int m_colFixwidth;
-};
-
-QML_DECLARE_INTERFACE(QGraphicsLayoutItem)
-QML_DECLARE_INTERFACE(QGraphicsLayout)
-QML_DECLARE_TYPE(GraphicsGridLayoutObject)
-QML_DECLARE_TYPEINFO(GraphicsGridLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
-
-#endif
-
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.qrc b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.qrc
deleted file mode 100644
index bdf8312124..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>qgraphicsgridlayout.qml</file>
-</qresource>
-</RCC>
-
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/main.cpp b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/main.cpp
deleted file mode 100644
index 6525cb31c7..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/main.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins 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 Nokia Corporation 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 "gridlayout.h"
-
-#include <qdeclarative.h>
-#include <QDeclarativeView>
-
-#include <QApplication>
-
-int main(int argc, char* argv[])
-{
-    QApplication app(argc, argv);
-
-    qmlRegisterInterface<QGraphicsLayoutItem>("QGraphicsLayoutItem");
-    qmlRegisterInterface<QGraphicsLayout>("QGraphicsLayout");
-    qmlRegisterType<GraphicsGridLayoutObject>("GridLayouts", 4, 7, "GraphicsGridLayout");
-
-    QDeclarativeView view;
-    view.setSource(QUrl(":qgraphicsgridlayout.qml"));
-    view.show();
-
-    return app.exec();
-};
-
-
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
deleted file mode 100644
index 2d9e7bc04e..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TEMPLATE = app
-TARGET  = qgraphicsgridlayout
-QT += declarative qtquick1
-
-SOURCES += \
-    gridlayout.cpp \
-    main.cpp
-
-HEADERS += \
-    gridlayout.h
-
-RESOURCES += \
-    gridlayout.qrc
-
-
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
deleted file mode 100644
index 6780a5a035..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** 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 Nokia Corporation 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 1.0
-import GridLayouts 4.7
-
-Item {
-    width: 400
-    height: 400
-
-    QGraphicsWidget {
-        size.width: parent.width
-        size.height: parent.height
-
-        /*
-            Below we create a grid layout using the GraphicsGridLayout item 
-            (defined by the GraphicsGridLayoutObject class in gridlayout.h). 
-
-            The row, column etc. are set through attached properties on
-            GraphicsGridLayout, using the properties defined in the 
-            GridLayoutAttached class (also defined in gridlayout.h).
-        */
-
-        layout: GraphicsGridLayout {
-            LayoutItem {
-                GraphicsGridLayout.row: 0
-                GraphicsGridLayout.column: 0
-                minimumSize: "100x100"
-                maximumSize: "300x300"
-                preferredSize: "200x200"
-                Rectangle { color: "red"; anchors.fill: parent }
-            }
-            LayoutItem {
-                GraphicsGridLayout.row: 0
-                GraphicsGridLayout.column: 1
-                minimumSize: "100x100"
-                maximumSize: "200x200"
-                preferredSize: "200x200"
-                Rectangle { color: "orange"; anchors.fill: parent }
-            }
-            LayoutItem {
-                GraphicsGridLayout.row: 1
-                GraphicsGridLayout.column: 0
-                GraphicsGridLayout.columnSpan: 2
-                minimumSize: "100x100"
-                Rectangle { color: "yellow"; anchors.fill: parent }
-            }
-            LayoutItem {
-                GraphicsGridLayout.row: 2
-                GraphicsGridLayout.column: 0
-                preferredSize: "200x200"
-                Rectangle { color: "green"; anchors.fill: parent }
-            }
-            LayoutItem {
-                GraphicsGridLayout.row: 2
-                GraphicsGridLayout.column: 1
-                preferredSize: "200x200"
-                Rectangle { color: "blue"; anchors.fill: parent }
-            }
-        }
-    }
-}
-
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.pro
deleted file mode 100644
index 672120a82e..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
-    layoutitem \
-    qgraphicsgridlayout \
-    qgraphicslinearlayout
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.qmlproject b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.qmlproject
deleted file mode 100644
index d4909f8685..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.cpp b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.cpp
deleted file mode 100644
index 75f43cab90..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** 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 Nokia Corporation 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 "linearlayout.h"
-
-#include <QGraphicsWidget>
-#include <QGraphicsLayoutItem>
-
-LinearLayoutAttached::LinearLayoutAttached(QObject *parent)
-: QObject(parent), m_stretch(1), m_alignment(Qt::AlignTop), m_spacing(0)
-{
-}
-
-void LinearLayoutAttached::setStretchFactor(int f)
-{
-    if (m_stretch != f) {
-        m_stretch = f;
-        emit stretchChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), m_stretch);
-    }
-}
-
-void LinearLayoutAttached::setSpacing(int s)
-{
-    if (m_spacing != s) {
-        m_spacing = s;
-        emit spacingChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), m_spacing);
-    }
-}
-
-void LinearLayoutAttached::setAlignment(Qt::Alignment a)
-{
-    if (m_alignment != a) {
-        m_alignment = a;
-        emit alignmentChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), m_alignment);
-    }
-}
-
-GraphicsLinearLayoutStretchItemObject::GraphicsLinearLayoutStretchItemObject(QObject *parent)
-    : QObject(parent)
-{
-}
-
-QSizeF GraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
-{
-    Q_UNUSED(which);
-    Q_UNUSED(constraint);
-    return QSizeF();
-}
-
-
-GraphicsLinearLayoutObject::GraphicsLinearLayoutObject(QObject *parent)
-: QObject(parent)
-{
-}
-
-GraphicsLinearLayoutObject::~GraphicsLinearLayoutObject()
-{
-}
-
-void GraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutItem *item)
-{
-    insertItem(index, item);
-
-    if (LinearLayoutAttached *obj = attachedProperties.value(item)) {
-        setStretchFactor(item, obj->stretchFactor());
-        setAlignment(item, obj->alignment());
-        updateSpacing(item, obj->spacing());
-        QObject::connect(obj, SIGNAL(stretchChanged(QGraphicsLayoutItem*,int)),
-                         this, SLOT(updateStretch(QGraphicsLayoutItem*,int)));
-        QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
-                         this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
-        QObject::connect(obj, SIGNAL(spacingChanged(QGraphicsLayoutItem*,int)),
-                         this, SLOT(updateSpacing(QGraphicsLayoutItem*,int)));
-    }
-}
-
-void GraphicsLinearLayoutObject::removeAt(int index)
-{
-    QGraphicsLayoutItem *item = itemAt(index);
-    if (item) {
-        LinearLayoutAttached *obj = attachedProperties.value(item);
-        obj->disconnect(this);
-        attachedProperties.remove(item);
-    }
-    QGraphicsLinearLayout::removeAt(index);
-}
-
-void GraphicsLinearLayoutObject::clearChildren()
-{
-    // do not delete the removed items; they will be deleted by the QML engine
-    while (count() > 0)
-        removeAt(count()-1);
-}
-
-qreal GraphicsLinearLayoutObject::contentsMargin() const
-{
-    qreal a, b, c, d;
-    getContentsMargins(&a, &b, &c, &d);
-    if (a == b && a == c && a == d)
-        return a;
-    return -1;
-}
-
-void GraphicsLinearLayoutObject::setContentsMargin(qreal m)
-{
-    setContentsMargins(m, m, m, m);
-}
-
-void GraphicsLinearLayoutObject::updateStretch(QGraphicsLayoutItem *item, int stretch)
-{
-    QGraphicsLinearLayout::setStretchFactor(item, stretch);
-}
-
-void GraphicsLinearLayoutObject::updateSpacing(QGraphicsLayoutItem* item, int spacing)
-{
-    for (int i=0; i < count(); i++){
-        if (itemAt(i) == item) {
-            QGraphicsLinearLayout::setItemSpacing(i, spacing);
-            return;
-        }
-    }
-}
-
-void GraphicsLinearLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
-{
-    QGraphicsLinearLayout::setAlignment(item, alignment);
-}
-
-QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> GraphicsLinearLayoutObject::attachedProperties;
-LinearLayoutAttached *GraphicsLinearLayoutObject::qmlAttachedProperties(QObject *obj)
-{
-    LinearLayoutAttached *rv = new LinearLayoutAttached(obj);
-    if (qobject_cast<QGraphicsLayoutItem*>(obj))
-        attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
-    return rv;
-}
-
-
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.h b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.h
deleted file mode 100644
index e423bd08c5..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** 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 Nokia Corporation 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$
-**
-****************************************************************************/
-
-#ifndef LINEARLAYOUT_H
-#define LINEARLAYOUT_H
-
-#include <qdeclarative.h>
-
-#include <QGraphicsLinearLayout>
-#include <QGraphicsLayoutItem>
-
-class GraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayoutItem)
-public:
-    GraphicsLinearLayoutStretchItemObject(QObject *parent = 0);
-
-    virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const;
-};
-
-
-class LinearLayoutAttached;
-class GraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
-
-    Q_PROPERTY(QDeclarativeListProperty<QGraphicsLayoutItem> children READ children)
-    Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
-    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
-    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
-    Q_CLASSINFO("DefaultProperty", "children")
-public:
-    GraphicsLinearLayoutObject(QObject * = 0);
-    ~GraphicsLinearLayoutObject();
-
-    QDeclarativeListProperty<QGraphicsLayoutItem> children() { return QDeclarativeListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
-
-    qreal contentsMargin() const;
-    void setContentsMargin(qreal);
-
-    void removeAt(int index);
-
-    static LinearLayoutAttached *qmlAttachedProperties(QObject *);
-
-private slots:
-    void updateStretch(QGraphicsLayoutItem*,int);
-    void updateSpacing(QGraphicsLayoutItem*,int);
-    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    friend class LinearLayoutAttached;
-
-    void clearChildren();
-    void insertLayoutItem(int, QGraphicsLayoutItem *);
-
-    static void children_append(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
-        static_cast<GraphicsLinearLayoutObject*>(prop->object)->insertLayoutItem(-1, item);
-    }
-
-    static void children_clear(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
-        static_cast<GraphicsLinearLayoutObject*>(prop->object)->clearChildren();
-    }
-
-    static int children_count(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
-        return static_cast<GraphicsLinearLayoutObject*>(prop->object)->count();
-    }
-
-    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, int index) {
-        return static_cast<GraphicsLinearLayoutObject*>(prop->object)->itemAt(index);
-    }
-
-    static QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> attachedProperties;
-};
-
-
-class LinearLayoutAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int stretchFactor READ stretchFactor WRITE setStretchFactor NOTIFY stretchChanged)
-    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
-    Q_PROPERTY(int spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
-
-public:
-    LinearLayoutAttached(QObject *parent);
-
-    int stretchFactor() const { return m_stretch; }
-    void setStretchFactor(int f);
-    Qt::Alignment alignment() const { return m_alignment; }
-    void setAlignment(Qt::Alignment a);
-    int spacing() const { return m_spacing; }
-    void setSpacing(int s);
-
-signals:
-    void stretchChanged(QGraphicsLayoutItem*, int);
-    void alignmentChanged(QGraphicsLayoutItem*, Qt::Alignment);
-    void spacingChanged(QGraphicsLayoutItem*, int);
-
-private:
-    int m_stretch;
-    Qt::Alignment m_alignment;
-    int m_spacing;
-};
-
-QML_DECLARE_INTERFACE(QGraphicsLayoutItem)
-QML_DECLARE_INTERFACE(QGraphicsLayout)
-QML_DECLARE_TYPE(GraphicsLinearLayoutStretchItemObject)
-QML_DECLARE_TYPE(GraphicsLinearLayoutObject)
-QML_DECLARE_TYPEINFO(GraphicsLinearLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
-
-#endif
-
-
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.qrc b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.qrc
deleted file mode 100644
index 93a3533bfe..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>qgraphicslinearlayout.qml</file>
-</qresource>
-</RCC>
-
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/main.cpp b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/main.cpp
deleted file mode 100644
index f8d08c2f4b..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/main.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins 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 Nokia Corporation 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 "linearlayout.h"
-
-#include <qdeclarative.h>
-#include <QDeclarativeView>
-
-#include <QApplication>
-
-int main(int argc, char* argv[])
-{
-    QApplication app(argc, argv);
-
-    qmlRegisterInterface<QGraphicsLayoutItem>("QGraphicsLayoutItem");
-    qmlRegisterInterface<QGraphicsLayout>("QGraphicsLayout");
-    qmlRegisterType<GraphicsLinearLayoutStretchItemObject>("LinearLayouts", 4, 7, "GraphicsLinearLayoutStretchItem");
-    qmlRegisterType<GraphicsLinearLayoutObject>("LinearLayouts", 4, 7, "GraphicsLinearLayout");
-
-    QDeclarativeView view;
-    view.setSource(QUrl(":qgraphicslinearlayout.qml"));
-    view.show();
-
-    return app.exec();
-};
-
-
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
deleted file mode 100644
index c2e9b57fd1..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TEMPLATE = app
-TARGET  = qgraphicslinearlayout
-QT += declarative qtquick1
-
-SOURCES += \
-    linearlayout.cpp \
-    main.cpp
-
-HEADERS += \
-    linearlayout.h
-
-RESOURCES += \
-    linearlayout.qrc
-
-
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml
deleted file mode 100644
index a7d79e551a..0000000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** 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 Nokia Corporation 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 1.0
-import LinearLayouts 4.7
-
-Item {
-    width: 400
-    height: 400
-
-    QGraphicsWidget {
-        size.width: parent.width
-        size.height: parent.height
-
-        /*
-            Below we create a linear layout using the GraphicsLinearLayout item 
-            (defined by the GraphicsLinearLayoutObject class in linearlayout.h). 
-
-            The first LayoutItem uses 'GraphicsLinearLayout.spacing' to set the
-            item's spacing: this is an attached property, set using the 
-            properties defined in the LinearLayoutAttached class (also defined
-            in linearlayout.h).
-        */
-
-        layout: GraphicsLinearLayout {
-            LayoutItem {
-                GraphicsLinearLayout.spacing: 50
-                minimumSize: "100x100"
-                maximumSize: "200x200"
-                preferredSize: "100x100"
-                Rectangle { color: "yellow"; anchors.fill: parent }
-            }
-            LayoutItem {
-                minimumSize: "100x100"
-                maximumSize: "400x400"
-                preferredSize: "300x300"
-                Rectangle { color: "green"; anchors.fill: parent }
-            }
-        }
-    }
-}
-
diff --git a/examples/declarative/cppextensions/qwidgets/QWidgets/qmldir b/examples/declarative/cppextensions/qwidgets/QWidgets/qmldir
deleted file mode 100644
index a7c1d95c76..0000000000
--- a/examples/declarative/cppextensions/qwidgets/QWidgets/qmldir
+++ /dev/null
@@ -1 +0,0 @@
-plugin qmlqwidgetsplugin
diff --git a/examples/declarative/cppextensions/qwidgets/README b/examples/declarative/cppextensions/qwidgets/README
deleted file mode 100644
index e2f1b2ba56..0000000000
--- a/examples/declarative/cppextensions/qwidgets/README
+++ /dev/null
@@ -1,6 +0,0 @@
-This example shows how to embed QWidget-based objects into QML.
-
-To run:
-
-  make install
-  qml qwidgets.qml
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.cpp b/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
deleted file mode 100644
index de22a415aa..0000000000
--- a/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** 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 Nokia Corporation 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 <QtDeclarative/QDeclarativeExtensionPlugin>
-#include <QtDeclarative/qdeclarative.h>
-#include <QtWidgets/QGraphicsProxyWidget>
-#include <QtWidgets/QPushButton>
-#include <QtCore/QDebug>
-
-class MyPushButton : public QGraphicsProxyWidget
-{
-    Q_OBJECT
-    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
-
-public:
-    MyPushButton(QGraphicsItem* parent = 0)
-        : QGraphicsProxyWidget(parent)
-    {
-        widget = new QPushButton("MyPushButton");
-        widget->setAttribute(Qt::WA_NoSystemBackground);
-        setWidget(widget);
-
-        QObject::connect(widget, SIGNAL(clicked(bool)), this, SIGNAL(clicked(bool)));
-    }
-
-    QString text() const
-    {
-        return widget->text();
-    }
-
-    void setText(const QString& text)
-    {
-        if (text != widget->text()) {
-            widget->setText(text);
-            emit textChanged();
-        }
-    }
-
-Q_SIGNALS:
-    void clicked(bool);
-    void textChanged();
-
-private:
-    QPushButton *widget;
-};
-
-class QWidgetsPlugin : public QDeclarativeExtensionPlugin
-{
-    Q_OBJECT
-public:
-    void registerTypes(const char *uri)
-    {
-        qmlRegisterType<MyPushButton>(uri, 1, 0, "MyPushButton");
-    }
-};
-
-#include "qwidgets.moc"
-
-Q_EXPORT_PLUGIN2(qmlqwidgetsplugin, QWidgetsPlugin);
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro
deleted file mode 100644
index 678abaa020..0000000000
--- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro
+++ /dev/null
@@ -1,25 +0,0 @@
-TEMPLATE = lib
-CONFIG += qt plugin
-QT += widgets declarative
-
-DESTDIR = QWidgets
-TARGET = qmlqwidgetsplugin
-
-SOURCES += qwidgets.cpp
-
-sources.files += qwidgets.pro qwidgets.cpp qwidgets.qml
-sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins
-target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins
-
-INSTALLS += sources target
-
-symbian:{
-    CONFIG += qt_example
-    TARGET.EPOCALLOWDLLDATA = 1
-
-    importFiles.files = QWidgets/qmlqwidgetsplugin.dll QWidgets/qmldir
-    importFiles.path = QWidgets
-
-    DEPLOYMENT += importFiles
-}
-maemo5: CONFIG += qt_example
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.qml b/examples/declarative/cppextensions/qwidgets/qwidgets.qml
deleted file mode 100644
index 5046dd7b12..0000000000
--- a/examples/declarative/cppextensions/qwidgets/qwidgets.qml
+++ /dev/null
@@ -1,110 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** 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 Nokia Corporation 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 1.0
-import "QWidgets" 1.0
-
-Rectangle {
-    id: window
-
-    property int margin: 30
-
-    width: 640; height: 480
-    color: palette.window
-
-    SystemPalette { id: palette }
-
-    MyPushButton {
-        id: button1
-        x: margin; y: margin
-        text: "Right"
-        transformOriginPoint: Qt.point(width / 2, height / 2)
-
-        onClicked: window.state = "right"
-    }
-
-    MyPushButton {
-        id: button2
-        x: margin; y: margin + 30
-        text: "Bottom"
-        transformOriginPoint: Qt.point(width / 2, height / 2)
-
-        onClicked: window.state = "bottom"
-    }
-
-    MyPushButton {
-        id: button3
-        x: margin; y: margin + 60
-        text: "Quit"
-        transformOriginPoint: Qt.point(width / 2, height / 2)
-
-        onClicked: Qt.quit()
-    }
-
-    states: [
-        State {
-            name: "right"
-            PropertyChanges { target: button1; x: window.width - width - margin; text: "Left"; onClicked: window.state = "" }
-            PropertyChanges { target: button2; x: window.width - width - margin }
-            PropertyChanges { target: button3; x: window.width - width - margin }
-            PropertyChanges { target: window; color: Qt.darker(palette.window) }
-        },
-        State {
-            name: "bottom"
-            PropertyChanges { target: button1; y: window.height - height - margin; rotation: 180 }
-            PropertyChanges {
-                target: button2
-                x: button1.x + button1.width + 10; y: window.height - height - margin
-                rotation: 180
-                text: "Top"
-                onClicked: window.state = ""
-            }
-            PropertyChanges { target: button3; x: button2.x + button2.width + 10; y: window.height - height - margin;  rotation: 180 }
-            PropertyChanges { target: window; color: Qt.lighter(palette.window) }
-        }
-    ]
-
-    transitions: Transition {
-        ParallelAnimation {
-            NumberAnimation { properties: "x,y,rotation"; duration: 600; easing.type: Easing.OutQuad }
-            ColorAnimation { target: window; duration: 600 }
-        }
-    }
-}
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.qmlproject b/examples/declarative/cppextensions/qwidgets/qwidgets.qmlproject
deleted file mode 100644
index d4909f8685..0000000000
--- a/examples/declarative/cppextensions/qwidgets/qwidgets.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/example.qml b/examples/declarative/cppextensions/referenceexamples/methods/example.qml
index 868473a7c4..c32ce4a786 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/example.qml
+++ b/examples/declarative/cppextensions/referenceexamples/methods/example.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import People 1.0
 
 // ![0]