summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android/qandroidinputcontext.h
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@digia.com>2014-10-13 13:09:06 +0200
committerPaul Olav Tvete <paul.tvete@digia.com>2014-10-20 10:23:41 +0200
commit1faba97683ec42155acd7ed51d14f65bb240bc75 (patch)
tree2177c5d2c0272f426f59d2f947a90b242172ffb0 /src/plugins/platforms/android/qandroidinputcontext.h
parent096d0ef02b344a62f4dceea55e05d975b023b859 (diff)
Delay showing keyboard until application is active
Android starts asking lots of questions when the software keyboard pops up, so let's wait until the application is initialized. This works around a deadlock on startup. Task-number: QTBUG-41369 Change-Id: I1c79e32d08c7cc11748ec55efbff3bc25e40f4b2 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/plugins/platforms/android/qandroidinputcontext.h')
-rw-r--r--src/plugins/platforms/android/qandroidinputcontext.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/qandroidinputcontext.h b/src/plugins/platforms/android/qandroidinputcontext.h
index 670a051139..2ebb155d2a 100644
--- a/src/plugins/platforms/android/qandroidinputcontext.h
+++ b/src/plugins/platforms/android/qandroidinputcontext.h
@@ -112,6 +112,9 @@ public:
public slots:
void updateCursorPosition();
+private slots:
+ void showInputPanelLater(Qt::ApplicationState);
+
private:
void sendInputMethodEventThreadSafe(QInputMethodEvent *event);
Q_INVOKABLE void sendInputMethodEventUnsafe(QInputMethodEvent *event);