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/quick/util | |
| 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/quick/util')
| -rw-r--r-- | src/quick/util/qdeclarativeutilmodule.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/quick/util/qdeclarativeutilmodule.cpp b/src/quick/util/qdeclarativeutilmodule.cpp index 1841a8c94f..02e4e9cf52 100644 --- a/src/quick/util/qdeclarativeutilmodule.cpp +++ b/src/quick/util/qdeclarativeutilmodule.cpp @@ -61,11 +61,14 @@ #include <private/qdeclarativetypenotavailable_p.h> #include <private/qdeclarativeanimationcontroller_p.h> #include <QtCore/qcoreapplication.h> -#include <QtGui/QInputPanel> +#include <QtGui/QInputMethod> void QDeclarativeUtilModule::defineModule() { - qmlRegisterUncreatableType<QInputPanel>("QtQuick",2,0,"InputPanel", QInputPanel::tr("InputPanel is an abstract class")); + qmlRegisterUncreatableType<QInputMethod>("QtQuick",2,0,"InputPanel", + QInputMethod::tr("InputPanel is an abstract class")); // deprecated + qmlRegisterUncreatableType<QInputMethod>("QtQuick",2,0,"InputMethod", + QInputMethod::tr("InputMethod is an abstract class")); qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("QtQuick",2,0,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class")); qmlRegisterType<QDeclarativeBehavior>("QtQuick",2,0,"Behavior"); |