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

diff --git a/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h
new file mode 100644
index 0000000000..2029198648
--- /dev/null
+++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h
@@ -0,0 +1,266 @@
+/****************************************************************************
+**
+** 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 QQUICKCONTEXT2DCOMMANDBUFFER_P_H
+#define QQUICKCONTEXT2DCOMMANDBUFFER_P_H
+
+#include "qquickcontext2d_p.h"
+#include <QtQuick/private/qdeclarativepixmapcache_p.h>
+
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+class QQuickCanvasItem;
+class QMutex;
+
+class QQuickContext2DCommandBuffer
+{
+public:
+    QQuickContext2DCommandBuffer();
+    ~QQuickContext2DCommandBuffer();
+    void reset();
+    void clear();
+    inline int size() {return commands.size();}
+    inline bool isEmpty() const {return commands.isEmpty(); }
+    inline bool hasNext() const {return cmdIdx < commands.size(); }
+    inline QQuickContext2D::PaintCommand takeNextCommand() { return commands[cmdIdx++]; }
+
+    inline qreal takeGlobalAlpha() { return takeReal(); }
+    inline QPainter::CompositionMode takeGlobalCompositeOperation(){ return static_cast<QPainter::CompositionMode>(takeInt()); }
+    inline QBrush takeStrokeStyle() { return takeBrush(); }
+    inline QBrush takeFillStyle() { return takeBrush(); }
+
+    inline qreal takeLineWidth() { return takeReal(); }
+    inline Qt::PenCapStyle takeLineCap() { return static_cast<Qt::PenCapStyle>(takeInt());}
+    inline Qt::PenJoinStyle takeLineJoin(){ return static_cast<Qt::PenJoinStyle>(takeInt());}
+    inline qreal takeMiterLimit() { return takeReal(); }
+
+    inline void setGlobalAlpha( qreal alpha)
+    {
+        commands << QQuickContext2D::GlobalAlpha;
+        reals << alpha;
+    }
+
+    inline void setGlobalCompositeOperation(QPainter::CompositionMode cm)
+    {
+        commands << QQuickContext2D::GlobalCompositeOperation;
+        ints << cm;
+    }
+
+    inline void setStrokeStyle(const QBrush &style, bool repeatX = false, bool repeatY = false)
+    {
+        commands << QQuickContext2D::StrokeStyle;
+        brushes << style;
+        bools << repeatX << repeatY;
+    }
+
+    inline void drawImage(const QImage& image, qreal sx, qreal sy, qreal sw, qreal sh, qreal dx, qreal dy, qreal dw, qreal dh)
+    {
+        commands << QQuickContext2D::DrawImage;
+        images << image;
+        reals << sx << sy << sw << sh << dx << dy << dw << dh;
+    }
+
+    inline qreal takeShadowOffsetX() { return takeReal(); }
+    inline qreal takeShadowOffsetY() { return takeReal(); }
+    inline qreal takeShadowBlur() { return takeReal(); }
+    inline QColor takeShadowColor() { return takeColor(); }
+
+
+    inline void updateMatrix(const QTransform& matrix)
+    {
+        commands << QQuickContext2D::UpdateMatrix;
+        matrixes << matrix;
+    }
+
+    inline void clearRect(qreal x, qreal y, qreal w, qreal h)
+    {
+        commands << QQuickContext2D::ClearRect;
+        reals << x << y << w << h;
+    }
+
+    inline void fillRect(qreal x, qreal y, qreal w, qreal h)
+    {
+        commands << QQuickContext2D::FillRect;
+        reals << x << y << w << h;
+    }
+
+    inline void strokeRect(qreal x, qreal y, qreal w, qreal h)
+    {
+        QPainterPath p;
+        p.addRect(x, y, w, h);
+
+        commands << QQuickContext2D::Stroke;
+        pathes << p;
+    }
+
+
+    inline void fill(const QPainterPath& path)
+    {
+        commands << QQuickContext2D::Fill;
+        pathes << path;
+
+    }
+
+    inline void stroke(const QPainterPath& path)
+    {
+        commands << QQuickContext2D::Stroke;
+        pathes << path;
+    }
+
+    inline void clip(const QPainterPath& path)
+    {
+        commands << QQuickContext2D::Clip;
+        pathes << path;
+    }
+
+
+
+    inline void setFillStyle(const QBrush &style, bool repeatX = false, bool repeatY = false)
+    {
+        commands << QQuickContext2D::FillStyle;
+        brushes << style;
+        bools << repeatX << repeatY;
+    }
+
+
+    inline void setLineWidth( qreal w)
+    {
+        commands << QQuickContext2D::LineWidth;
+        reals << w;
+    }
+
+    inline void setLineCap(Qt::PenCapStyle  cap)
+    {
+        commands << QQuickContext2D::LineCap;
+        ints << cap;
+    }
+
+    inline void setLineJoin(Qt::PenJoinStyle join)
+    {
+        commands << QQuickContext2D::LineJoin;
+        ints << join;
+    }
+
+    inline void setMiterLimit( qreal limit)
+    {
+        commands << QQuickContext2D::MiterLimit;
+        reals << limit;
+    }
+
+    inline void setShadowOffsetX( qreal x)
+    {
+        commands << QQuickContext2D::ShadowOffsetX;
+        reals << x;
+    }
+
+    inline void setShadowOffsetY( qreal y)
+    {
+        commands << QQuickContext2D::ShadowOffsetY;
+        reals << y;
+    }
+
+    inline void setShadowBlur( qreal b)
+    {
+        commands << QQuickContext2D::ShadowBlur;
+        reals << b;
+    }
+
+    inline void setShadowColor(const QColor &color)
+    {
+        commands << QQuickContext2D::ShadowColor;
+        colors << color;
+    }
+
+    inline QTransform takeMatrix() { return matrixes[matrixIdx++]; }
+
+    // rects
+    inline QRectF takeRect() {
+        qreal x, y, w, h;
+        x = takeReal();
+        y = takeReal();
+        w = takeReal();
+        h = takeReal();
+        return QRectF(x, y, w ,h);
+    }
+
+    inline QPainterPath takePath() { return pathes[pathIdx++]; }
+
+    inline const QImage& takeImage() { return images[imageIdx++]; }
+
+    inline int takeInt() { return ints[intIdx++]; }
+    inline bool takeBool() {return bools[boolIdx++]; }
+    inline qreal takeReal() { return reals[realIdx++]; }
+    inline QColor takeColor() { return colors[colorIdx++]; }
+    inline QBrush takeBrush() { return brushes[brushIdx++]; }
+
+    void replay(QPainter* painter, QQuickContext2D::State& state);
+private:
+    QPen makePen(const QQuickContext2D::State& state);
+    void setPainterState(QPainter* painter, const QQuickContext2D::State& state, const QPen& pen);
+    int cmdIdx;
+    int intIdx;
+    int boolIdx;
+    int realIdx;
+    int colorIdx;
+    int matrixIdx;
+    int brushIdx;
+    int pathIdx;
+    int imageIdx;
+    QVector<QQuickContext2D::PaintCommand> commands;
+
+    QVector<int> ints;
+    QVector<bool> bools;
+    QVector<qreal> reals;
+    QVector<QColor> colors;
+    QVector<QTransform> matrixes;
+    QVector<QBrush> brushes;
+    QVector<QPainterPath> pathes;
+    QVector<QImage> images;
+};
+
+QT_END_HEADER
+
+QT_END_NAMESPACE
+
+#endif // QQUICKCONTEXT2DCOMMANDBUFFER_P_H