3 files changed, 7 insertions, 7 deletions
diff --git a/src/declarative/items/context2d/qsgcontext2d.cpp b/src/declarative/items/context2d/qsgcontext2d.cpp
index 97234a6315..4cfe1ba012 100644
--- a/src/declarative/items/context2d/qsgcontext2d.cpp
+++ b/src/declarative/items/context2d/qsgcontext2d.cpp
@@ -3361,7 +3361,7 @@ void QSGContext2D::release()
     }
 }
 
-void QSGContext2D::processCommands(const QScriptValue& commands)
+void QSGContext2D::processCommands(const QJSValue& commands)
 {
 #ifdef QSGCANVASITEM_DEBUG
     QElapsedTimer t;
@@ -3369,7 +3369,7 @@ void QSGContext2D::processCommands(const QScriptValue& commands)
 #endif
     int ii = 0;
     if (commands.isArray()) {
-        QScriptValue cmd = commands.property(ii);
+        QJSValue cmd = commands.property(ii);
         while(cmd.isValid()) {
             processCommand(cmd);
             ii++;
@@ -3460,7 +3460,7 @@ bool QSGContext2D::event(QEvent *e)
     return QObject::event(e);
 }
 
-void QSGContext2D::processCommand(const QScriptValue& cmd)
+void QSGContext2D::processCommand(const QJSValue& cmd)
 {
     int action = cmd.property(0).toInt32();
     switch (action) {
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)
 };
diff --git a/src/declarative/items/qsgitem.cpp b/src/declarative/items/qsgitem.cpp
index 55d84a7fa5..043c568a82 100644
--- a/src/declarative/items/qsgitem.cpp
+++ b/src/declarative/items/qsgitem.cpp
@@ -42,7 +42,7 @@
 #include "qsgitem.h"
 
 #include "qsgcanvas.h"
-#include <QtScript/qscriptengine.h>
+#include <QtDeclarative/qjsengine.h>
 #include "qsgcanvas_p.h"
 #include "qsgevent.h"