diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-16 00:12:16 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-16 00:12:16 (GMT) |
| commit | 7b0d764f37fa4009dc1556666eb8a141164fb0e0 (patch) | |
| tree | 3d5d1c0f5aadc2f3e2a5eccacd2fc2f32b21e385 /src/declarative/qml/qdeclarativeproperty_p.h | |
| parent | bac82138b76ac9f6a0603fa454f6660d139287d0 (diff) | |
| parent | 16ae00c689faac5d7af312ae31d7f715dc6e0745 (diff) | |
| download | Qt-7b0d764f37fa4009dc1556666eb8a141164fb0e0.zip Qt-7b0d764f37fa4009dc1556666eb8a141164fb0e0.tar.gz Qt-7b0d764f37fa4009dc1556666eb8a141164fb0e0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativeproperty_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeproperty_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeproperty_p.h b/src/declarative/qml/qdeclarativeproperty_p.h index 420a1ba..8522561 100644 --- a/src/declarative/qml/qdeclarativeproperty_p.h +++ b/src/declarative/qml/qdeclarativeproperty_p.h @@ -96,8 +96,6 @@ public: void initProperty(QObject *obj, const QString &name); void initDefault(QObject *obj); - QMetaMethod findSignal(QObject *, const QString &); - bool isValueType() const; int propertyType() const; QDeclarativeProperty::PropertyTypeCategory propertyTypeCategory() const; @@ -134,6 +132,7 @@ public: static bool write(const QDeclarativeProperty &that, const QVariant &, WriteFlags); static int valueTypeCoreIndex(const QDeclarativeProperty &that); static int bindingIndex(const QDeclarativeProperty &that); + static QMetaMethod findSignalByName(const QMetaObject *mo, const QByteArray &); }; Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativePropertyPrivate::WriteFlags) |