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>

6 files changed, 7 insertions, 9 deletions

diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro
index e55a5b2a29..31192fd764 100644
--- a/src/imports/folderlistmodel/folderlistmodel.pro
+++ b/src/imports/folderlistmodel/folderlistmodel.pro
@@ -2,7 +2,7 @@ TARGET  = qmlfolderlistmodelplugin
 TARGETPATH = Qt/labs/folderlistmodel
 include(../qimportbase.pri)
 
-QT += declarative script
+QT += declarative
 
 SOURCES += qdeclarativefolderlistmodel.cpp plugin.cpp
 HEADERS += qdeclarativefolderlistmodel.h
diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro
index 5c009dde51..d94b402f4c 100644
--- a/src/imports/gestures/gestures.pro
+++ b/src/imports/gestures/gestures.pro
@@ -2,7 +2,7 @@ TARGET  = qmlgesturesplugin
 TARGETPATH = Qt/labs/gestures
 include(../qimportbase.pri)
 
-QT += core-private gui-private declarative-private script-private qtquick1 qtquick1-private
+QT += core-private gui-private declarative-private qtquick1 qtquick1-private
 
 SOURCES += qdeclarativegesturearea.cpp plugin.cpp
 HEADERS += qdeclarativegesturearea_p.h
diff --git a/src/imports/inputcontext/inputcontext.pro b/src/imports/inputcontext/inputcontext.pro
index 9c7ddf4e8b..cbad82c5b1 100755
--- a/src/imports/inputcontext/inputcontext.pro
+++ b/src/imports/inputcontext/inputcontext.pro
@@ -2,7 +2,7 @@ TARGET  = qmlinputcontextplugin
 TARGETPATH = Qt/labs/inputcontext
 include(../qimportbase.pri)
 
-QT += declarative script
+QT += declarative
 
 SOURCES += \
         declarativeinputcontext.cpp \
diff --git a/src/imports/inputcontext/plugin.cpp b/src/imports/inputcontext/plugin.cpp
index 36de469f1f..5ce9e5b475 100644
--- a/src/imports/inputcontext/plugin.cpp
+++ b/src/imports/inputcontext/plugin.cpp
@@ -48,7 +48,7 @@
 
 QT_BEGIN_NAMESPACE
 
-static QObject *createContext(QDeclarativeEngine *, QScriptEngine *)
+static QObject *createContext(QDeclarativeEngine *, QJSEngine *)
 {
     return new InputContextModule;
 }
diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp
index 5781b3ddf1..db0a029a9a 100644
--- a/src/imports/testlib/main.cpp
+++ b/src/imports/testlib/main.cpp
@@ -41,10 +41,8 @@
 
 #include <QtDeclarative/qdeclarativeextensionplugin.h>
 #include <QtDeclarative/qdeclarative.h>
-#include <QtScript/qscriptvalue.h>
-#include <QtScript/qscriptcontext.h>
-#include <QtScript/qscriptcontextinfo.h>
-#include <QtScript/qscriptengine.h>
+#include <QtDeclarative/qjsvalue.h>
+#include <QtDeclarative/qjsengine.h>
 #include "QtQuickTest/private/quicktestresult_p.h"
 #include "QtQuickTest/private/quicktestevent_p.h"
 #include "private/qtestoptions_p.h"
diff --git a/src/imports/testlib/testlib.pro b/src/imports/testlib/testlib.pro
index 9980a7551f..5adde2ae85 100644
--- a/src/imports/testlib/testlib.pro
+++ b/src/imports/testlib/testlib.pro
@@ -21,7 +21,7 @@ symbian {
 
 }
 
-QT += declarative script qmltest qmltest-private declarative-private script-private core-private testlib
+QT += declarative qmltest qmltest-private declarative-private core-private testlib
 
 SOURCES += main.cpp
 HEADERS +=