diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-11 04:23:01 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-11 04:23:01 (GMT) |
| commit | d7279368fac43e88157f5d4b90a38aeea1cc3e73 (patch) | |
| tree | b3be0351c436bf7da3818a09cc561c472eabf086 /src/declarative/qml/qmlobjectscriptclass_p.h | |
| parent | ece224f79dfe3b859910cb24d64e96277b3c737f (diff) | |
| download | Qt-d7279368fac43e88157f5d4b90a38aeea1cc3e73.zip Qt-d7279368fac43e88157f5d4b90a38aeea1cc3e73.tar.gz Qt-d7279368fac43e88157f5d4b90a38aeea1cc3e73.tar.bz2 | |
Update QML to adhere to latest QScriptDeclarativeClass
Diffstat (limited to 'src/declarative/qml/qmlobjectscriptclass_p.h')
| -rw-r--r-- | src/declarative/qml/qmlobjectscriptclass_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlobjectscriptclass_p.h b/src/declarative/qml/qmlobjectscriptclass_p.h index ca50688..5c488db 100644 --- a/src/declarative/qml/qmlobjectscriptclass_p.h +++ b/src/declarative/qml/qmlobjectscriptclass_p.h @@ -86,7 +86,7 @@ public: QScriptClass::QueryFlags flags, QmlContext *evalContext, QueryHints hints = 0); - QScriptValue property(QObject *, const Identifier &); + Value property(QObject *, const Identifier &); void setProperty(QObject *, const Identifier &name, const QScriptValue &, QmlContext *evalContext = 0); @@ -94,7 +94,7 @@ protected: virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &, QScriptClass::QueryFlags flags); - virtual QScriptValue property(Object *, const Identifier &); + virtual Value property(Object *, const Identifier &); virtual void setProperty(Object *, const Identifier &name, const QScriptValue &); virtual bool isQObject() const; virtual QObject *toQObject(Object *, bool *ok = 0); |