diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-01-03 17:57:14 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-03 17:05:35 +0100 |
| commit | a9b103d02831a03e8f3815af2b7d043c5cf4eae6 (patch) | |
| tree | cf020d2df748d802a96ac74f13fc1fb9397e1156 /tests/auto/qtquick2/qquicktextinput | |
| parent | f9a574aee1afefaa890d5b715605e416e24dc692 (diff) | |
Combined platform input contexts in tests into one shared
Change-Id: Ie56f5f8ca5617db6be92d256d455cae585cd6a71
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Diffstat (limited to 'tests/auto/qtquick2/qquicktextinput')
| -rw-r--r-- | tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp index 10220a6429..3319936616 100644 --- a/tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp +++ b/tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp @@ -56,14 +56,13 @@ #include <QStyle> #include <QtOpenGL/QGLShaderProgram> #include <math.h> -#include <qplatforminputcontext_qpa.h> -#include <private/qinputpanel_p.h> #ifdef Q_OS_MAC #include <Carbon/Carbon.h> #endif #include "qplatformdefs.h" +#include "../../shared/platforminputcontext.h" Q_DECLARE_METATYPE(QQuickTextInput::SelectionMode) DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD) @@ -2294,39 +2293,6 @@ void tst_qquicktextinput::simulateKey(QQuickView *view, int key) QGuiApplication::sendEvent(view, &release); } -class PlatformInputContext : public QPlatformInputContext -{ -public: - PlatformInputContext() - : m_visible(false), m_action(QInputPanel::Click), m_cursorPosition(0), - m_invokeActionCallCount(0) - { - } - - virtual void showInputPanel() - { - m_visible = true; - } - virtual void hideInputPanel() - { - m_visible = false; - } - virtual bool isInputPanelVisible() const - { - return m_visible; - } - virtual void invokeAction(QInputPanel::Action action, int cursorPosition) - { - m_invokeActionCallCount++; - m_action = action; - m_cursorPosition = cursorPosition; - } - - bool m_visible; - QInputPanel::Action m_action; - int m_cursorPosition; - int m_invokeActionCallCount; -}; void tst_qquicktextinput::openInputPanel() { |