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

diff --git a/src/quick/items/qquicksprite.cpp b/src/quick/items/qquicksprite.cpp
new file mode 100644
index 0000000000..b476905269
--- /dev/null
+++ b/src/quick/items/qquicksprite.cpp
@@ -0,0 +1,130 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Declarative 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 "qquicksprite_p.h"
+#include <QDebug>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \qmlclass Sprite QQuickSprite
+    \inqmlmodule QtQuick 2
+    \brief The Sprite element represents a sprite animation
+
+*/
+/*!
+    \qmlproperty int QtQuick2::Sprite::duration
+
+    Time between frames.
+*/
+/*!
+    \qmlproperty int QtQuick2::Sprite::durationVariation
+
+    The time between frames can vary by up to this amount.
+
+    Default is 0.
+*/
+
+/*!
+    \qmlproperty string QtQuick2::Sprite::name
+
+    The name of this sprite, for use in the to property of other sprites.
+*/
+/*!
+    \qmlproperty QVariantMap QtQuick2::Sprite::to
+
+    A list of other sprites and weighted transitions to them,
+    for example {"a":1, "b":2, "c":0} would specify that one-third should
+    transition to sprite "a" when this sprite is done, and two-thirds should
+    transition to sprite "b" when this sprite is done. As the transitions are
+    chosen randomly, these proportions will not be exact. With "c":0 in the list,
+    no sprites will randomly transition to "c", but it wll be a valid path if a sprite
+    goal is set.
+
+    If no list is specified, or the sum of weights in the list is zero, then the sprite
+    will repeat itself after completing.
+*/
+/*!
+    \qmlproperty int QtQuick2::Sprite::frames
+
+    Number of frames in this sprite.
+*/
+/*!
+    \qmlproperty int QtQuick2::Sprite::frameHeight
+
+    Height of a single frame in this sprite.
+*/
+/*!
+    \qmlproperty int QtQuick2::Sprite::frameWidth
+
+    Width of a single frame in this sprite.
+*/
+/*!
+    \qmlproperty url QtQuick2::Sprite::source
+
+    The image source for the animation.
+
+    If frameHeight and frameWidth are not specified, it is assumed to be a single long row of square frames.
+    Otherwise, it can be multiple contiguous rows or rectangluar frames, when one row runs out the next will be used.
+*/
+    Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
+    Q_PROPERTY(int durationVariation READ durationVariance WRITE setDurationVariance NOTIFY durationVarianceChanged)
+    Q_PROPERTY(QVariantMap to READ to WRITE setTo NOTIFY toChanged)
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+    Q_PROPERTY(qreal speedModifiesDuration READ speedModifer WRITE setSpeedModifier NOTIFY speedModifierChanged)
+    Q_PROPERTY(int frames READ frames WRITE setFrames NOTIFY framesChanged)
+    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+    //If frame height or width is not specified, it is assumed to be a single long row of square frames.
+    //Otherwise, it can be multiple contiguous rows, when one row runs out the next will be used.
+    Q_PROPERTY(int frameHeight READ frameHeight WRITE setFrameHeight NOTIFY frameHeightChanged)
+    Q_PROPERTY(int frameWidth READ frameWidth WRITE setFrameWidth NOTIFY frameWidthChanged)
+
+QQuickSprite::QQuickSprite(QObject *parent) :
+    QQuickStochasticState(parent)
+    , m_generatedCount(0)
+    , m_framesPerRow(0)
+    , m_frameHeight(0)
+    , m_frameWidth(0)
+    , m_rowY(0)
+{
+}
+
+QT_END_NAMESPACE