diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-03-24 20:37:33 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-03-24 20:37:33 +0100 |
| commit | 487844fc62bdf048224d6fc3b7eaae6347d4457b (patch) | |
| tree | 763dc03ad77fd5b43ef74e817423540caa015e4b /src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java | |
| parent | 4ed048dded34dbe2ce2842f0d40d9f54cd7571b0 (diff) | |
| parent | 6cacd19db56b632964c3b2453bc273dac50446c9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I13c7ea6a74eb98606cf45702ae068101943bec6a
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); |