diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-13 15:06:40 +1000 |
|---|---|---|
| committer | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-13 15:22:14 +1000 |
| commit | 784555f3032194a8923d804a8ce84957f113caf6 (patch) | |
| tree | 6b538cea5bf82bd5288ac180125abd1bb312ddad /src/qml/qml/qqmlmetatype_p.h | |
| parent | 1f52c5430144eb7ba6baa7e3954675ca0707b947 (diff) | |
| parent | 648c80c4c0759efb6e35fac7acc8daad5aab13e2 (diff) | |
Merge branch 'master' of git://gitorious.org/qt/qtdeclarative into merge-master
Change-Id: Iaefec13503dadfa200539b8de7a2d80fc5bb3bcf
Diffstat (limited to 'src/qml/qml/qqmlmetatype_p.h')
| -rw-r--r-- | src/qml/qml/qqmlmetatype_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h index ad6a2aa055..b715d0c8f2 100644 --- a/src/qml/qml/qqmlmetatype_p.h +++ b/src/qml/qml/qqmlmetatype_p.h @@ -180,7 +180,6 @@ public: int attachedPropertiesId() const; int parserStatusCast() const; - QVariant fromObject(QObject *) const; const char *interfaceIId() const; int propertyValueSourceCast() const; int propertyValueInterceptorCast() const; |