summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qmllanguage/testtypes.h
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-11-04 01:10:22 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-11-04 02:15:43 (GMT)
commitbe0f4c04497f70f77511943716d7c592bc11de0d (patch)
treef34788845c75048a902d7f0d8a7192e8e987320a /tests/auto/declarative/qmllanguage/testtypes.h
parente8c547f283cdedfeacb056e672020a2dbe4157ff (diff)
downloadQt-be0f4c04497f70f77511943716d7c592bc11de0d.zip
Qt-be0f4c04497f70f77511943716d7c592bc11de0d.tar.gz
Qt-be0f4c04497f70f77511943716d7c592bc11de0d.tar.bz2
Improve qmllanguage test case
Diffstat (limited to 'tests/auto/declarative/qmllanguage/testtypes.h')
-rw-r--r--tests/auto/declarative/qmllanguage/testtypes.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmllanguage/testtypes.h b/tests/auto/declarative/qmllanguage/testtypes.h
index 91c6e2e..e654faa 100644
--- a/tests/auto/declarative/qmllanguage/testtypes.h
+++ b/tests/auto/declarative/qmllanguage/testtypes.h
@@ -46,6 +46,7 @@
#include <QtCore/qdatetime.h>
#include <QtGui/qmatrix.h>
#include <QtGui/qcolor.h>
+#include <QtGui/qvector3d.h>
#include <QtDeclarative/qml.h>
#include <QtDeclarative/qmlcomponent.h>
#include <QtDeclarative/qmlparserstatus.h>
@@ -185,6 +186,7 @@ class MyTypeObject : public QObject
Q_PROPERTY(int intProperty READ intProperty WRITE setIntProperty);
Q_PROPERTY(qreal realProperty READ realProperty WRITE setRealProperty);
Q_PROPERTY(double doubleProperty READ doubleProperty WRITE setDoubleProperty);
+ Q_PROPERTY(float floatProperty READ floatProperty WRITE setFloatProperty);
Q_PROPERTY(QColor colorProperty READ colorProperty WRITE setColorProperty);
Q_PROPERTY(QDate dateProperty READ dateProperty WRITE setDateProperty);
Q_PROPERTY(QTime timeProperty READ timeProperty WRITE setTimeProperty);
@@ -198,6 +200,7 @@ class MyTypeObject : public QObject
Q_PROPERTY(QRectF rectFProperty READ rectFProperty WRITE setRectFProperty);
Q_PROPERTY(bool boolProperty READ boolProperty WRITE setBoolProperty);
Q_PROPERTY(QVariant variantProperty READ variantProperty WRITE setVariantProperty);
+ Q_PROPERTY(QVector3D vectorProperty READ vectorProperty WRITE setVectorProperty);
Q_PROPERTY(QmlScriptString scriptProperty READ scriptProperty WRITE setScriptProperty);
Q_PROPERTY(MyGroupedObject *grouped READ grouped CONSTANT);
@@ -289,6 +292,14 @@ public:
doublePropertyValue = v;
}
+ float floatPropertyValue;
+ float floatProperty() const {
+ return floatPropertyValue;
+ }
+ void setFloatProperty(const float &v) {
+ floatPropertyValue = v;
+ }
+
QColor colorPropertyValue;
QColor colorProperty() const {
return colorPropertyValue;
@@ -394,6 +405,14 @@ public:
variantPropertyValue = v;
}
+ QVector3D vectorPropertyValue;
+ QVector3D vectorProperty() const {
+ return vectorPropertyValue;
+ }
+ void setVectorProperty(const QVector3D &v) {
+ vectorPropertyValue = v;
+ }
+
QmlScriptString scriptPropertyValue;
QmlScriptString scriptProperty() const {
return scriptPropertyValue;