diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2015-12-08 12:43:03 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2015-12-10 19:53:36 +0000 |
| commit | e3689949ba5b23decb0ea85741a3f4829696788e (patch) | |
| tree | 78033dfa511f5e1e3a13f9a1a0983aa2247755d2 /src/plugins/platforms | |
| parent | 53697fe0787608d83647cebeba4f809f81c4f06b (diff) | |
Android: Remove support for API < 16
Starting with Qt 5.7 we removed support for API < 16 (Android v4.1)
[ChangeLog][Android] Support for Android API < 16 was removed.
Change-Id: I8bf396a9d70ab0996965e0c9f629800aa1fa6a45
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/android/androidjniaccessibility.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/platforms/android/androidjnimenu.cpp | 9 |
2 files changed, 1 insertions, 15 deletions
diff --git a/src/plugins/platforms/android/androidjniaccessibility.cpp b/src/plugins/platforms/android/androidjniaccessibility.cpp index 69f8bdbad7..385ad3b672 100644 --- a/src/plugins/platforms/android/androidjniaccessibility.cpp +++ b/src/plugins/platforms/android/androidjniaccessibility.cpp @@ -68,10 +68,6 @@ namespace QtAndroidAccessibility void initialize() { - // API level > 16 is required. - if (QtAndroidPrivate::androidSdkVersion() < 16) - return; - QJNIObjectPrivate::callStaticMethod<void>(QtAndroid::applicationClass(), "initializeAccessibility"); } @@ -299,9 +295,6 @@ if (!clazz) { \ bool registerNatives(JNIEnv *env) { - if (QtAndroidPrivate::androidSdkVersion() < 16) - return true; // We need API level 16 or higher - jclass clazz; FIND_AND_CHECK_CLASS("org/qtproject/qt5/android/accessibility/QtNativeAccessibility"); jclass appClass = static_cast<jclass>(env->NewGlobalRef(clazz)); diff --git a/src/plugins/platforms/android/androidjnimenu.cpp b/src/plugins/platforms/android/androidjnimenu.cpp index 8018cef1dc..3f44a3c4b9 100644 --- a/src/plugins/platforms/android/androidjnimenu.cpp +++ b/src/plugins/platforms/android/androidjnimenu.cpp @@ -87,14 +87,7 @@ namespace QtAndroidMenu void showContextMenu(QAndroidPlatformMenu *menu, const QRect &anchorRect, JNIEnv *env) { QMutexLocker lock(&visibleMenuMutex); - if (QtAndroidPrivate::androidSdkVersion() > 10 && - QtAndroidPrivate::androidSdkVersion() < 14 && - anchorRect.isValid()) { - pendingContextMenus.clear(); - } else if (visibleMenu) { - pendingContextMenus.append(visibleMenu); - } - + pendingContextMenus.append(visibleMenu); visibleMenu = menu; menu->aboutToShow(); env->CallStaticVoidMethod(applicationClass(), openContextMenuMethodID, anchorRect.x(), anchorRect.y(), anchorRect.width(), anchorRect.height()); |