summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-02-10 03:06:53 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-02-10 03:06:53 (GMT)
commit64b0f5be361958fec2bb0eba48914773a7d525ad (patch)
tree0ca6d096f2d41f70301ffec5226f0503b9a0d282
parent6dbd2643ac8230bce652411dd5f8bd34567b387a (diff)
downloadQt-64b0f5be361958fec2bb0eba48914773a7d525ad.zip
Qt-64b0f5be361958fec2bb0eba48914773a7d525ad.tar.gz
Qt-64b0f5be361958fec2bb0eba48914773a7d525ad.tar.bz2
Revert "Remove unimplemented methods from header"
This reverts commit e712ecee850e04084643243a096befbf47e4e8b9.
-rw-r--r--src/declarative/qml/qmlmetatype.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlmetatype.h b/src/declarative/qml/qmlmetatype.h
index 6dccc7a..e0c65c5 100644
--- a/src/declarative/qml/qmlmetatype.h
+++ b/src/declarative/qml/qmlmetatype.h
@@ -86,6 +86,7 @@ public:
static int listType(int);
static bool clear(const QVariant &);
static bool append(const QVariant &, const QVariant &);
+ static QVariant fromObject(QObject *, int type);
static const QMetaObject *rawMetaObjectForType(int);
static const QMetaObject *metaObjectForType(int);
static int attachedPropertiesFuncId(const QMetaObject *);
@@ -141,6 +142,7 @@ public:
const QMetaObject *attachedPropertiesType() const;
int parserStatusCast() const;
+ QVariant fromObject(QObject *) const;
const char *interfaceIId() const;
int propertyValueSourceCast() const;
int propertyValueInterceptorCast() const;