diff options
author | Bea Lam <bea.lam@nokia.com> | 2010-03-17 02:58:35 (GMT) |
---|---|---|
committer | Bea Lam <bea.lam@nokia.com> | 2010-03-17 02:58:35 (GMT) |
commit | 1dcc60793f16e5922887a6fb2abff7d6fbe7146c (patch) | |
tree | 0950e1f4c48d9d1b8d4d907816f4c33ed1e67cf9 /src/declarative/qml/qdeclarativeobjectscriptclass_p.h | |
parent | 20470e30d11733ada5443ff993d8518aa14737ca (diff) | |
parent | 349df5c1ec50fde17a2dbf94af64ed76c55d7aaf (diff) | |
download | Qt-1dcc60793f16e5922887a6fb2abff7d6fbe7146c.zip Qt-1dcc60793f16e5922887a6fb2abff7d6fbe7146c.tar.gz Qt-1dcc60793f16e5922887a6fb2abff7d6fbe7146c.tar.bz2 |
Merge branch '4.7' of git@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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass_p.h b/src/declarative/qml/qdeclarativeobjectscriptclass_p.h index 1f7d1c9..396b782 100644 --- a/src/declarative/qml/qdeclarativeobjectscriptclass_p.h +++ b/src/declarative/qml/qdeclarativeobjectscriptclass_p.h @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE class QDeclarativeEngine; class QScriptContext; class QScriptEngine; -class QDeclarativeContext; +class QDeclarativeContextData; #if (QT_VERSION > QT_VERSION_CHECK(4, 6, 2)) || defined(QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE) class Q_AUTOTEST_EXPORT QDeclarativeObjectMethodScriptClass : public QScriptDeclarativeClass @@ -112,13 +112,13 @@ public: QScriptClass::QueryFlags queryProperty(QObject *, const Identifier &, QScriptClass::QueryFlags flags, - QDeclarativeContext *evalContext, + QDeclarativeContextData *evalContext, QueryHints hints = 0); ScriptValue property(QObject *, const Identifier &); void setProperty(QObject *, const Identifier &name, const QScriptValue &, - QDeclarativeContext *evalContext = 0); + QDeclarativeContextData *evalContext = 0); virtual QStringList propertyNames(Object *); virtual bool compare(Object *, Object *); |