Merge the QJSEngine and QJSValue development branch into master.

This replaces the dependency to QtScript with two new builtin classes
QJSValue and QJSEngine.

This is still work in progress, development continues now in the master branch.

Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de
Reviewed-on: http://codereview.qt.nokia.com/2299
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/declarative/items/context2d/qsgcontext2d_p.h b/src/declarative/items/context2d/qsgcontext2d_p.h
index 335d954fc1..f8fc9b75a2 100644
--- a/src/declarative/items/context2d/qsgcontext2d_p.h
+++ b/src/declarative/items/context2d/qsgcontext2d_p.h
@@ -55,7 +55,7 @@
 #include <QtCore/qmetatype.h>
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qvariant.h>
-#include <QtScript/qscriptvalue.h>
+#include <QtDeclarative/qjsvalue.h>
 #include <private/qv8engine_p.h>
 #include <QMutex>
 #include <QWaitCondition>
@@ -323,7 +323,7 @@ public slots:
 
     void paint(QPainter* painter);
     void sync();
-    void processCommands(const QScriptValue& commands);
+    void processCommands(const QJSValue& commands);
 signals:
     void changed();
     void painted();
@@ -385,7 +385,7 @@ protected:
     virtual bool event(QEvent *);
 
 private:
-    void processCommand(const QScriptValue& command);
+    void processCommand(const QJSValue& command);
 
     Q_DECLARE_PRIVATE(QSGContext2D)
 };