8 files changed, 94 insertions, 6 deletions
diff --git a/src/imports/etcprovider/etcprovider.pro b/src/imports/etcprovider/etcprovider.pro
index b48235eed8..3ec3ab5d09 100644
--- a/src/imports/etcprovider/etcprovider.pro
+++ b/src/imports/etcprovider/etcprovider.pro
@@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/etcprovider
 include(../qimportbase.pri)
 !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
 
-QT += declarative opengl
+QT += declarative quick opengl
 
 SOURCES += qetcprovider.cpp plugin.cpp
 HEADERS += qetcprovider.h plugin.h
diff --git a/src/imports/etcprovider/qetcprovider.h b/src/imports/etcprovider/qetcprovider.h
index cac37584d4..42c8e410db 100644
--- a/src/imports/etcprovider/qetcprovider.h
+++ b/src/imports/etcprovider/qetcprovider.h
@@ -44,7 +44,7 @@
 
 #include <qopengl.h>
 #include <QDeclarativeImageProvider>
-#include <QSGTexture>
+#include <QtQuick/QSGTexture>
 #include <QDeclarativeEngine>
 #include <QDeclarativeContext>
 #include <QFileInfo>
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 35590b221d..18400f86f2 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 
-SUBDIRS += qtquick1 qt47 folderlistmodel particles gestures etcprovider
+SUBDIRS += qtquick2 qtquick1 qt47 folderlistmodel particles gestures etcprovider
 contains(QT_CONFIG, qmltest): SUBDIRS += testlib
-contains(QT_CONFIG, xmlpatterns) : SUBDIRS += xmllistmodel
-\ No newline at end of file
+contains(QT_CONFIG, xmlpatterns) : SUBDIRS += xmllistmodel
diff --git a/src/imports/qtquick2/plugin.cpp b/src/imports/qtquick2/plugin.cpp
new file mode 100644
index 0000000000..a0def068d9
--- /dev/null
+++ b/src/imports/qtquick2/plugin.cpp
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** 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 plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+
+#include <private/qtquick2_p.h>
+
+QT_BEGIN_NAMESPACE
+
+//![class decl]
+class QtQuick2Plugin : public QDeclarativeExtensionPlugin
+{
+    Q_OBJECT
+public:
+    virtual void registerTypes(const char *uri)
+    {
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick"));
+        QDeclarativeQtQuick2Module::defineModule();
+    }
+};
+//![class decl]
+
+QT_END_NAMESPACE
+
+#include "plugin.moc"
+
+//![plugin export decl]
+Q_EXPORT_PLUGIN2(qtquick2plugin, QT_PREPEND_NAMESPACE(QtQuick2Plugin));
+//![plugin export decl]
+
diff --git a/src/imports/qtquick2/qmldir b/src/imports/qtquick2/qmldir
new file mode 100644
index 0000000000..bb4d33a5be
--- /dev/null
+++ b/src/imports/qtquick2/qmldir
@@ -0,0 +1 @@
+plugin qtquick2plugin
diff --git a/src/imports/qtquick2/qtquick2.pro b/src/imports/qtquick2/qtquick2.pro
new file mode 100644
index 0000000000..3f76abd87f
--- /dev/null
+++ b/src/imports/qtquick2/qtquick2.pro
@@ -0,0 +1,19 @@
+TARGET  = qtquick2plugin
+TARGETPATH = QtQuick.2
+include(../qimportbase.pri)
+
+SOURCES += \
+    plugin.cpp
+
+QT += quick-private declarative-private
+
+OTHER_FILES += \
+    qmldir
+
+DESTDIR = $$QT.declarative.imports/$$TARGETPATH
+target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
+
+qmldir.files += $$PWD/qmldir
+qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
+
+INSTALLS += target qmldir
diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp
index c7d7d9191e..0d3669970f 100644
--- a/src/imports/testlib/main.cpp
+++ b/src/imports/testlib/main.cpp
@@ -46,7 +46,7 @@
 #include "QtQuickTest/private/quicktestresult_p.h"
 #include "QtQuickTest/private/quicktestevent_p.h"
 #include "private/qtestoptions_p.h"
-#include "QtDeclarative/qquickitem.h"
+#include "QtQuick/qquickitem.h"
 #include <QtDeclarative/private/qdeclarativeengine_p.h>
 
 QML_DECLARE_TYPE(QuickTestResult)
diff --git a/src/imports/testlib/testlib.pro b/src/imports/testlib/testlib.pro
index dbe45fb6fa..3b8a5bf75e 100644
--- a/src/imports/testlib/testlib.pro
+++ b/src/imports/testlib/testlib.pro
@@ -4,7 +4,7 @@ include(../qimportbase.pri)
 
 CONFIG += qt plugin
 
-QT += declarative qmltest qmltest-private v8-private declarative-private core-private testlib
+QT += declarative quick qmltest qmltest-private v8-private declarative-private core-private testlib
 
 SOURCES += main.cpp
 HEADERS +=