diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 15:59:32 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 15:59:34 +0100 |
| commit | 777cdb00e704b987ad19bf842088a754cf7e6525 (patch) | |
| tree | b8f2356d68e293c591c9be86113ed46478867e0b /src/android/jar/src/org/qtproject | |
| parent | dc9e32caeda0278658befb8bb6e944986c021620 (diff) | |
| parent | af1dbfd2239c7834187f3a702fb2029dc78d4526 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ibb342cc5fc55ff9a3f4b3ecbd53936b57bc13e63
Diffstat (limited to 'src/android/jar/src/org/qtproject')
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java index 3dcffeb07d..3bcd6eaea3 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java @@ -858,10 +858,8 @@ public class QtActivityDelegate public void onContextMenuClosed(Menu menu) { - if (!m_contextMenuVisible) { - Log.e(QtNative.QtTAG, "invalid onContextMenuClosed call"); + if (!m_contextMenuVisible) return; - } m_contextMenuVisible = false; QtNative.onContextMenuClosed(menu); } |