mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

android: update Subsurface-mobile manifest for Qt 5.15

Browse source 
With the switch to the bundle build (introduced at Qt 5.14) a couple of the
settings in the manifest had to change.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-11-18 20:38:46 +00:00
parent 480cdca0e9
commit fd88058060
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
android-mobile/AndroidManifest.xml
View file

@ -2,17 +2,18 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.subsurfacedivelog.mobile" package="org.subsurfacedivelog.mobile"
android:installLocation="auto" android:installLocation="auto"
android:versionCode="@BUILD_NR@" android:versionCode="-- %%INSERT_VERSION_CODE%% --"
android:versionName="@SUBSURFACE_MOBILE_VERSION@" > android:versionName="-- %%INSERT_VERSION_NAME%% --" >
<application <application
android:name="org.qtproject.qt5.android.bindings.QtApplication" android:name="org.qtproject.qt5.android.bindings.QtApplication"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
android:label="@string/app_name" android:label="@string/app_name"
android:extractNativeLibs="true"
android:icon="@drawable/subsurface_mobile_icon" > android:icon="@drawable/subsurface_mobile_icon" >
<activity <activity
android:name="org.subsurfacedivelog.mobile.SubsurfaceMobileActivity" android:name="org.subsurfacedivelog.mobile.SubsurfaceMobileActivity"
android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
android:launchMode="singleTop" android:launchMode="singleTop"
@ -43,12 +44,6 @@
<meta-data <meta-data
android:name="android.app.bundle_local_qt_libs" android:name="android.app.bundle_local_qt_libs"
android:value="-- %%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" />
<!-- Run with local libs --> <!-- Run with local libs -->
<meta-data <meta-data
android:name="android.app.use_local_qt_libs" android:name="android.app.use_local_qt_libs"
@ -56,9 +51,9 @@
<meta-data <meta-data
android:name="android.app.libs_prefix" android:name="android.app.libs_prefix"
android:value="/data/local/tmp/qt/" /> android:value="/data/local/tmp/qt/" />
<meta-data <meta-data
android:name="android.app.load_local_libs" android:name="android.app.load_local_libs_resource_id"
android:value="-- %%INSERT_LOCAL_LIBS%% --" /> android:resource="@array/load_local_libs"/>
<meta-data <meta-data
android:name="android.app.load_local_jars" android:name="android.app.load_local_jars"
android:value="-- %%INSERT_LOCAL_JARS%% --" /> android:value="-- %%INSERT_LOCAL_JARS%% --" />