diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-07 04:25:54 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-07 04:26:46 (GMT) |
| commit | ec50ac021ba0908bfaeb5fbf1838ffb59ad829d5 (patch) | |
| tree | 1a6365c8b7487e4f5cf7e489aba8005797005e3c /src/declarative/qml/qdeclarativecontextscriptclass.cpp | |
| parent | b3beb6ded506f1701b68642d981c63295bc6c6a2 (diff) | |
| download | Qt-ec50ac021ba0908bfaeb5fbf1838ffb59ad829d5.zip Qt-ec50ac021ba0908bfaeb5fbf1838ffb59ad829d5.tar.gz Qt-ec50ac021ba0908bfaeb5fbf1838ffb59ad829d5.tar.bz2 | |
Cleanup (remove QDeclarativeScriptClass)
QDeclarativeScriptClass only existed to make compiling against 4.6 and
4.7 easier.
Diffstat (limited to 'src/declarative/qml/qdeclarativecontextscriptclass.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativecontextscriptclass.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativecontextscriptclass.cpp b/src/declarative/qml/qdeclarativecontextscriptclass.cpp index 8566744..6d31c22 100644 --- a/src/declarative/qml/qdeclarativecontextscriptclass.cpp +++ b/src/declarative/qml/qdeclarativecontextscriptclass.cpp @@ -79,7 +79,7 @@ struct ContextData : public QScriptDeclarativeClass::Object { via QtScript. */ QDeclarativeContextScriptClass::QDeclarativeContextScriptClass(QDeclarativeEngine *bindEngine) -: QDeclarativeScriptClass(QDeclarativeEnginePrivate::getScriptEngine(bindEngine)), engine(bindEngine), +: QScriptDeclarativeClass(QDeclarativeEnginePrivate::getScriptEngine(bindEngine)), engine(bindEngine), lastScopeObject(0), lastContext(0), lastData(0), lastPropertyIndex(-1) { } @@ -223,7 +223,7 @@ QDeclarativeContextScriptClass::queryProperty(QDeclarativeContextData *bindConte return 0; } -QDeclarativeContextScriptClass::ScriptValue +QDeclarativeContextScriptClass::Value QDeclarativeContextScriptClass::property(Object *object, const Identifier &name) { Q_UNUSED(object); |