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>

3 files changed, 0 insertions, 458 deletions

diff --git a/tests/auto/declarative/qquickpincharea/data/pinchproperties.qml b/tests/auto/declarative/qquickpincharea/data/pinchproperties.qml
deleted file mode 100644
index 44d116184e..0000000000
--- a/tests/auto/declarative/qquickpincharea/data/pinchproperties.qml
+++ /dev/null
@@ -1,50 +0,0 @@
-import QtQuick 2.0
-Rectangle {
-    id: whiteRect
-    property variant center
-    property real scale
-    property int pointCount: 0
-    width: 240; height: 320
-    color: "white"
-    Rectangle {
-        id: blackRect
-        objectName: "blackrect"
-        color: "black"
-        y: 50
-        x: 50
-        width: 100
-        height: 100
-        opacity: (whiteRect.width-blackRect.x+whiteRect.height-blackRect.y-199)/200
-        Text { text: blackRect.opacity}
-        PinchArea {
-            id: pincharea
-            objectName: "pincharea"
-            anchors.fill: parent
-            pinch.target: blackRect
-            pinch.dragAxis: Drag.XandYAxis
-            pinch.minimumX: 0
-            pinch.maximumX: whiteRect.width-blackRect.width
-            pinch.minimumY: 0
-            pinch.maximumY: whiteRect.height-blackRect.height
-            pinch.minimumScale: 1.0
-            pinch.maximumScale: 2.0
-            pinch.minimumRotation: 0.0
-            pinch.maximumRotation: 90.0
-            onPinchStarted: {
-                whiteRect.center = pinch.center
-                whiteRect.scale = pinch.scale
-                whiteRect.pointCount = pinch.pointCount;
-            }
-            onPinchUpdated: {
-                whiteRect.center = pinch.center
-                whiteRect.scale = pinch.scale
-                whiteRect.pointCount = pinch.pointCount;
-            }
-            onPinchFinished: {
-                whiteRect.center = pinch.center
-                whiteRect.scale = pinch.scale
-                whiteRect.pointCount = pinch.pointCount;
-            }
-         }
-     }
- }
diff --git a/tests/auto/declarative/qquickpincharea/qquickpincharea.pro b/tests/auto/declarative/qquickpincharea/qquickpincharea.pro
deleted file mode 100644
index df750fb2f6..0000000000
--- a/tests/auto/declarative/qquickpincharea/qquickpincharea.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qquickpincharea
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qquickpincharea.cpp
-
-testDataFiles.files = data
-testDataFiles.path = .
-DEPLOYMENT += testDataFiles
-
-CONFIG += parallel_test
-
-QT += core-private gui-private declarative-private testlib
diff --git a/tests/auto/declarative/qquickpincharea/tst_qquickpincharea.cpp b/tests/auto/declarative/qquickpincharea/tst_qquickpincharea.cpp
deleted file mode 100644
index 0d6126e671..0000000000
--- a/tests/auto/declarative/qquickpincharea/tst_qquickpincharea.cpp
+++ /dev/null
@@ -1,395 +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 test suite 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 <QtTest/QtTest>
-#include <QtTest/QSignalSpy>
-#include <private/qquickpincharea_p.h>
-#include <private/qquickrectangle_p.h>
-#include <QtDeclarative/qquickview.h>
-#include <QtDeclarative/qdeclarativecontext.h>
-#include "../shared/util.h"
-
-class tst_QQuickPinchArea: public QObject
-{
-    Q_OBJECT
-private slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void pinchProperties();
-    void scale();
-    void pan();
-    void retouch();
-
-private:
-    QQuickView *createView();
-};
-void tst_QQuickPinchArea::initTestCase()
-{
-}
-
-void tst_QQuickPinchArea::cleanupTestCase()
-{
-
-}
-void tst_QQuickPinchArea::pinchProperties()
-{
-    QQuickView *canvas = createView();
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("pinchproperties.qml")));
-    canvas->show();
-    canvas->requestActivateWindow();
-    QVERIFY(canvas->rootObject() != 0);
-
-    QQuickPinchArea *pinchArea = canvas->rootObject()->findChild<QQuickPinchArea*>("pincharea");
-    QQuickPinch *pinch = pinchArea->pinch();
-    QVERIFY(pinchArea != 0);
-    QVERIFY(pinch != 0);
-
-    // target
-    QQuickItem *blackRect = canvas->rootObject()->findChild<QQuickItem*>("blackrect");
-    QVERIFY(blackRect != 0);
-    QVERIFY(blackRect == pinch->target());
-    QQuickItem *rootItem = qobject_cast<QQuickItem*>(canvas->rootObject());
-    QVERIFY(rootItem != 0);
-    QSignalSpy targetSpy(pinch, SIGNAL(targetChanged()));
-    pinch->setTarget(rootItem);
-    QCOMPARE(targetSpy.count(),1);
-    pinch->setTarget(rootItem);
-    QCOMPARE(targetSpy.count(),1);
-
-    // axis
-    QCOMPARE(pinch->axis(), QQuickPinch::XandYAxis);
-    QSignalSpy axisSpy(pinch, SIGNAL(dragAxisChanged()));
-    pinch->setAxis(QQuickPinch::XAxis);
-    QCOMPARE(pinch->axis(), QQuickPinch::XAxis);
-    QCOMPARE(axisSpy.count(),1);
-    pinch->setAxis(QQuickPinch::XAxis);
-    QCOMPARE(axisSpy.count(),1);
-
-    // minimum and maximum drag properties
-    QSignalSpy xminSpy(pinch, SIGNAL(minimumXChanged()));
-    QSignalSpy xmaxSpy(pinch, SIGNAL(maximumXChanged()));
-    QSignalSpy yminSpy(pinch, SIGNAL(minimumYChanged()));
-    QSignalSpy ymaxSpy(pinch, SIGNAL(maximumYChanged()));
-
-    QCOMPARE(pinch->xmin(), 0.0);
-    QCOMPARE(pinch->xmax(), rootItem->width()-blackRect->width());
-    QCOMPARE(pinch->ymin(), 0.0);
-    QCOMPARE(pinch->ymax(), rootItem->height()-blackRect->height());
-
-    pinch->setXmin(10);
-    pinch->setXmax(10);
-    pinch->setYmin(10);
-    pinch->setYmax(10);
-
-    QCOMPARE(pinch->xmin(), 10.0);
-    QCOMPARE(pinch->xmax(), 10.0);
-    QCOMPARE(pinch->ymin(), 10.0);
-    QCOMPARE(pinch->ymax(), 10.0);
-
-    QCOMPARE(xminSpy.count(),1);
-    QCOMPARE(xmaxSpy.count(),1);
-    QCOMPARE(yminSpy.count(),1);
-    QCOMPARE(ymaxSpy.count(),1);
-
-    pinch->setXmin(10);
-    pinch->setXmax(10);
-    pinch->setYmin(10);
-    pinch->setYmax(10);
-
-    QCOMPARE(xminSpy.count(),1);
-    QCOMPARE(xmaxSpy.count(),1);
-    QCOMPARE(yminSpy.count(),1);
-    QCOMPARE(ymaxSpy.count(),1);
-
-    // minimum and maximum scale properties
-    QSignalSpy scaleMinSpy(pinch, SIGNAL(minimumScaleChanged()));
-    QSignalSpy scaleMaxSpy(pinch, SIGNAL(maximumScaleChanged()));
-
-    QCOMPARE(pinch->minimumScale(), 1.0);
-    QCOMPARE(pinch->maximumScale(), 2.0);
-
-    pinch->setMinimumScale(0.5);
-    pinch->setMaximumScale(1.5);
-
-    QCOMPARE(pinch->minimumScale(), 0.5);
-    QCOMPARE(pinch->maximumScale(), 1.5);
-
-    QCOMPARE(scaleMinSpy.count(),1);
-    QCOMPARE(scaleMaxSpy.count(),1);
-
-    pinch->setMinimumScale(0.5);
-    pinch->setMaximumScale(1.5);
-
-    QCOMPARE(scaleMinSpy.count(),1);
-    QCOMPARE(scaleMaxSpy.count(),1);
-
-    // minimum and maximum rotation properties
-    QSignalSpy rotMinSpy(pinch, SIGNAL(minimumRotationChanged()));
-    QSignalSpy rotMaxSpy(pinch, SIGNAL(maximumRotationChanged()));
-
-    QCOMPARE(pinch->minimumRotation(), 0.0);
-    QCOMPARE(pinch->maximumRotation(), 90.0);
-
-    pinch->setMinimumRotation(-90.0);
-    pinch->setMaximumRotation(45.0);
-
-    QCOMPARE(pinch->minimumRotation(), -90.0);
-    QCOMPARE(pinch->maximumRotation(), 45.0);
-
-    QCOMPARE(rotMinSpy.count(),1);
-    QCOMPARE(rotMaxSpy.count(),1);
-
-    pinch->setMinimumRotation(-90.0);
-    pinch->setMaximumRotation(45.0);
-
-    QCOMPARE(rotMinSpy.count(),1);
-    QCOMPARE(rotMaxSpy.count(),1);
-
-    delete canvas;
-}
-
-QTouchEvent::TouchPoint makeTouchPoint(int id, QPoint p, QQuickView *v, QQuickItem *i)
-{
-    QTouchEvent::TouchPoint touchPoint(id);
-    touchPoint.setPos(i->mapFromScene(p));
-    touchPoint.setScreenPos(v->mapToGlobal(p));
-    touchPoint.setScenePos(p);
-    return touchPoint;
-}
-
-void tst_QQuickPinchArea::scale()
-{
-    QQuickView *canvas = createView();
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("pinchproperties.qml")));
-    canvas->show();
-    canvas->requestActivateWindow();
-    QTest::qWaitForWindowShown(canvas);
-    QVERIFY(canvas->rootObject() != 0);
-    qApp->processEvents();
-
-    QQuickPinchArea *pinchArea = canvas->rootObject()->findChild<QQuickPinchArea*>("pincharea");
-    QQuickPinch *pinch = pinchArea->pinch();
-    QVERIFY(pinchArea != 0);
-    QVERIFY(pinch != 0);
-
-    QQuickItem *root = qobject_cast<QQuickItem*>(canvas->rootObject());
-    QVERIFY(root != 0);
-
-    // target
-    QQuickItem *blackRect = canvas->rootObject()->findChild<QQuickItem*>("blackrect");
-    QVERIFY(blackRect != 0);
-
-    QPoint p1(80, 80);
-    QPoint p2(100, 100);
-
-    QTest::touchEvent(canvas).press(0, p1, canvas);
-    QTest::touchEvent(canvas).stationary(0).press(1, p2, canvas);
-    p1 -= QPoint(10,10);
-    p2 += QPoint(10,10);
-    QTest::touchEvent(canvas).move(0, p1,canvas).move(1, p2,canvas);
-
-    QCOMPARE(root->property("scale").toReal(), 1.0);
-
-    p1 -= QPoint(10,10);
-    p2 += QPoint(10,10);
-    QTest::touchEvent(canvas).move(0, p1,canvas).move(1, p2,canvas);
-
-    QCOMPARE(root->property("scale").toReal(), 1.5);
-    QCOMPARE(root->property("center").toPointF(), QPointF(40, 40)); // blackrect is at 50,50
-    QCOMPARE(blackRect->scale(), 1.5);
-
-    // scale beyond bound
-    p1 -= QPoint(50,50);
-    p2 += QPoint(50,50);
-    QTest::touchEvent(canvas).move(0, p1, canvas).move(1, p2, canvas);
-
-    QCOMPARE(blackRect->scale(), 2.0);
-
-    QTest::touchEvent(canvas).release(0, p1, canvas).release(1, p2, canvas);
-
-    delete canvas;
-}
-
-void tst_QQuickPinchArea::pan()
-{
-    QQuickView *canvas = createView();
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("pinchproperties.qml")));
-    canvas->show();
-    canvas->requestActivateWindow();
-    QTest::qWaitForWindowShown(canvas);
-    QVERIFY(canvas->rootObject() != 0);
-    qApp->processEvents();
-
-    QQuickPinchArea *pinchArea = canvas->rootObject()->findChild<QQuickPinchArea*>("pincharea");
-    QQuickPinch *pinch = pinchArea->pinch();
-    QVERIFY(pinchArea != 0);
-    QVERIFY(pinch != 0);
-
-    QQuickItem *root = qobject_cast<QQuickItem*>(canvas->rootObject());
-    QVERIFY(root != 0);
-
-    // target
-    QQuickItem *blackRect = canvas->rootObject()->findChild<QQuickItem*>("blackrect");
-    QVERIFY(blackRect != 0);
-
-    QPoint p1(80, 80);
-    QPoint p2(100, 100);
-
-    QTest::touchEvent(canvas).press(0, p1, canvas);
-    QTest::touchEvent(canvas).stationary(0).press(1, p2, canvas);
-    p1 += QPoint(10,10);
-    p2 += QPoint(10,10);
-    QTest::touchEvent(canvas).move(0, p1, canvas).move(1, p2, canvas);
-
-    QCOMPARE(root->property("scale").toReal(), 1.0);
-
-    p1 += QPoint(10,10);
-    p2 += QPoint(10,10);
-    QTest::touchEvent(canvas).move(0, p1, canvas).move(1, p2, canvas);
-
-    QCOMPARE(root->property("center").toPointF(), QPointF(60, 60)); // blackrect is at 50,50
-
-    QCOMPARE(blackRect->x(), 60.0);
-    QCOMPARE(blackRect->y(), 60.0);
-
-    // pan x beyond bound
-    p1 += QPoint(100,100);
-    p2 += QPoint(100,100);
-    QTest::touchEvent(canvas).move(0, p1, canvas).move(1, p2, canvas);
-
-    QCOMPARE(blackRect->x(), 140.0);
-    QCOMPARE(blackRect->y(), 160.0);
-
-    QTest::touchEvent(canvas).release(0, p1, canvas).release(1, p2, canvas);
-
-    delete canvas;
-}
-
-// test pinch, release one point, touch again to continue pinch
-void tst_QQuickPinchArea::retouch()
-{
-    QQuickView *canvas = createView();
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("pinchproperties.qml")));
-    canvas->show();
-    canvas->requestActivateWindow();
-    QTest::qWaitForWindowShown(canvas);
-    QVERIFY(canvas->rootObject() != 0);
-    qApp->processEvents();
-
-    QQuickPinchArea *pinchArea = canvas->rootObject()->findChild<QQuickPinchArea*>("pincharea");
-    QQuickPinch *pinch = pinchArea->pinch();
-    QVERIFY(pinchArea != 0);
-    QVERIFY(pinch != 0);
-
-    QQuickItem *root = qobject_cast<QQuickItem*>(canvas->rootObject());
-    QVERIFY(root != 0);
-
-    QSignalSpy startedSpy(pinchArea, SIGNAL(pinchStarted(QQuickPinchEvent *)));
-    QSignalSpy finishedSpy(pinchArea, SIGNAL(pinchFinished(QQuickPinchEvent *)));
-
-    // target
-    QQuickItem *blackRect = canvas->rootObject()->findChild<QQuickItem*>("blackrect");
-    QVERIFY(blackRect != 0);
-
-    QPoint p1(80, 80);
-    QPoint p2(100, 100);
-
-    QTest::touchEvent(canvas).press(0, p1, canvas);
-    QTest::touchEvent(canvas).stationary(0).press(1, p2, canvas);
-    p1 -= QPoint(10,10);
-    p2 += QPoint(10,10);
-    QTest::touchEvent(canvas).move(0, p1, canvas).move(1, p2, canvas);
-
-    QCOMPARE(root->property("scale").toReal(), 1.0);
-
-    p1 -= QPoint(10,10);
-    p2 += QPoint(10,10);
-    QTest::touchEvent(canvas).move(0, p1, canvas).move(1, p2, canvas);
-
-    QCOMPARE(startedSpy.count(), 1);
-
-    QCOMPARE(root->property("scale").toReal(), 1.5);
-    QCOMPARE(root->property("center").toPointF(), QPointF(40, 40)); // blackrect is at 50,50
-    QCOMPARE(blackRect->scale(), 1.5);
-
-    QCOMPARE(canvas->rootObject()->property("pointCount").toInt(), 2);
-
-    QCOMPARE(startedSpy.count(), 1);
-    QCOMPARE(finishedSpy.count(), 0);
-
-    QTest::touchEvent(canvas).stationary(0).release(1, p2, canvas);
-
-    QCOMPARE(startedSpy.count(), 1);
-    QCOMPARE(finishedSpy.count(), 0);
-
-    QCOMPARE(canvas->rootObject()->property("pointCount").toInt(), 1);
-
-    QTest::touchEvent(canvas).stationary(0).press(1, p2, canvas);
-    p1 -= QPoint(10,10);
-    p2 += QPoint(10,10);
-    QTest::touchEvent(canvas).move(0, p1, canvas).move(1, p2, canvas);
-
-    // Lifting and retouching results in onPinchStarted being called again
-    QCOMPARE(startedSpy.count(), 2);
-    QCOMPARE(finishedSpy.count(), 0);
-
-    QCOMPARE(canvas->rootObject()->property("pointCount").toInt(), 2);
-
-    QTest::touchEvent(canvas).release(0, p1, canvas).release(1, p2, canvas);
-
-    QCOMPARE(startedSpy.count(), 2);
-    QCOMPARE(finishedSpy.count(), 1);
-
-    delete canvas;
-}
-
-
-QQuickView *tst_QQuickPinchArea::createView()
-{
-    QQuickView *canvas = new QQuickView(0);
-    canvas->setGeometry(0,0,240,320);
-
-    return canvas;
-}
-
-QTEST_MAIN(tst_QQuickPinchArea)
-
-#include "tst_qquickpincharea.moc"