diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-09 13:03:17 +1000 |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-09 13:03:17 +1000 |
| commit | 4d2e0cebec26b7adcfdad4c4997f7ec22dd72cb8 (patch) | |
| tree | 9a90717fa665daea02a164fe1e10b35d3bc82df8 | |
| parent | a961acbdb1d0873065be15bf15bc8d20a5954029 (diff) | |
Remove QtScript code from QDeclarativeExpression
| -rw-r--r-- | src/declarative/qml/qdeclarativeexpression.cpp | 9 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeexpression_p.h | 4 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp index 0438d23f52..517d4fcc00 100644 --- a/src/declarative/qml/qdeclarativeexpression.cpp +++ b/src/declarative/qml/qdeclarativeexpression.cpp @@ -48,9 +48,6 @@ #include "private/qdeclarativecompiler_p.h" #include <QtCore/qdebug.h> -#include <QtScript/qscriptprogram.h> - -#include <private/qscriptdeclarativeclass_p.h> QT_BEGIN_NAMESPACE @@ -382,12 +379,6 @@ void QDeclarativeExpressionPrivate::exceptionToError(v8::Handle<v8::Message> mes error.setDescription(qDescription); } -void QDeclarativeExpressionPrivate::exceptionToError(QScriptEngine *scriptEngine, - QDeclarativeError &error) -{ - qFatal("Not implemented - we use v8 now"); -} - bool QDeclarativeQtScriptExpression::notifyOnValueChange() const { return trackChange; diff --git a/src/declarative/qml/qdeclarativeexpression_p.h b/src/declarative/qml/qdeclarativeexpression_p.h index c87b6b4111..c183cf2f0b 100644 --- a/src/declarative/qml/qdeclarativeexpression_p.h +++ b/src/declarative/qml/qdeclarativeexpression_p.h @@ -58,8 +58,6 @@ #include "private/qdeclarativeengine_p.h" #include "private/qdeclarativeguard_p.h" -#include <QtScript/qscriptvalue.h> - #include <private/qv8engine_p.h> QT_BEGIN_NAMESPACE @@ -129,7 +127,6 @@ public: v8::Persistent<v8::Function> v8function; v8::Persistent<v8::Object> v8qmlscope; - QScriptValue expressionContext; // Only used in ExplicitContext QObject *scopeObject; // Only used in SharedContext bool notifyOnValueChange() const; @@ -200,7 +197,6 @@ public: void _q_notify(); virtual void emitValueChanged(); - static void exceptionToError(QScriptEngine *, QDeclarativeError &); static void exceptionToError(v8::Handle<v8::Message>, QDeclarativeError &); static v8::Persistent<v8::Function> evalFunction(QDeclarativeContextData *ctxt, QObject *scope, const QString &code, const QString &filename, int line, |