Say hello to QtQuick module

This change moves the QtQuick 2 types and C++ API (including
SceneGraph) to a new module (AKA library), QtQuick.

99% of this change is moving files from src/declarative to
src/quick, and from tests/auto/declarative to
tests/auto/qtquick2.

The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to
a plugin, src/imports/qtquick2, just like it's done for QtQuick 1.

All tools, examples, and tests that use QtQuick C++ API have gotten
"QT += quick" or "QT += quick-private" added to their .pro file.

A few additional internal QtDeclarative classes had to be exported
(via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the
QtQuick 2 implementation.

The old header locations (e.g. QtDeclarative/qquickitem.h) will
still be supported for some time, but will produce compile-time
warnings. (To avoid the QtQuick implementation using the
compatibility headers (since QtDeclarative's includepath comes
first), a few include statements were modified, e.g. from
"#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".)

There's a change in qtbase that automatically adds QtQuick to the
module list if QtDeclarative is used. Together with the compatibility
headers, this should help reduce the migration pain for existing
projects.

In theory, simply getting an existing QtDeclarative-based project
to compile and link shouldn't require any changes for now -- but
porting to the new scheme is of course recommended, and will
eventually become mandatory.

Task-number: QTBUG-22889
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>

6 files changed, 17 insertions, 13 deletions

diff --git a/tools/qmleasing/main.cpp b/tools/qmleasing/main.cpp
index a9f1da41d4..224e23f544 100644
--- a/tools/qmleasing/main.cpp
+++ b/tools/qmleasing/main.cpp
@@ -40,10 +40,10 @@
 ****************************************************************************/
 
 #include <QPainter>
-#include <QQuickView>
+#include <QtQuick/QQuickView>
 #include <QApplication>
 #include <QEasingCurve>
-#include <QQuickPaintedItem>
+#include <QtQuick/QQuickPaintedItem>
 
 class EasingPlot : public QQuickPaintedItem
 {
diff --git a/tools/qmleasing/qmleasing.pro b/tools/qmleasing/qmleasing.pro
index 4a64fe91e0..eb2ee86070 100644
--- a/tools/qmleasing/qmleasing.pro
+++ b/tools/qmleasing/qmleasing.pro
@@ -3,7 +3,7 @@ TARGET =
 DEPENDPATH += .
 INCLUDEPATH += .
 
-QT += declarative widgets
+QT += declarative quick widgets
 CONFIG -= app_bundle
 
 # Input
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index 5e35abcc8b..c9f6cbe6c1 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -39,15 +39,19 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/QtDeclarative>
+#include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/private/qdeclarativemetatype_p.h>
 #include <QtDeclarative/private/qdeclarativeopenmetaobject_p.h>
-#include <QtDeclarative/private/qquickevents_p_p.h>
-#include <QtDeclarative/private/qquickpincharea_p.h>
+#include <QtQuick/private/qquickevents_p_p.h>
+#include <QtQuick/private/qquickpincharea_p.h>
 
 #include <QtWidgets/QApplication>
 
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
 #include <QtCore/QSet>
+#include <QtCore/QStringList>
+#include <QtCore/QTimer>
 #include <QtCore/QMetaObject>
 #include <QtCore/QMetaProperty>
 #include <QtCore/QDebug>
@@ -674,11 +678,11 @@ int main(int argc, char *argv[])
         engine.addImportPath(pluginImportPath);
     }
 
-    // load the QtQuick 1 plugin
+    // load the QtQuick 1 & 2 plugins
     {
-        QByteArray code("import QtQuick 1.0\nQtObject {}");
+        QByteArray code("import QtQuick 1.0 as Q1\nimport QtQuick 2.0 as Q2\nQ2.QtObject {}");
         QDeclarativeComponent c(&engine);
-        c.setData(code, QUrl::fromLocalFile(pluginImportPath + "/loadqtquick1.qml"));
+        c.setData(code, QUrl::fromLocalFile(pluginImportPath + "/loadqtquick.qml"));
         c.create();
         if (!c.errors().isEmpty()) {
             foreach (const QDeclarativeError &error, c.errors())
diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro
index 7db7722c62..a327bb68d9 100644
--- a/tools/qmlplugindump/qmlplugindump.pro
+++ b/tools/qmlplugindump/qmlplugindump.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 CONFIG += qt uic console
 DESTDIR = $$QT.declarative.bins
 
-QT += declarative declarative-private qtquick1 core-private widgets
+QT += declarative declarative-private quick-private qtquick1 core-private widgets
 
 TARGET = qmlplugindump
 
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 336fc899cd..696686afef 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -58,8 +58,8 @@
 #include <QtDeclarative/qdeclarativecontext.h>
 
 // ### This should be private API
-#include <qquickitem.h>
-#include <qquickview.h>
+#include <QtQuick/qquickitem.h>
+#include <QtQuick/qquickview.h>
 
 #define QT_NO_SCENEGRAPHITEM
 
diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro
index d0c4ec7a20..4147c68005 100644
--- a/tools/qmlscene/qmlscene.pro
+++ b/tools/qmlscene/qmlscene.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = qmlscene
 DESTDIR= $$QT.declarative.bins
 
-QT += declarative declarative-private qtquick1 widgets
+QT += declarative declarative-private quick qtquick1 widgets
 
 target.path = $$[QT_INSTALL_BINS]
 INSTALLS += target