diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2012-03-09 09:16:50 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-15 01:33:24 +0100 |
commit | 5ae8caba10a79c2298939aff777a0201959a94af (patch) | |
tree | 2477ed24cb6d0c0309f662f1a63d26b4619df4ce /src/qml/qml/qqmlcomponent.cpp | |
parent | b06108350b1390b51886474628e03e2e84640548 (diff) |
Remove binding dependency on QQmlExpression
This is the first step to creating much lighter weight bindings that
are tuned for the specific scenario in which they're used.
Change-Id: Ib985dcff25679b711b5c634bbc891aa7902bf405
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
-rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 79100c4394..a73fe7cd63 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -50,13 +50,13 @@ #include "qqml.h" #include "qqmlengine.h" #include "qqmlbinding_p.h" -#include "qqmlbinding_p_p.h" #include "qqmlglobal_p.h" #include "qqmlscript_p.h" #include <private/qqmlprofilerservice_p.h> #include <private/qqmlenginedebugservice_p.h> #include "qqmlincubator.h" #include "qqmlincubator_p.h" +#include <private/qqmljavascriptexpression_p.h> #include <private/qv8engine_p.h> #include <private/qv8include_p.h> @@ -1337,9 +1337,8 @@ void QV8IncubatorResource::statusChanged(Status s) f->Call(me, 1, args); if (tc.HasCaught()) { QQmlError error; - QQmlExpressionPrivate::exceptionToError(tc.Message(), error); - QQmlEnginePrivate::warning(QQmlEnginePrivate::get(engine->engine()), - error); + QQmlJavaScriptExpression::exceptionToError(tc.Message(), error); + QQmlEnginePrivate::warning(QQmlEnginePrivate::get(engine->engine()), error); } } } |