diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2011-07-29 10:25:44 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-29 13:00:52 +0200 |
| commit | d410ad364ec0b8877797145c68a4d7c3c98ce1c0 (patch) | |
| tree | 11862c21e5e465abe3275768918f82cbec2bc6e7 /src/imports/inputcontext | |
| parent | 43b783d09e0899165bbe964a175785ccdfedf6e5 (diff) | |
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>
Diffstat (limited to 'src/imports/inputcontext')
| -rwxr-xr-x | src/imports/inputcontext/inputcontext.pro | 2 | ||||
| -rw-r--r-- | src/imports/inputcontext/plugin.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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; } |