diff options
Diffstat (limited to 'src/android')
-rw-r--r-- | src/android/templates/AndroidManifest.xml | 44 | ||||
-rw-r--r-- | src/android/templates/res/values/libs.xml | 2 |
2 files changed, 2 insertions, 44 deletions
diff --git a/src/android/templates/AndroidManifest.xml b/src/android/templates/AndroidManifest.xml index 808cc82ae9..066ec0a63c 100644 --- a/src/android/templates/AndroidManifest.xml +++ b/src/android/templates/AndroidManifest.xml @@ -63,50 +63,8 @@ <!-- extract android style --> </activity> - <!--service android:process=":qt" android:name="org.qtproject.qt5.android.bindings.QtService"--> - <!-- android:process=":qt" is needed to force the service to run on a separate process than the Activity --> + <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices --> - <!-- Application arguments --> - <!-- meta-data android:name="android.app.arguments" android:value="-service"/ --> - <!-- Application arguments --> - <!-- If you're using the same application (.so file) for activity and also for service, then you - need to use *android.app.arguments* to pass some arguments to your service in order to know which - one is which - --> - - <!-- Ministro --> - <!-- 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: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"/ --> - <!-- Ministro --> - - <!-- Deploy Qt libs as part of package --> - <!-- meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/> - <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"/ --> - <!-- Deploy Qt libs as part of package --> - - <!-- Run with local libs --> - <!-- meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/> - <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%% --"/ --> - <!-- Run with local libs --> - - <!-- 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"/> - <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/ --> - <!-- Messages maps --> - - - <!-- Background running --> - <!-- meta-data android:name="android.app.background_running" android:value="true"/ --> - <!-- Background running --> - <!--/service --> </application> <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16"/> diff --git a/src/android/templates/res/values/libs.xml b/src/android/templates/res/values/libs.xml index ee3f5e940e..43296f2e7a 100644 --- a/src/android/templates/res/values/libs.xml +++ b/src/android/templates/res/values/libs.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='utf-8'?> <resources> <array name="qt_sources"> - <item>https://download.qt.io/ministro/android/qt5/qt-5.6</item> + <item>https://download.qt.io/ministro/android/qt5/qt-5.7</item> </array> <!-- The following is handled automatically by the deployment tool. It should |