diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2011-11-23 15:14:07 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-02 14:18:20 +0100 |
commit | 6c8378eaf1edbbefe6aaa3672b0127816a004fd7 (patch) | |
tree | 8ee08fb447e052f7a7a685fbeaaa04f04ea60126 /src/quick/items/qquickrectangle_p.h | |
parent | e01219b77b1e889e70437635905d7ff820568e23 (diff) |
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>
Diffstat (limited to 'src/quick/items/qquickrectangle_p.h')
-rw-r--r-- | src/quick/items/qquickrectangle_p.h | 188 |
1 files changed, 188 insertions, 0 deletions
diff --git a/src/quick/items/qquickrectangle_p.h b/src/quick/items/qquickrectangle_p.h new file mode 100644 index 0000000000..540eb33739 --- /dev/null +++ b/src/quick/items/qquickrectangle_p.h @@ -0,0 +1,188 @@ +// Commit: ac5c099cc3c5b8c7eec7a49fdeb8a21037230350 +/**************************************************************************** +** +** 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 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 QQUICKRECTANGLE_P_H +#define QQUICKRECTANGLE_P_H + +#include "qquickitem.h" + +#include <QtGui/qbrush.h> + +#include <private/qtquickglobal_p.h> + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +class Q_QUICK_PRIVATE_EXPORT QQuickPen : public QObject +{ + Q_OBJECT + + Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY penChanged) + Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY penChanged) + Q_PROPERTY(bool aligned READ aligned WRITE setAligned NOTIFY penChanged) +public: + QQuickPen(QObject *parent=0); + + qreal width() const; + void setWidth(qreal w); + + QColor color() const; + void setColor(const QColor &c); + + bool aligned() const; + void setAligned(bool aligned); + + bool isValid() const; + +Q_SIGNALS: + void penChanged(); + +private: + qreal m_width; + QColor m_color; + bool m_aligned : 1; + bool m_valid : 1; +}; + +class Q_AUTOTEST_EXPORT QQuickGradientStop : public QObject +{ + Q_OBJECT + + Q_PROPERTY(qreal position READ position WRITE setPosition) + Q_PROPERTY(QColor color READ color WRITE setColor) + +public: + QQuickGradientStop(QObject *parent=0); + + qreal position() const; + void setPosition(qreal position); + + QColor color() const; + void setColor(const QColor &color); + +private: + void updateGradient(); + +private: + qreal m_position; + QColor m_color; +}; + +class Q_AUTOTEST_EXPORT QQuickGradient : public QObject +{ + Q_OBJECT + + Q_PROPERTY(QDeclarativeListProperty<QQuickGradientStop> stops READ stops) + Q_CLASSINFO("DefaultProperty", "stops") + +public: + QQuickGradient(QObject *parent=0); + ~QQuickGradient(); + + QDeclarativeListProperty<QQuickGradientStop> stops(); + + const QGradient *gradient() const; + +Q_SIGNALS: + void updated(); + +private: + void doUpdate(); + +private: + QList<QQuickGradientStop *> m_stops; + mutable QGradient *m_gradient; + friend class QQuickRectangle; + friend class QQuickGradientStop; +}; + +class QQuickRectanglePrivate; +class Q_QUICK_PRIVATE_EXPORT QQuickRectangle : public QQuickItem +{ + Q_OBJECT + + Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) + Q_PROPERTY(QQuickGradient *gradient READ gradient WRITE setGradient) + Q_PROPERTY(QQuickPen * border READ border CONSTANT) + Q_PROPERTY(qreal radius READ radius WRITE setRadius NOTIFY radiusChanged) +public: + QQuickRectangle(QQuickItem *parent=0); + + QColor color() const; + void setColor(const QColor &); + + QQuickPen *border(); + + QQuickGradient *gradient() const; + void setGradient(QQuickGradient *gradient); + + qreal radius() const; + void setRadius(qreal radius); + + virtual QRectF boundingRect() const; + +Q_SIGNALS: + void colorChanged(); + void radiusChanged(); + +protected: + virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); + +private Q_SLOTS: + void doUpdate(); + +private: + Q_DISABLE_COPY(QQuickRectangle) + Q_DECLARE_PRIVATE(QQuickRectangle) +}; + +QT_END_NAMESPACE + +QML_DECLARE_TYPE(QQuickPen) +QML_DECLARE_TYPE(QQuickGradientStop) +QML_DECLARE_TYPE(QQuickGradient) +QML_DECLARE_TYPE(QQuickRectangle) + +QT_END_HEADER + +#endif // QQUICKRECTANGLE_P_H |