diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-20 04:06:17 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-20 04:06:17 (GMT) |
| commit | 28ec928bfd1bb4fb5bf6fb6a7445db4f52a36a0c (patch) | |
| tree | 0f72612a7796f4e63648235fa71a30c041acfa5d /src/declarative/qml/qmlcontextscriptclass.cpp | |
| parent | a7506ce64ae9e80a202e0ffdaa86785d1d117c78 (diff) | |
| download | Qt-28ec928bfd1bb4fb5bf6fb6a7445db4f52a36a0c.zip Qt-28ec928bfd1bb4fb5bf6fb6a7445db4f52a36a0c.tar.gz Qt-28ec928bfd1bb4fb5bf6fb6a7445db4f52a36a0c.tar.bz2 | |
Compile with Qt 4.6.1
Diffstat (limited to 'src/declarative/qml/qmlcontextscriptclass.cpp')
| -rw-r--r-- | src/declarative/qml/qmlcontextscriptclass.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlcontextscriptclass.cpp b/src/declarative/qml/qmlcontextscriptclass.cpp index 71b77d5..eecc611 100644 --- a/src/declarative/qml/qmlcontextscriptclass.cpp +++ b/src/declarative/qml/qmlcontextscriptclass.cpp @@ -77,7 +77,7 @@ struct ContextData : public QScriptDeclarativeClass::Object { via QtScript. */ QmlContextScriptClass::QmlContextScriptClass(QmlEngine *bindEngine) -: QScriptDeclarativeClass(QmlEnginePrivate::getScriptEngine(bindEngine)), engine(bindEngine), +: QmlScriptClass(QmlEnginePrivate::getScriptEngine(bindEngine)), engine(bindEngine), lastScopeObject(0), lastContext(0), lastData(0), lastPropertyIndex(-1), lastDefaultObject(-1) { } @@ -196,7 +196,7 @@ QmlContextScriptClass::queryProperty(QmlContext *bindContext, QObject *scopeObje return 0; } -QmlContextScriptClass::Value +QmlContextScriptClass::ScriptValue QmlContextScriptClass::property(Object *object, const Identifier &name) { Q_UNUSED(object); |