projects
/
profile
/
ivi
/
qtdeclarative.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove "All rights reserved" line from license headers.
[profile/ivi/qtdeclarative.git]
/
tests
/
auto
/
declarative
/
qdeclarativelanguage
/
testtypes.h
diff --git
a/tests/auto/declarative/qdeclarativelanguage/testtypes.h
b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
index
527f670
..
4a37139
100644
(file)
--- a/
tests/auto/declarative/qdeclarativelanguage/testtypes.h
+++ b/
tests/auto/declarative/qdeclarativelanguage/testtypes.h
@@
-1,8
+1,7
@@
/****************************************************************************
**
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
**
** This file is part of the test suite of the Qt Toolkit.
**
**
** This file is part of the test suite of the Qt Toolkit.
**
@@
-35,6
+34,7
@@
**
**
**
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
** $QT_END_LICENSE$
**
****************************************************************************/
@@
-47,6
+47,7
@@
#include <QtGui/qmatrix.h>
#include <QtGui/qcolor.h>
#include <QtGui/qvector3d.h>
#include <QtGui/qmatrix.h>
#include <QtGui/qcolor.h>
#include <QtGui/qvector3d.h>
+#include <QtGui/qvector4d.h>
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qdeclarativecomponent.h>
#include <QtDeclarative/qdeclarativeparserstatus.h>
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qdeclarativecomponent.h>
#include <QtDeclarative/qdeclarativeparserstatus.h>
@@
-224,6
+225,7
@@
class MyTypeObject : public QObject
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(bool boolProperty READ boolProperty WRITE setBoolProperty)
Q_PROPERTY(QVariant variantProperty READ variantProperty WRITE setVariantProperty)
Q_PROPERTY(QVector3D vectorProperty READ vectorProperty WRITE setVectorProperty)
+ Q_PROPERTY(QVector4D vector4Property READ vector4Property WRITE setVector4Property)
Q_PROPERTY(QUrl urlProperty READ urlProperty WRITE setUrlProperty)
Q_PROPERTY(QDeclarativeScriptString scriptProperty READ scriptProperty WRITE setScriptProperty)
Q_PROPERTY(QUrl urlProperty READ urlProperty WRITE setUrlProperty)
Q_PROPERTY(QDeclarativeScriptString scriptProperty READ scriptProperty WRITE setScriptProperty)
@@
-442,6
+444,14
@@
public:
vectorPropertyValue = v;
}
vectorPropertyValue = v;
}
+ QVector4D vector4PropertyValue;
+ QVector4D vector4Property() const {
+ return vector4PropertyValue;
+ }
+ void setVector4Property(const QVector4D &v) {
+ vector4PropertyValue = v;
+ }
+
QUrl urlPropertyValue;
QUrl urlProperty() const {
return urlPropertyValue;
QUrl urlPropertyValue;
QUrl urlProperty() const {
return urlPropertyValue;
@@
-587,6
+597,7
@@
public:
class MyParserStatus : public QObject, public QDeclarativeParserStatus
{
class MyParserStatus : public QObject, public QDeclarativeParserStatus
{
+ Q_INTERFACES(QDeclarativeParserStatus)
Q_OBJECT
public:
MyParserStatus() : m_cbc(0), m_ccc(0) {}
Q_OBJECT
public:
MyParserStatus() : m_cbc(0), m_ccc(0) {}
@@
-794,6
+805,11
@@
protected:
qreal m_p5;
};
qreal m_p5;
};
+class MyVersion2Class : public QObject
+{
+ Q_OBJECT
+};
+
QML_DECLARE_TYPE(MyRevisionedBaseClassRegistered)
QML_DECLARE_TYPE(MyRevisionedBaseClassUnregistered)
QML_DECLARE_TYPE(MyRevisionedClass)
QML_DECLARE_TYPE(MyRevisionedBaseClassRegistered)
QML_DECLARE_TYPE(MyRevisionedBaseClassUnregistered)
QML_DECLARE_TYPE(MyRevisionedClass)