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/qdeclarativeengine.cpp | |
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/qdeclarativeengine.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 9118ef4f14..73385fed59 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -297,7 +297,7 @@ of their use. \o This read-only property allows access to application's QInputPanel object and all its properties and slots. See the QInputPanel documentation for - further details. + further details. Deprecated in favor of Qt.InputMethod \endtable The following example uses the \c application object to indicate @@ -305,6 +305,12 @@ of their use. \snippet doc/src/snippets/declarative/application.qml document + \qmlproperty object Qt::inputMethod + \since QtQuick 2.0 + + The \c inputMethod object allows access to application's QInputMethod object + and all its properties and slots. See the QInputMethod documentation for + further details. */ |