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 /tests/auto/shared | |
| 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 'tests/auto/shared')
| -rw-r--r-- | tests/auto/shared/platforminputcontext.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/shared/platforminputcontext.h b/tests/auto/shared/platforminputcontext.h index 4c73544391..e77cbf34a1 100644 --- a/tests/auto/shared/platforminputcontext.h +++ b/tests/auto/shared/platforminputcontext.h @@ -40,13 +40,13 @@ ****************************************************************************/ #include <qplatforminputcontext_qpa.h> -#include <QtGui/QInputPanel> +#include <QtGui/QInputMethod> class PlatformInputContext : public QPlatformInputContext { public: PlatformInputContext() - : m_visible(false), m_action(QInputPanel::Click), m_cursorPosition(0), + : m_visible(false), m_action(QInputMethod::Click), m_cursorPosition(0), m_invokeActionCallCount(0), m_showInputPanelCallCount(0), m_hideInputPanelCallCount(0), m_updateCallCount(0), m_direction(Qt::LeftToRight) { @@ -66,7 +66,7 @@ public: { return m_visible; } - virtual void invokeAction(QInputPanel::Action action, int cursorPosition) + virtual void invokeAction(QInputMethod::Action action, int cursorPosition) { m_invokeActionCallCount++; m_action = action; @@ -106,7 +106,7 @@ public: } bool m_visible; - QInputPanel::Action m_action; + QInputMethod::Action m_action; int m_cursorPosition; int m_invokeActionCallCount; int m_showInputPanelCallCount; |