diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-08 01:43:00 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-08 01:43:00 (GMT) |
| commit | 56768688cc49c2dd2234598b41ebbfd046937ac5 (patch) | |
| tree | 029ced5da670e8b64901827508502454e0a167aa /src/declarative/qml/qdeclarativeobjectscriptclass_p.h | |
| parent | 038f6fc10092da1414fd2efff353671dbf862995 (diff) | |
| parent | 9bc81769eb6ebc9bd62fe3c1d86e67ddccbed8b6 (diff) | |
| download | Qt-56768688cc49c2dd2234598b41ebbfd046937ac5.zip Qt-56768688cc49c2dd2234598b41ebbfd046937ac5.tar.gz Qt-56768688cc49c2dd2234598b41ebbfd046937ac5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativeobjectscriptclass_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeobjectscriptclass_p.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass_p.h b/src/declarative/qml/qdeclarativeobjectscriptclass_p.h index 8023756..04e760f 100644 --- a/src/declarative/qml/qdeclarativeobjectscriptclass_p.h +++ b/src/declarative/qml/qdeclarativeobjectscriptclass_p.h @@ -73,10 +73,21 @@ public: ~QDeclarativeObjectMethodScriptClass(); QScriptValue newMethod(QObject *, const QDeclarativePropertyCache::Data *); + protected: virtual Value call(Object *, QScriptContext *); + virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &, QScriptClass::QueryFlags flags); + virtual Value property(Object *, const Identifier &); private: + PersistentIdentifier m_connectId; + PersistentIdentifier m_disconnectId; + QScriptValue m_connect; + QScriptValue m_disconnect; + + static QScriptValue connect(QScriptContext *context, QScriptEngine *engine); + static QScriptValue disconnect(QScriptContext *context, QScriptEngine *engine); + QDeclarativeEngine *engine; }; #endif @@ -119,6 +130,7 @@ protected: private: #if (QT_VERSION > QT_VERSION_CHECK(4, 6, 2)) || defined(QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE) + friend class QDeclarativeObjectMethodScriptClass; QDeclarativeObjectMethodScriptClass methods; #endif |