diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-05 13:15:31 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-05 13:15:31 +0100 |
| commit | 954fe2c35d0b0435b7f0443d917a5145dfd0c2a4 (patch) | |
| tree | 13d2d5c76823fa2a3664f2a06219cd1fcc26f7a4 /src/android | |
| parent | 70057dfc0e53b7996acd5ef2c0f9c40aa3f66062 (diff) | |
| parent | 681933c5b8656543c4974a1db5fde093f2934189 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ifce6ddeb4dab8c672732ec6aa6c19a6c4bce447e
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java | 2 | ||||
| -rw-r--r-- | src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java | 1 |
2 files changed, 1 insertions, 2 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 2728988362..3348527b3c 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 @@ -132,7 +132,7 @@ public class QtActivity extends Activity } public boolean super_dispatchPopulateAccessibilityEvent(AccessibilityEvent event) { - return super_dispatchPopulateAccessibilityEvent(event); + return super.dispatchPopulateAccessibilityEvent(event); } //--------------------------------------------------------------------------- diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java index fb6f61e31e..424bf45c53 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java +++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java @@ -438,7 +438,6 @@ public abstract class QtLoader { { String key = BUNDLED_IN_LIB_RESOURCE_ID_KEY; - java.util.Set<String> keys = m_contextInfo.metaData.keySet(); if (m_contextInfo.metaData.containsKey(key)) { String[] list = m_context.getResources().getStringArray(m_contextInfo.metaData.getInt(key)); |