diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-16 09:38:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-16 09:45:16 +0100 |
| commit | 9bfe3ab71e5291445e66be96d6cd1f63934a2d83 (patch) | |
| tree | a3b5580d8788de658f39d5bdb23d84a447999bee /src/plugins/platforms/android/androidjniinput.cpp | |
| parent | 28dffdecdad4f3458b9aacec1a04803c7b5483a1 (diff) | |
| parent | 179045f36a16ce2f6cfaad1dbd9443b52b1bf8d3 (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Conflicts:
doc/global/qt-cpp-defines.qdocconf
src/plugins/platforms/android/qandroidplatformopenglcontext.h
src/plugins/platforms/android/qandroidplatformtheme.h
Change-Id: I13d51cc66f708138ff4d667ceea7d515992e58a4
Diffstat (limited to 'src/plugins/platforms/android/androidjniinput.cpp')
| -rw-r--r-- | src/plugins/platforms/android/androidjniinput.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/androidjniinput.cpp b/src/plugins/platforms/android/androidjniinput.cpp index 5f05ab395e..d3bb089aa4 100644 --- a/src/plugins/platforms/android/androidjniinput.cpp +++ b/src/plugins/platforms/android/androidjniinput.cpp @@ -810,7 +810,7 @@ namespace QtAndroidInput #endif QAndroidInputContext *inputContext = QAndroidInputContext::androidInputContext(); if (inputContext && qGuiApp) - QMetaObject::invokeMethod(inputContext, "handleLocationChanged", + QMetaObject::invokeMethod(inputContext, "handleLocationChanged", Qt::BlockingQueuedConnection, Q_ARG(int, id), Q_ARG(int, x), Q_ARG(int, y)); } |