diff options
| -rw-r--r-- | src/android/java/AndroidManifest.xml | 16 | ||||
| -rw-r--r-- | src/android/java/res/values/libs.xml | 1 | ||||
| -rw-r--r-- | src/android/java/res/values/strings.xml | 4 |
3 files changed, 8 insertions, 13 deletions
diff --git a/src/android/java/AndroidManifest.xml b/src/android/java/AndroidManifest.xml index 726801404a..937284fcd3 100644 --- a/src/android/java/AndroidManifest.xml +++ b/src/android/java/AndroidManifest.xml @@ -9,21 +9,21 @@ <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> </intent-filter> + <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/> <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/> - <meta-data android:value="@string/repository" android:name="android.app.repository"/> + <meta-data android:name="android.app.repository" android:value="default"/> <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/> <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/> - <meta-data android:value="@string/app_lib_name" android:name="android.app.lib_name"/> <!-- Deploy Qt libs as part of package --> - <meta-data android:value="1" android:name="android.app.bundle_local_qt_libs"/> + <meta-data android:name="android.app.bundle_local_qt_libs" android:value="1"/> <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/> <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/> <!-- Run with local libs --> - <meta-data android:value="1" android:name="android.app.use_local_qt_libs"/> - <meta-data android:value="/data/local/tmp/qt/" android:name="android.app.libs_prefix"/> - <meta-data android:value="@string/local_libs" android:name="android.app.load_local_libs"/> - <meta-data android:value="@string/local_jars" android:name="android.app.load_local_jars"/> - <meta-data android:value="@string/init_classes" android:name="android.app.static_init_classes"/> + <meta-data android:name="android.app.use_local_qt_libs" android:value="1"/> + <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/> + <meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/> + <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/> + <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/> <!-- Messages maps --> <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/> <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/> diff --git a/src/android/java/res/values/libs.xml b/src/android/java/res/values/libs.xml index c8e2fb9661..231406d224 100644 --- a/src/android/java/res/values/libs.xml +++ b/src/android/java/res/values/libs.xml @@ -3,7 +3,6 @@ <array name="qt_sources"> <item>https://download.qt-project.org/ministro/android/qt5/latest</item> </array> - <string name="repository">default</string> <!-- The following is handled automatically by the deployment tool. It should not be edited manually. --> diff --git a/src/android/java/res/values/strings.xml b/src/android/java/res/values/strings.xml index 0b92c5542e..300f0673a4 100644 --- a/src/android/java/res/values/strings.xml +++ b/src/android/java/res/values/strings.xml @@ -1,10 +1,6 @@ <?xml version='1.0' encoding='utf-8'?> <resources> <string name="app_name"><!-- %%INSERT_APP_NAME%% --></string> - <string name="app_lib_name"><!-- %%INSERT_APP_LIB_NAME%% --></string> - <string name="local_libs"><!-- %%INSERT_LOCAL_LIBS%% --></string> - <string name="local_jars"><!-- %%INSERT_LOCAL_JARS%% --></string> - <string name="init_classes"><!-- %%INSERT_INIT_CLASSES%% --></string> <string name="ministro_not_found_msg">Can\'t find Ministro service.\nThe application can\'t start.</string> <string name="ministro_needed_msg">This application requires Ministro service. Would you like to install it?</string> |