diff options
author | Chris Adams <christopher.adams@nokia.com> | 2011-08-03 09:20:18 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-18 05:10:14 +0200 |
commit | 36767e3fe1f0038441ae06ef5b5e1cb19a3738fa (patch) | |
tree | b0585a341061534876ac1e5ce1ce85f78a504ef1 /tests/auto/declarative/qdeclarativevaluetypes/testtypes.h | |
parent | 74f3a67fe80fecf7ba2fd76e1758b6c0f68ce918 (diff) |
Make QColor a value type
This commit allows direct access to the r, g, b and a components
of a color (in floating point format: 0 <= v <= 1). Since conversion
from color to string is a common operation, this commit also adds
unit tests to ensure that the previous behaviour is maintained in
other cases (comparison with toString value, etc).
Task-number: QTBUG-14731
Change-Id: I87b521dd4f9c1e96dfe5b20cf8053293cb14cfe4
Reviewed-on: http://codereview.qt.nokia.com/2527
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativevaluetypes/testtypes.h')
-rw-r--r-- | tests/auto/declarative/qdeclarativevaluetypes/testtypes.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h index 1efab0c423..5eb6bf6b6d 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h +++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h @@ -54,6 +54,7 @@ #include <QQuaternion> #include <QMatrix4x4> #include <QFont> +#include <QColor> #include <qdeclarative.h> #include <QDeclarativePropertyValueSource> #include <QDeclarativeProperty> @@ -79,6 +80,7 @@ class MyTypeObject : public QObject Q_PROPERTY(QQuaternion quaternion READ quaternion WRITE setQuaternion NOTIFY changed) Q_PROPERTY(QMatrix4x4 matrix READ matrix WRITE setMatrix NOTIFY changed) Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY changed) + Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY changed) Q_PROPERTY(QVariant variant READ variant NOTIFY changed) public: @@ -109,6 +111,10 @@ public: m_font.setCapitalization(QFont::AllLowercase); m_font.setLetterSpacing(QFont::AbsoluteSpacing, 10.2); m_font.setWordSpacing(19.7); + m_color.setRedF(0.2); + m_color.setGreenF(0.88); + m_color.setBlueF(0.6); + m_color.setAlphaF(0.34); } QPoint m_point; @@ -171,6 +177,10 @@ public: QFont font() const { return m_font; } void setFont(const QFont &v) { m_font = v; emit changed(); } + QColor m_color; + QColor color() const { return m_color; } + void setColor(const QColor &v) { m_color = v; emit changed(); } + QVariant variant() const { return sizef(); } void emitRunScript() { emit runScript(); } |