diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 07:22:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 07:22:32 (GMT) |
| commit | af810e444ee73b112623128a3637b28b81f3f2fb (patch) | |
| tree | 6bcf379115845f3bc6bd0fde6a2c74ffa320f92b /tests/auto/declarative/qdeclarativevaluetypes/testtypes.h | |
| parent | 4631d297781b8ad4eba0735b7023265d4872c1cb (diff) | |
| parent | a3b7438be516c44a5d1ebba91445164f0b64dd37 (diff) | |
| download | Qt-af810e444ee73b112623128a3637b28b81f3f2fb.zip Qt-af810e444ee73b112623128a3637b28b81f3f2fb.tar.gz Qt-af810e444ee73b112623128a3637b28b81f3f2fb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Autotest for QVariant value types
Fix memory leak
Clarify Component.createObject(null) behavior.
Diffstat (limited to 'tests/auto/declarative/qdeclarativevaluetypes/testtypes.h')
| -rw-r--r-- | tests/auto/declarative/qdeclarativevaluetypes/testtypes.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h index 86cbaa5..104d22f 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h +++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h @@ -76,6 +76,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(QVariant variant READ variant NOTIFY changed) public: MyTypeObject() : @@ -152,6 +153,8 @@ public: QFont font() const { return m_font; } void setFont(const QFont &v) { m_font = v; emit changed(); } + QVariant variant() const { return sizef(); } + void emitRunScript() { emit runScript(); } signals: |