diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-05 14:22:45 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-05 14:22:45 +0200 |
| commit | f2856875843efce9a00e90dad05bde358ab82197 (patch) | |
| tree | 93346c38504ce04f0bf02dfe4a21299feb1be8ed /src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java | |
| parent | a7b04275082d065f392e7f18c54ea9b41507ae40 (diff) | |
| parent | a2970719c26c946fd6fea7d902aad6706a4ca6ea (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
examples/corelib/ipc/ipc.pro
src/plugins/platforms/xcb/qxcbbackingstore.cpp
tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf
Diffstat (limited to 'src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java')
| -rw-r--r-- | src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java index 678420dae7..ba16673479 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java +++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java @@ -399,7 +399,7 @@ public class QtActivity extends Activity @Override public boolean onKeyUp(int keyCode, KeyEvent event) { - if (QtApplication.m_delegateObject != null && QtApplication.onKeyDown != null) + if (QtApplication.m_delegateObject != null && QtApplication.onKeyUp != null) return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.onKeyUp, keyCode, event); else return super.onKeyUp(keyCode, event); |