diff --git a/src/android/java/AndroidManifest.xml b/src/android/java/AndroidManifest.xml
index 7a77d6fd83..334e0f7648 100644
--- a/src/android/java/AndroidManifest.xml
+++ b/src/android/java/AndroidManifest.xml
@@ -9,6 +9,12 @@
+
+
+
+
+
+
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 c3d82bca8d..4b01d29143 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
@@ -304,23 +304,22 @@ public class QtActivity extends Activity
m_qtLibs = getResources().getStringArray(resourceId);
}
- if (getIntent().getExtras()!= null
- && getIntent().getExtras().containsKey("use_local_qt_libs")
- && getIntent().getExtras().getString("use_local_qt_libs").equals("true")) {
- ArrayList libraryList= new ArrayList();
+ if (ai.metaData.containsKey("android.app.use_local_qt_libs")
+ && ai.metaData.getInt("android.app.use_local_qt_libs") == 1) {
+ ArrayList libraryList = new ArrayList();
- String localPrefix="/data/local/tmp/qt/";
- if (getIntent().getExtras().containsKey("libs_prefix"))
- localPrefix=getIntent().getExtras().getString("libs_prefix");
+ String localPrefix = "/data/local/tmp/qt/";
+ if (ai.metaData.containsKey("android.app.libs_prefix"))
+ localPrefix = ai.metaData.getString("android.app.libs_prefix");
if (m_qtLibs != null) {
for (int i=0;i 0)
libraryList.add(localPrefix + lib);
}
@@ -328,8 +327,8 @@ public class QtActivity extends Activity
String dexPaths = new String();
String pathSeparator = System.getProperty("path.separator", ":");
- if (getIntent().getExtras().containsKey("load_local_jars")) {
- String[] jarFiles = getIntent().getExtras().getString("load_local_jars").split(":");
+ if (ai.metaData.containsKey("android.app.load_local_jars")) {
+ String[] jarFiles = ai.metaData.getString("android.app.load_local_jars").split(":");
for (String jar:jarFiles) {
if (jar.length() > 0) {
if (dexPaths.length() > 0)
@@ -342,12 +341,10 @@ public class QtActivity extends Activity
Bundle loaderParams = new Bundle();
loaderParams.putInt(ERROR_CODE_KEY, 0);
loaderParams.putString(DEX_PATH_KEY, dexPaths);
- loaderParams.putString(LOADER_CLASS_NAME_KEY, getIntent().getExtras().containsKey("loader_class_name")
- ? getIntent().getExtras().getString("loader_class_name")
- : "org.qtproject.qt5.android.QtActivityDelegate");
- if (getIntent().getExtras().containsKey("static_init_classes")) {
+ loaderParams.putString(LOADER_CLASS_NAME_KEY, "org.qtproject.qt5.android.QtActivityDelegate");
+ if (ai.metaData.containsKey("android.app.static_init_classes")) {
loaderParams.putStringArray(STATIC_INIT_CLASSES_KEY,
- getIntent().getExtras().getString("static_init_classes").split(":"));
+ ai.metaData.getString("android.app.static_init_classes").split(":"));
}
loaderParams.putStringArrayList(NATIVE_LIBRARIES_KEY, libraryList);
loaderParams.putString(ENVIRONMENT_VARIABLES_KEY, ENVIRONMENT_VARIABLES