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

diff --git a/src/quick/items/qquickshadereffectsource_p.h b/src/quick/items/qquickshadereffectsource_p.h
new file mode 100644
index 0000000000..b648cb5614
--- /dev/null
+++ b/src/quick/items/qquickshadereffectsource_p.h
@@ -0,0 +1,257 @@
+/****************************************************************************
+**
+** 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 QQUICKSHADEREFFECTSOURCE_P_H
+#define QQUICKSHADEREFFECTSOURCE_P_H
+
+#include "qquickitem.h"
+#include <QtQuick/private/qsgtextureprovider_p.h>
+#include <private/qsgadaptationlayer_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
+#include <private/qsgdefaultimagenode_p.h>
+#include <private/qquickitemchangelistener_p.h>
+
+#include "qpointer.h"
+#include "qsize.h"
+#include "qrect.h"
+
+#define QSG_DEBUG_FBO_OVERLAY
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+class QSGNode;
+class UpdatePaintNodeData;
+class QOpenGLFramebufferObject;
+
+class QQuickShaderEffectSourceTextureProvider;
+
+class QQuickShaderEffectSourceNode : public QObject, public QSGDefaultImageNode
+{
+    Q_OBJECT
+
+public:
+    QQuickShaderEffectSourceNode();
+
+private Q_SLOTS:
+    void markDirtyTexture();
+};
+
+class Q_QUICK_EXPORT QQuickShaderEffectTexture : public QSGDynamicTexture
+{
+    Q_OBJECT
+public:
+    QQuickShaderEffectTexture(QQuickItem *shaderSource);
+    ~QQuickShaderEffectTexture();
+
+    virtual bool updateTexture();
+
+    // The item's "paint node", not effect node.
+    QSGNode *item() const { return m_item; }
+    void setItem(QSGNode *item);
+
+    QRectF rect() const { return m_rect; }
+    void setRect(const QRectF &rect);
+
+    QSize size() const { return m_size; }
+    void setSize(const QSize &size);
+
+    void setHasMipmaps(bool mipmap);
+
+    void bind();
+
+    bool hasAlphaChannel() const;
+    bool hasMipmaps() const;
+    int textureId() const;
+    QSize textureSize() const { return m_size; }
+
+    GLenum format() const { return m_format; }
+    void setFormat(GLenum format);
+
+    bool live() const { return bool(m_live); }
+    void setLive(bool live);
+
+    bool recursive() const { return bool(m_recursive); }
+    void setRecursive(bool recursive);
+
+    void scheduleUpdate();
+
+    QImage toImage() const;
+
+Q_SIGNALS:
+    void updateRequested();
+    void scheduledUpdateCompleted();
+
+public Q_SLOTS:
+    void markDirtyTexture();
+
+private:
+    void grab();
+
+    QSGNode *m_item;
+    QRectF m_rect;
+    QSize m_size;
+    GLenum m_format;
+
+    QQuickItem *m_shaderSource;
+    QSGRenderer *m_renderer;
+    QOpenGLFramebufferObject *m_fbo;
+    QOpenGLFramebufferObject *m_secondaryFbo;
+
+#ifdef QSG_DEBUG_FBO_OVERLAY
+    QSGRectangleNode *m_debugOverlay;
+#endif
+
+    QSGContext *m_context;
+
+    uint m_mipmap : 1;
+    uint m_live : 1;
+    uint m_recursive : 1;
+    uint m_dirtyTexture : 1;
+    uint m_multisamplingSupportChecked : 1;
+    uint m_multisampling : 1;
+    uint m_grab : 1;
+};
+
+class Q_QUICK_EXPORT QQuickShaderEffectSource : public QQuickItem, public QQuickItemChangeListener
+{
+    Q_OBJECT
+    Q_PROPERTY(WrapMode wrapMode READ wrapMode WRITE setWrapMode NOTIFY wrapModeChanged)
+    Q_PROPERTY(QQuickItem *sourceItem READ sourceItem WRITE setSourceItem NOTIFY sourceItemChanged)
+    Q_PROPERTY(QRectF sourceRect READ sourceRect WRITE setSourceRect NOTIFY sourceRectChanged)
+    Q_PROPERTY(QSize textureSize READ textureSize WRITE setTextureSize NOTIFY textureSizeChanged)
+    Q_PROPERTY(Format format READ format WRITE setFormat NOTIFY formatChanged)
+    Q_PROPERTY(bool live READ live WRITE setLive NOTIFY liveChanged)
+    Q_PROPERTY(bool hideSource READ hideSource WRITE setHideSource NOTIFY hideSourceChanged)
+    Q_PROPERTY(bool mipmap READ mipmap WRITE setMipmap NOTIFY mipmapChanged)
+    Q_PROPERTY(bool recursive READ recursive WRITE setRecursive NOTIFY recursiveChanged)
+
+    Q_ENUMS(Format WrapMode)
+public:
+    enum WrapMode {
+        ClampToEdge,
+        RepeatHorizontally,
+        RepeatVertically,
+        Repeat
+    };
+
+    enum Format {
+        Alpha = GL_ALPHA,
+        RGB = GL_RGB,
+        RGBA = GL_RGBA
+    };
+
+    QQuickShaderEffectSource(QQuickItem *parent = 0);
+    ~QQuickShaderEffectSource();
+
+    WrapMode wrapMode() const;
+    void setWrapMode(WrapMode mode);
+
+    QQuickItem *sourceItem() const;
+    void setSourceItem(QQuickItem *item);
+
+    QRectF sourceRect() const;
+    void setSourceRect(const QRectF &rect);
+
+    QSize textureSize() const;
+    void setTextureSize(const QSize &size);
+
+    Format format() const;
+    void setFormat(Format format);
+
+    bool live() const;
+    void setLive(bool live);
+
+    bool hideSource() const;
+    void setHideSource(bool hide);
+
+    bool mipmap() const;
+    void setMipmap(bool enabled);
+
+    bool recursive() const;
+    void setRecursive(bool enabled);
+
+    bool isTextureProvider() const { return true; }
+    QSGTextureProvider *textureProvider() const;
+
+    Q_INVOKABLE void scheduleUpdate();
+
+Q_SIGNALS:
+    void wrapModeChanged();
+    void sourceItemChanged();
+    void sourceRectChanged();
+    void textureSizeChanged();
+    void formatChanged();
+    void liveChanged();
+    void hideSourceChanged();
+    void mipmapChanged();
+    void recursiveChanged();
+
+    void scheduledUpdateCompleted();
+
+protected:
+    virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
+
+    virtual void itemGeometryChanged(QQuickItem *item, const QRectF &newRect, const QRectF &oldRect);
+
+private:
+    void ensureTexture();
+
+    QQuickShaderEffectSourceTextureProvider *m_provider;
+    QQuickShaderEffectTexture *m_texture;
+    WrapMode m_wrapMode;
+    QPointer<QQuickItem> m_sourceItem;
+    QRectF m_sourceRect;
+    QSize m_textureSize;
+    Format m_format;
+    uint m_live : 1;
+    uint m_hideSource : 1;
+    uint m_mipmap : 1;
+    uint m_recursive : 1;
+    uint m_grab : 1;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QQUICKSHADEREFFECTSOURCE_P_H