aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/inputcontext
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2011-08-11 16:03:12 +0200
committerGunnar Sletta <gunnar.sletta@nokia.com>2011-08-11 16:03:12 +0200
commitf9949f501890a7f8289fcbda85d3a4085bdbb21a (patch)
tree759e57bb3ed156e46a98c3a4223951c3edc55d43 /src/imports/inputcontext
parent1ddef09c351f2899b1662ddd1de190c0d0a8b7bf (diff)
parent3e0c19d5ba0e4826c3f036c3172d8ea0e30530a6 (diff)
Merge branch 'master' into refactor
Conflicts: src/declarative/declarative.pro src/imports/gestures/gestures.pro src/imports/inputcontext/inputcontext.pro src/qtquick1/graphicsitems/qdeclarativeitem.cpp src/qtquick1/qtquick1.pro Change-Id: I782be7090d8b6da9c890bc8e778722da93da8037
Diffstat (limited to 'src/imports/inputcontext')
-rwxr-xr-xsrc/imports/inputcontext/inputcontext.pro2
-rw-r--r--src/imports/inputcontext/plugin.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/inputcontext/inputcontext.pro b/src/imports/inputcontext/inputcontext.pro
index af0d840192..c8641d20e3 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 widgets
+QT += declarative widgets
SOURCES += \
declarativeinputcontext.cpp \
diff --git a/src/imports/inputcontext/plugin.cpp b/src/imports/inputcontext/plugin.cpp
index a33aa479ae..70fed2e241 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;
}