diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-05 08:04:37 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-05 08:04:37 (GMT) |
| commit | dcd17fa7b77cb6adfb8b21ea90c113915cab9bd5 (patch) | |
| tree | 37dca0549529fe43b6e98af3adab133a9f5991d1 /src/declarative/qml/qdeclarativeobjectscriptclass_p.h | |
| parent | 4a6154ec912d5b84a556aa731c5b7de8f758ba3d (diff) | |
| download | Qt-dcd17fa7b77cb6adfb8b21ea90c113915cab9bd5.zip Qt-dcd17fa7b77cb6adfb8b21ea90c113915cab9bd5.tar.gz Qt-dcd17fa7b77cb6adfb8b21ea90c113915cab9bd5.tar.bz2 | |
Add support for QtScript connect/disconnect syntax in QML
This support was accidentally removed as a consequence of
4a665ff5da05860f5eb46e3982ef3d8163a6cf59.
QTBUG-8001
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 |