diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-15 07:11:41 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-15 07:11:41 +0200 |
| commit | c0359bd3c3a098ace9d2fa7ee91c33b24a8d9477 (patch) | |
| tree | 9bcae3bff2ccef2b020c7a9ef25b3643e9ae556f /src/plugins/platforms/android | |
| parent | 68eea0196ebf30617e7d837ac5f61aaeeb814692 (diff) | |
| parent | 1e5deb06416b6efc33a2009d9678fd8f743c5ce7 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/global/qfloat16.cpp
src/corelib/global/qfloat16.h
src/plugins/platforms/windows/qwindowswindow.cpp
Change-Id: I0938aaa6a9771f55e48c95ed29f6f5291431b947
Diffstat (limited to 'src/plugins/platforms/android')
| -rw-r--r-- | src/plugins/platforms/android/qandroidinputcontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp index 00ab3409d3..07a6b52dbe 100644 --- a/src/plugins/platforms/android/qandroidinputcontext.cpp +++ b/src/plugins/platforms/android/qandroidinputcontext.cpp @@ -791,7 +791,7 @@ void QAndroidInputContext::longPress(int x, int y) return; } QList<QInputMethodEvent::Attribute> imAttributes; - imAttributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, cursor, 0, QVariant())); + imAttributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, 0, 0, QVariant())); imAttributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::Selection, anchor, cursor - anchor, QVariant())); QInputMethodEvent event(QString(), imAttributes); QGuiApplication::sendEvent(m_focusObject, &event); |