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, 203 insertions, 0 deletions

diff --git a/src/quick/items/context2d/qquickcontext2dtexture_p.h b/src/quick/items/context2d/qquickcontext2dtexture_p.h
new file mode 100644
index 0000000000..d055db7c06
--- /dev/null
+++ b/src/quick/items/context2d/qquickcontext2dtexture_p.h
@@ -0,0 +1,203 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef QQUICKCONTEXT2DTEXTURE_P_H
+#define QQUICKCONTEXT2DTEXTURE_P_H
+
+#include <QtQuick/qsgtexture.h>
+#include "qquickcanvasitem_p.h"
+#include "qquickcontext2d_p.h"
+
+#include <QOpenGLContext>
+#include <QOpenGLFramebufferObject>
+
+#include <QtCore/QMutex>
+#include <QtCore/QWaitCondition>
+#include <QtCore/QThread>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+class QQuickContext2DTile;
+class QQuickContext2DCommandBuffer;
+
+class QQuickContext2DTexture : public QSGDynamicTexture
+{
+    Q_OBJECT
+public:
+    QQuickContext2DTexture();
+    ~QQuickContext2DTexture();
+
+    virtual bool hasAlphaChannel() const {return true;}
+    virtual bool hasMipmaps() const {return false;}
+    virtual QSize textureSize() const;
+    virtual void lock() {}
+    virtual void unlock() {}
+    virtual void wait() {}
+    virtual void wake() {}
+    bool threadRendering() const {return m_threadRendering;}
+    virtual bool supportThreadRendering() const = 0;
+    virtual bool supportDirectRendering() const = 0;
+    virtual QQuickCanvasItem::RenderTarget renderTarget() const = 0;
+    virtual QImage toImage(const QRectF& region = QRectF()) = 0;
+    static QRect tiledRect(const QRectF& window, const QSize& tileSize);
+
+    virtual bool setCanvasSize(const QSize &size);
+    virtual bool setTileSize(const QSize &size);
+    virtual bool setCanvasWindow(const QRect& canvasWindow);
+    void setSmooth(bool smooth);
+    bool setDirtyRect(const QRect &dirtyRect);
+    virtual void canvasChanged(const QSize& canvasSize, const QSize& tileSize, const QRect& canvasWindow, const QRect& dirtyRect, bool smooth);
+    bool canvasDestroyed();
+Q_SIGNALS:
+    void textureChanged();
+
+public Q_SLOTS:
+    void markDirtyTexture();
+    void setItem(QQuickCanvasItem* item);
+    void paint();
+
+protected:
+    void paintWithoutTiles();
+    virtual QPaintDevice* beginPainting() {m_painting = true; return 0; }
+    virtual void endPainting() {m_painting = false;}
+    virtual QQuickContext2DTile* createTile() const = 0;
+    virtual void compositeTile(QQuickContext2DTile* tile) = 0;
+
+    void clearTiles();
+    QRect createTiles(const QRect& window);
+
+    QList<QQuickContext2DTile*> m_tiles;
+    QQuickContext2D* m_context;
+
+    QQuickContext2D::State m_state;
+
+    QQuickCanvasItem* m_item;
+    QSize m_canvasSize;
+    QSize m_tileSize;
+    QRect m_canvasWindow;
+
+    uint m_dirtyCanvas : 1;
+    uint m_dirtyTexture : 1;
+    uint m_threadRendering : 1;
+    uint m_smooth : 1;
+    uint m_tiledCanvas : 1;
+    uint m_doGrabImage : 1;
+    uint m_painting : 1;
+};
+
+class QQuickContext2DFBOTexture : public QQuickContext2DTexture
+{
+    Q_OBJECT
+
+public:
+    QQuickContext2DFBOTexture();
+    ~QQuickContext2DFBOTexture();
+    virtual int textureId() const;
+    virtual bool updateTexture();
+    virtual QQuickContext2DTile* createTile() const;
+    virtual QImage toImage(const QRectF& region = QRectF());
+    virtual QPaintDevice* beginPainting();
+    virtual void endPainting();
+    QRectF textureSubRect() const;
+    virtual bool supportThreadRendering() const {return false;}
+    virtual bool supportDirectRendering() const {return false;}
+    virtual QQuickCanvasItem::RenderTarget renderTarget() const;
+    virtual void compositeTile(QQuickContext2DTile* tile);
+    virtual void bind();
+    virtual bool setCanvasSize(const QSize &size);
+    virtual bool setTileSize(const QSize &size);
+    virtual bool setCanvasWindow(const QRect& canvasWindow);
+private Q_SLOTS:
+    void grabImage();
+
+private:
+    bool doMultisampling() const;
+    QImage m_grabedImage;
+    QOpenGLFramebufferObject *m_fbo;
+    QOpenGLFramebufferObject *m_multisampledFbo;
+    QMutex m_mutex;
+    QWaitCondition m_condition;
+    QSize m_fboSize;
+    QPaintDevice *m_paint_device;
+};
+
+class QSGPlainTexture;
+class QQuickContext2DImageTexture : public QQuickContext2DTexture
+{
+    Q_OBJECT
+
+public:
+    QQuickContext2DImageTexture(bool threadRendering = true);
+    ~QQuickContext2DImageTexture();
+    virtual int textureId() const;
+    virtual void bind();
+    virtual bool supportThreadRendering() const {return true;}
+    virtual bool supportDirectRendering() const;
+    virtual QQuickCanvasItem::RenderTarget renderTarget() const;
+    virtual void lock();
+    virtual void unlock();
+    virtual void wait();
+    virtual void wake();
+
+    virtual bool updateTexture();
+    virtual QQuickContext2DTile* createTile() const;
+    virtual QImage toImage(const QRectF& region = QRectF());
+    virtual QPaintDevice* beginPainting();
+    virtual void compositeTile(QQuickContext2DTile* tile);
+
+private Q_SLOTS:
+    void grabImage(const QRect& r);
+private:
+    QImage m_image;
+    QImage m_grabedImage;
+    QMutex m_mutex;
+    QWaitCondition m_waitCondition;
+    QPainter m_painter;
+    QSGPlainTexture*  m_texture;
+};
+
+QT_END_HEADER
+
+QT_END_NAMESPACE
+
+#endif // QQUICKCONTEXT2DTEXTURE_P_H