diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-02-03 10:07:51 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-10 09:54:58 +0100 |
| commit | e761f5b906c427433325debb9f08c4f2d0ba902d (patch) | |
| tree | fa8fbc933b6ed9ea2cdbc918d4317c95992c26e7 /src/declarative/qml/v8 | |
| parent | 9634dc440269fc03f825a6d18b371d8e612ba9ec (diff) | |
Use QInputMethod instead of deprecated QInputPanel
Similarly deprecate Qt.application.inputPanel and
introduce replacement Qt.inputMethod.
Change-Id: Ie4fd467f93f75023c86b0a2d038d858fe5001146
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Sami Kananoja <sami.kananoja@nokia.com>
Diffstat (limited to 'src/declarative/qml/v8')
| -rw-r--r-- | src/declarative/qml/v8/qv8engine.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/qml/v8/qv8engine_p.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/qml/v8/qv8engine.cpp b/src/declarative/qml/v8/qv8engine.cpp index 405e406c88..90137330b5 100644 --- a/src/declarative/qml/v8/qv8engine.cpp +++ b/src/declarative/qml/v8/qv8engine.cpp @@ -41,6 +41,8 @@ #include "qv8engine_p.h" +#include <QtGui/QGuiApplication> + #include "qv8contextwrapper_p.h" #include "qv8valuetypewrapper_p.h" #include "qv8sequencewrapper_p.h" @@ -575,6 +577,7 @@ void QV8Engine::initializeGlobal(v8::Handle<v8::Object> global) if (m_engine) { qt->Set(v8::String::New("application"), newQObject(new QDeclarativeApplication(m_engine))); + qt->Set(v8::String::New("inputMethod"), newQObject(qGuiApp->inputMethod(), CppOwnership)); qt->Set(v8::String::New("lighter"), V8FUNCTION(lighter, this)); qt->Set(v8::String::New("darker"), V8FUNCTION(darker, this)); qt->Set(v8::String::New("tint"), V8FUNCTION(tint, this)); diff --git a/src/declarative/qml/v8/qv8engine_p.h b/src/declarative/qml/v8/qv8engine_p.h index 7dcbba29d2..ca701090d8 100644 --- a/src/declarative/qml/v8/qv8engine_p.h +++ b/src/declarative/qml/v8/qv8engine_p.h @@ -253,7 +253,6 @@ public: QV8Engine(QJSEngine* qq,QJSEngine::ContextOwnership ownership = QJSEngine::CreateNewContext); virtual ~QV8Engine(); - // ### TODO get rid of it, do we really need CppOwnership? // This enum should be in sync with QDeclarativeEngine::ObjectOwnership enum ObjectOwnership { CppOwnership, JavaScriptOwnership }; |