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>

1 files changed, 541 insertions, 0 deletions

diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp
new file mode 100644
index 0000000000..8c7db60195
--- /dev/null
+++ b/src/quick/items/qquickview.cpp
@@ -0,0 +1,541 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module 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 "qquickview.h"
+#include "qquickview_p.h"
+
+#include "qquickcanvas_p.h"
+#include "qquickitem_p.h"
+#include "qquickitemchangelistener_p.h"
+
+#include <private/qdeclarativedebugtrace_p.h>
+#include <private/qdeclarativeinspectorservice_p.h>
+
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <private/qdeclarativeengine_p.h>
+#include <QtCore/qbasictimer.h>
+
+
+QT_BEGIN_NAMESPACE
+
+void QQuickViewPrivate::init()
+{
+    Q_Q(QQuickView);
+
+    engine.setIncubationController(q->incubationController());
+
+    if (QDeclarativeDebugService::isDebuggingEnabled())
+        QDeclarativeInspectorService::instance()->addView(q);
+}
+
+QQuickViewPrivate::QQuickViewPrivate()
+    : root(0), component(0), resizeMode(QQuickView::SizeViewToRootObject), initialSize(0,0)
+{
+}
+
+QQuickViewPrivate::~QQuickViewPrivate()
+{
+    if (QDeclarativeDebugService::isDebuggingEnabled())
+        QDeclarativeInspectorService::instance()->removeView(q_func());
+
+    delete root;
+}
+
+void QQuickViewPrivate::execute()
+{
+    Q_Q(QQuickView);
+    if (root) {
+        delete root;
+        root = 0;
+    }
+    if (component) {
+        delete component;
+        component = 0;
+    }
+    if (!source.isEmpty()) {
+        component = new QDeclarativeComponent(&engine, source, q);
+        if (!component->isLoading()) {
+            q->continueExecute();
+        } else {
+            QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::Status)),
+                             q, SLOT(continueExecute()));
+        }
+    }
+}
+
+void QQuickViewPrivate::itemGeometryChanged(QQuickItem *resizeItem, const QRectF &newGeometry, const QRectF &oldGeometry)
+{
+    Q_Q(QQuickView);
+    if (resizeItem == root && resizeMode == QQuickView::SizeViewToRootObject) {
+        // wait for both width and height to be changed
+        resizetimer.start(0,q);
+    }
+    QQuickItemChangeListener::itemGeometryChanged(resizeItem, newGeometry, oldGeometry);
+}
+
+/*!
+    \class QQuickView
+    \since QtQuick 2.0
+    \brief The QQuickView class provides a window for displaying a Qt Quick user interface.
+
+    \inmodule QtQuick
+
+    This is a convenience subclass of QQuickCanvas which
+    will automatically load and display a QML scene when given the URL of the main source file. Alternatively,
+    you can instantiate your own objects using QDeclarativeComponent and place them in a manually setup QQuickCanvas.
+
+    Typical usage:
+
+    \code
+    QQuickView *view = new QQuickView;
+    view->setSource(QUrl::fromLocalFile("myqmlfile.qml"));
+    view->show();
+    \endcode
+
+    To receive errors related to loading and executing QML with QQuickView,
+    you can connect to the statusChanged() signal and monitor for QQuickView::Error.
+    The errors are available via QQuickView::errors().
+
+    \sa {Using QML Bindings in C++ Applications}
+*/
+
+
+/*! \fn void QQuickView::sceneResized(QSize size)
+  This signal is emitted when the view is resized to \a size.
+*/
+
+/*! \fn void QQuickView::statusChanged(QQuickView::Status status)
+    This signal is emitted when the component's current \a status changes.
+*/
+
+/*! \fn void QQuickView::initialSizeChanged(QSize size)
+  \internal
+*/
+
+/*!
+  \fn QQuickView::QQuickView(QWindow *parent)
+
+  Constructs a QQuickView with the given \a parent.
+*/
+QQuickView::QQuickView(QWindow *parent, Qt::WindowFlags f)
+: QQuickCanvas(*(new QQuickViewPrivate), parent)
+{
+    setWindowFlags(f);
+    d_func()->init();
+}
+
+/*!
+  \fn QQuickView::QQuickView(const QUrl &source, QWidget *parent)
+
+  Constructs a QQuickView with the given QML \a source and \a parent.
+*/
+QQuickView::QQuickView(const QUrl &source, QWindow *parent, Qt::WindowFlags f)
+: QQuickCanvas(*(new QQuickViewPrivate), parent)
+{
+    setWindowFlags(f);
+    d_func()->init();
+    setSource(source);
+}
+
+QQuickView::~QQuickView()
+{
+}
+
+/*! \property QQuickView::source
+  \brief The URL of the source of the QML component.
+
+  Changing this property causes the QML component to be reloaded.
+
+    Ensure that the URL provided is full and correct, in particular, use
+    \l QUrl::fromLocalFile() when loading a file from the local filesystem.
+ */
+
+/*!
+    Sets the source to the \a url, loads the QML component and instantiates it.
+
+    Ensure that the URL provided is full and correct, in particular, use
+    \l QUrl::fromLocalFile() when loading a file from the local filesystem.
+
+    Calling this methods multiple times with the same url will result
+    in the QML being reloaded.
+ */
+void QQuickView::setSource(const QUrl& url)
+{
+    Q_D(QQuickView);
+    d->source = url;
+    d->execute();
+}
+
+/*!
+  Returns the source URL, if set.
+
+  \sa setSource()
+ */
+QUrl QQuickView::source() const
+{
+    Q_D(const QQuickView);
+    return d->source;
+}
+
+/*!
+  Returns a pointer to the QDeclarativeEngine used for instantiating
+  QML Components.
+ */
+QDeclarativeEngine* QQuickView::engine() const
+{
+    Q_D(const QQuickView);
+    return const_cast<QDeclarativeEngine *>(&d->engine);
+}
+
+/*!
+  This function returns the root of the context hierarchy.  Each QML
+  component is instantiated in a QDeclarativeContext.  QDeclarativeContext's are
+  essential for passing data to QML components.  In QML, contexts are
+  arranged hierarchically and this hierarchy is managed by the
+  QDeclarativeEngine.
+ */
+QDeclarativeContext* QQuickView::rootContext() const
+{
+    Q_D(const QQuickView);
+    return d->engine.rootContext();
+}
+
+/*!
+    \enum QQuickView::Status
+    Specifies the loading status of the QQuickView.
+
+    \value Null This QQuickView has no source set.
+    \value Ready This QQuickView has loaded and created the QML component.
+    \value Loading This QQuickView is loading network data.
+    \value Error One or more errors has occurred. Call errors() to retrieve a list
+           of errors.
+*/
+
+/*! \enum QQuickView::ResizeMode
+
+  This enum specifies how to resize the view.
+
+  \value SizeViewToRootObject The view resizes with the root item in the QML.
+  \value SizeRootObjectToView The view will automatically resize the root item to the size of the view.
+*/
+
+/*!
+    \property QQuickView::status
+    The component's current \l{QQuickView::Status} {status}.
+*/
+
+QQuickView::Status QQuickView::status() const
+{
+    Q_D(const QQuickView);
+    if (!d->component)
+        return QQuickView::Null;
+
+    return QQuickView::Status(d->component->status());
+}
+
+/*!
+    Return the list of errors that occurred during the last compile or create
+    operation.  When the status is not Error, an empty list is returned.
+*/
+QList<QDeclarativeError> QQuickView::errors() const
+{
+    Q_D(const QQuickView);
+    if (d->component)
+        return d->component->errors();
+    return QList<QDeclarativeError>();
+}
+
+/*!
+    \property QQuickView::resizeMode
+    \brief whether the view should resize the canvas contents
+
+    If this property is set to SizeViewToRootObject (the default), the view
+    resizes with the root item in the QML.
+
+    If this property is set to SizeRootObjectToView, the view will
+    automatically resize the root item.
+
+    Regardless of this property, the sizeHint of the view
+    is the initial size of the root item. Note though that
+    since QML may load dynamically, that size may change.
+*/
+
+void QQuickView::setResizeMode(ResizeMode mode)
+{
+    Q_D(QQuickView);
+    if (d->resizeMode == mode)
+        return;
+
+    if (d->root) {
+        if (d->resizeMode == SizeViewToRootObject) {
+            QQuickItemPrivate *p = QQuickItemPrivate::get(d->root);
+            p->removeItemChangeListener(d, QQuickItemPrivate::Geometry);
+        }
+    }
+
+    d->resizeMode = mode;
+    if (d->root) {
+        d->initResize();
+    }
+}
+
+void QQuickViewPrivate::initResize()
+{
+    if (root) {
+        if (resizeMode == QQuickView::SizeViewToRootObject) {
+            QQuickItemPrivate *p = QQuickItemPrivate::get(root);
+            p->addItemChangeListener(this, QQuickItemPrivate::Geometry);
+        }
+    }
+    updateSize();
+}
+
+void QQuickViewPrivate::updateSize()
+{
+    Q_Q(QQuickView);
+    if (!root)
+        return;
+
+    if (resizeMode == QQuickView::SizeViewToRootObject) {
+        QSize newSize = QSize(root->width(), root->height());
+        if (newSize.isValid() && newSize != q->size()) {
+            q->resize(newSize);
+        }
+    } else if (resizeMode == QQuickView::SizeRootObjectToView) {
+        if (!qFuzzyCompare(q->width(), root->width()))
+            root->setWidth(q->width());
+        if (!qFuzzyCompare(q->height(), root->height()))
+            root->setHeight(q->height());
+    }
+}
+
+QSize QQuickViewPrivate::rootObjectSize() const
+{
+    QSize rootObjectSize(0,0);
+    int widthCandidate = -1;
+    int heightCandidate = -1;
+    if (root) {
+        widthCandidate = root->width();
+        heightCandidate = root->height();
+    }
+    if (widthCandidate > 0) {
+        rootObjectSize.setWidth(widthCandidate);
+    }
+    if (heightCandidate > 0) {
+        rootObjectSize.setHeight(heightCandidate);
+    }
+    return rootObjectSize;
+}
+
+QQuickView::ResizeMode QQuickView::resizeMode() const
+{
+    Q_D(const QQuickView);
+    return d->resizeMode;
+}
+
+/*!
+  \internal
+ */
+void QQuickView::continueExecute()
+{
+    Q_D(QQuickView);
+    disconnect(d->component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), this, SLOT(continueExecute()));
+
+    if (d->component->isError()) {
+        QList<QDeclarativeError> errorList = d->component->errors();
+        foreach (const QDeclarativeError &error, errorList) {
+            qWarning() << error;
+        }
+        emit statusChanged(status());
+        return;
+    }
+
+    QObject *obj = d->component->create();
+
+    if (d->component->isError()) {
+        QList<QDeclarativeError> errorList = d->component->errors();
+        foreach (const QDeclarativeError &error, errorList) {
+            qWarning() << error;
+        }
+        emit statusChanged(status());
+        return;
+    }
+
+    d->setRootObject(obj);
+    emit statusChanged(status());
+}
+
+
+/*!
+  \internal
+*/
+void QQuickViewPrivate::setRootObject(QObject *obj)
+{
+    Q_Q(QQuickView);
+    if (root == obj)
+        return;
+    if (QQuickItem *sgItem = qobject_cast<QQuickItem *>(obj)) {
+        root = sgItem;
+        sgItem->setParentItem(q->QQuickCanvas::rootItem());
+    } else {
+        qWarning() << "QQuickView only supports loading of root objects that derive from QQuickItem." << endl
+                   << endl
+                   << "If your example is using QML 2, (such as qmlscene) and the .qml file you" << endl
+                   << "loaded has 'import QtQuick 1.0' or 'import Qt 4.7', this error will occur." << endl
+                   << endl
+                   << "To load files with 'import QtQuick 1.0' with QML 2, specify:" << endl
+                   << "  QMLSCENE_IMPORT_NAME=quick1" << endl
+                   << "on as an environment variable prior to launching the application." << endl
+                   << endl
+                   << "To load files with 'import Qt 4.7' with QML 2, specify:" << endl
+                   << "  QMLSCENE_IMPORT_NAME=qt" << endl
+                   << "on as an environment variable prior to launching the application." << endl;
+        delete obj;
+        root = 0;
+    }
+    if (root) {
+        initialSize = rootObjectSize();
+        if ((resizeMode == QQuickView::SizeViewToRootObject || !q->width() || !q->height())
+                && initialSize != q->size()) {
+            q->resize(initialSize);
+        }
+        initResize();
+    }
+}
+
+/*!
+  \internal
+  If the \l {QTimerEvent} {timer event} \a e is this
+  view's resize timer, sceneResized() is emitted.
+ */
+void QQuickView::timerEvent(QTimerEvent* e)
+{
+    Q_D(QQuickView);
+    if (!e || e->timerId() == d->resizetimer.timerId()) {
+        d->updateSize();
+        d->resizetimer.stop();
+    }
+}
+
+/*!
+    \internal
+    Preferred size follows the root object geometry.
+*/
+QSize QQuickView::sizeHint() const
+{
+    Q_D(const QQuickView);
+    QSize rootObjectSize = d->rootObjectSize();
+    if (rootObjectSize.isEmpty()) {
+        return size();
+    } else {
+        return rootObjectSize;
+    }
+}
+
+/*!
+  Returns the initial size of the root object
+*/
+QSize QQuickView::initialSize() const
+{
+    Q_D(const QQuickView);
+    return d->initialSize;
+}
+
+/*!
+  Returns the view's root \l {QQuickItem} {item}.
+ */
+QQuickItem *QQuickView::rootObject() const
+{
+    Q_D(const QQuickView);
+    return d->root;
+}
+
+/*!
+  \internal
+  This function handles the \l {QResizeEvent} {resize event}
+  \a e.
+ */
+void QQuickView::resizeEvent(QResizeEvent *e)
+{
+    Q_D(QQuickView);
+    if (d->resizeMode == SizeRootObjectToView)
+        d->updateSize();
+
+    QQuickCanvas::resizeEvent(e);
+}
+
+void QQuickView::keyPressEvent(QKeyEvent *e)
+{
+    QDeclarativeDebugTrace::addEvent(QDeclarativeDebugTrace::Key);
+
+    QQuickCanvas::keyPressEvent(e);
+}
+
+void QQuickView::keyReleaseEvent(QKeyEvent *e)
+{
+    QDeclarativeDebugTrace::addEvent(QDeclarativeDebugTrace::Key);
+
+    QQuickCanvas::keyReleaseEvent(e);
+}
+
+void QQuickView::mouseMoveEvent(QMouseEvent *e)
+{
+    QDeclarativeDebugTrace::addEvent(QDeclarativeDebugTrace::Mouse);
+
+    QQuickCanvas::mouseMoveEvent(e);
+}
+
+void QQuickView::mousePressEvent(QMouseEvent *e)
+{
+    QDeclarativeDebugTrace::addEvent(QDeclarativeDebugTrace::Mouse);
+
+    QQuickCanvas::mousePressEvent(e);
+}
+
+void QQuickView::mouseReleaseEvent(QMouseEvent *e)
+{
+    QDeclarativeDebugTrace::addEvent(QDeclarativeDebugTrace::Mouse);
+
+    QQuickCanvas::mouseReleaseEvent(e);
+}
+
+
+QT_END_NAMESPACE