summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativevaluetypes
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-02-25 10:01:25 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-02-25 10:02:54 (GMT)
commitf5bb807d6938fbd39ea1f99ed45c817d538e4287 (patch)
treeb3e1705e4703c5d7da5ffca3010d062644a62ae3 /tests/auto/declarative/qdeclarativevaluetypes
parent0e4dd15a90c119cea4ada833d88b51e336f53ee7 (diff)
downloadQt-f5bb807d6938fbd39ea1f99ed45c817d538e4287.zip
Qt-f5bb807d6938fbd39ea1f99ed45c817d538e4287.tar.gz
Qt-f5bb807d6938fbd39ea1f99ed45c817d538e4287.tar.bz2
Rename QDeclarativeMetaProperty -> QDeclarativeProperty
There's nothing meta about our properties.
Diffstat (limited to 'tests/auto/declarative/qdeclarativevaluetypes')
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/testtypes.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
index 82a9c8a..dfc2829 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
+++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
@@ -52,8 +52,8 @@
#include <QFont>
#include <qdeclarative.h>
#include <QDeclarativePropertyValueSource>
-#include <QDeclarativeMetaProperty>
-#include <private/qdeclarativemetaproperty_p.h>
+#include <QDeclarativeProperty>
+#include <private/qdeclarativeproperty_p.h>
class MyTypeObject : public QObject
{
@@ -135,7 +135,7 @@ class MyConstantValueSource : public QObject, public QDeclarativePropertyValueSo
{
Q_OBJECT
public:
- virtual void setTarget(const QDeclarativeMetaProperty &p) { p.write(3345); }
+ virtual void setTarget(const QDeclarativeProperty &p) { p.write(3345); }
};
QML_DECLARE_TYPE(MyConstantValueSource);
@@ -143,11 +143,11 @@ class MyOffsetValueInterceptor : public QObject, public QDeclarativePropertyValu
{
Q_OBJECT
public:
- virtual void setTarget(const QDeclarativeMetaProperty &p) { prop = p; }
- virtual void write(const QVariant &value) { QDeclarativeMetaPropertyPrivate::write(prop, value.toInt() + 13, QDeclarativeMetaPropertyPrivate::BypassInterceptor); }
+ virtual void setTarget(const QDeclarativeProperty &p) { prop = p; }
+ virtual void write(const QVariant &value) { QDeclarativePropertyPrivate::write(prop, value.toInt() + 13, QDeclarativePropertyPrivate::BypassInterceptor); }
private:
- QDeclarativeMetaProperty prop;
+ QDeclarativeProperty prop;
};
QML_DECLARE_TYPE(MyOffsetValueInterceptor);