3 files changed, 52 insertions, 41 deletions
diff --git a/src/android/jar/.prev_CMakeLists.txt b/src/android/jar/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..f4c807c33a
--- /dev/null
+++ b/src/android/jar/.prev_CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from jar.pro.
+
+set(java_sources
+    src/org/qtproject/qt5/android//accessibility/QtAccessibilityDelegate.java
+    src/org/qtproject/qt5/android//accessibility/QtNativeAccessibility.java
+    src/org/qtproject/qt5/android//CursorHandle.java
+    src/org/qtproject/qt5/android//EditContextView.java
+    src/org/qtproject/qt5/android//EditPopupMenu.java
+    src/org/qtproject/qt5/android//ExtractStyle.java
+    src/org/qtproject/qt5/android//QtActivityDelegate.java
+    src/org/qtproject/qt5/android//QtEditText.java
+    src/org/qtproject/qt5/android//QtInputConnection.java
+    src/org/qtproject/qt5/android//QtLayout.java
+    src/org/qtproject/qt5/android//QtMessageDialogHelper.java
+    src/org/qtproject/qt5/android//QtNative.java
+    src/org/qtproject/qt5/android//QtNativeLibrariesDir.java
+    src/org/qtproject/qt5/android//QtSurface.java
+    src/org/qtproject/qt5/android//QtThread.java
+)
+
+add_jar(QtAndroid
+    INCLUDE_JARS ${QT_ANDROID_JAR}
+    SOURCES ${java_sources}
+)
+
+install_jar(QtAndroid
+    DESTINATION jar
+    COMPONENT Devel
+)
+
diff --git a/src/android/jar/CMakeLists.txt b/src/android/jar/CMakeLists.txt
index edd8b54352..61af168a67 100644
--- a/src/android/jar/CMakeLists.txt
+++ b/src/android/jar/CMakeLists.txt
@@ -1,33 +1,31 @@
-# QtAndroid Jar
-
-# special case skip regeneration
-# special case begin
-set(path_prefix ${CMAKE_CURRENT_SOURCE_DIR}/src/org/qtproject/qt5/android/)
+# Generated from jar.pro.
 
 set(java_sources
-    ${path_prefix}/accessibility/QtAccessibilityDelegate.java
-    ${path_prefix}/accessibility/QtNativeAccessibility.java
-    ${path_prefix}/CursorHandle.java
-    ${path_prefix}/EditContextView.java
-    ${path_prefix}/EditPopupMenu.java
-    ${path_prefix}/ExtractStyle.java
-    ${path_prefix}/QtActivityDelegate.java
-    ${path_prefix}/QtEditText.java
-    ${path_prefix}/QtInputConnection.java
-    ${path_prefix}/QtLayout.java
-    ${path_prefix}/QtMessageDialogHelper.java
-    ${path_prefix}/QtNative.java
-    ${path_prefix}/QtNativeLibrariesDir.java
-    ${path_prefix}/QtServiceDelegate.java
-    ${path_prefix}/QtSurface.java
-    ${path_prefix}/QtThread.java)
+    src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java
+    src/org/qtproject/qt5/android/accessibility/QtNativeAccessibility.java
+    src/org/qtproject/qt5/android/CursorHandle.java
+    src/org/qtproject/qt5/android/EditContextView.java
+    src/org/qtproject/qt5/android/EditPopupMenu.java
+    src/org/qtproject/qt5/android/ExtractStyle.java
+    src/org/qtproject/qt5/android/QtActivityDelegate.java
+    src/org/qtproject/qt5/android/QtEditText.java
+    src/org/qtproject/qt5/android/QtInputConnection.java
+    src/org/qtproject/qt5/android/QtLayout.java
+    src/org/qtproject/qt5/android/QtMessageDialogHelper.java
+    src/org/qtproject/qt5/android/QtNative.java
+    src/org/qtproject/qt5/android/QtNativeLibrariesDir.java
+    src/org/qtproject/qt5/android/QtSurface.java
+    src/org/qtproject/qt5/android/QtThread.java
+    src/org/qtproject/qt5/android/QtServiceDelegate.java # special case
+)
 
 add_jar(QtAndroid
     INCLUDE_JARS ${QT_ANDROID_JAR}
     SOURCES ${java_sources}
-    )
+)
 
 install_jar(QtAndroid
     DESTINATION jar
-    COMPONENT Devel)
-# special case end
+    COMPONENT Devel
+)
+
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java
index 6beb5e3161..fad9588425 100644
--- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java
@@ -132,23 +132,6 @@ public class QtActivityLoader extends QtLoader {
             return;
         }
 
-        if (Build.VERSION.SDK_INT < 21) {
-            // fatal error, show the error and quit
-            AlertDialog errorDialog = new AlertDialog.Builder(m_activity).create();
-            if (m_contextInfo.metaData.containsKey("android.app.unsupported_android_version"))
-                errorDialog.setMessage(m_contextInfo.metaData.getString("android.app.unsupported_android_version"));
-            else
-                errorDialog.setMessage("Unsupported Android version.");
-            errorDialog.setButton(m_activity.getResources().getString(android.R.string.ok), new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    finish();
-                }
-            });
-            errorDialog.show();
-            return;
-        }
-
         try {
             m_activity.setTheme(Class.forName("android.R$style").getDeclaredField(QT_ANDROID_DEFAULT_THEME).getInt(null));
         } catch (Exception e) {