diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-11-26 10:13:04 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-26 10:58:18 +0100 |
| commit | 939a001c3ac33ebf801d2594ac9073da28d09a46 (patch) | |
| tree | b967a87427d11c3905296d2c8bd7f3c0c6efd71a /src/android | |
| parent | e903b5cddaaa606300292ad2cf26c2b6ee111cdd (diff) | |
| download | qtbase-939a001c3ac33ebf801d2594ac9073da28d09a46.tar.gz | |
Android: Remove invalid error message
All usage of context menus prints out an error message because
onContextMenuClosed() is called more than once. We just return
silently instead if the method is called after the menu has
already been closed.
Change-Id: Ifa27ed42d188fdf670f09c4b1450b9fec0d5941f
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src/android')
| -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); } |