Bump qt-android-cmake version

sisco0 · Oct 25, 2020 · 437f59c · 437f59c
1 parent badfcbb
commit 437f59c
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 # Grabber
 *.qm
-src/dist/android/AndroidManifest.xml
 src/e2e/viewer/result.json
 src/sites/helper.js
 src/sites/*/model.js

diff --git a/src/cmake/qt-android-cmake b/src/cmake/qt-android-cmake
diff --git a/src/dist/android/AndroidManifest.xml.in b/src/dist/android/AndroidManifest.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<manifest android:versionName="@ANDROID_APP_VERSION_NAME@" package="@ANDROID_APP_PACKAGE_NAME@" android:installLocation="auto" xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="@ANDROID_APP_VERSION_CODE@">
-	<application android:label="@ANDROID_APP_NAME@" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:icon="@drawable/icon">
-		<activity android:label="@ANDROID_APP_NAME@" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:screenOrientation="unspecified" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation">
+<manifest android:versionName="@QT_ANDROID_APP_VERSION@" package="@QT_ANDROID_APP_PACKAGE_NAME@" android:installLocation="auto" xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="@QT_ANDROID_APP_VERSION_CODE@">
+	<application android:label="@QT_ANDROID_APP_NAME@" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:icon="@drawable/icon">
+		<activity android:label="@QT_ANDROID_APP_NAME@" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:screenOrientation="unspecified" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"> <!-- layoutDirection -->
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
@@ -15,22 +15,40 @@
 
 			<!-- 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"/>
+			<meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/> <!-- QT <= 5.13 -->
+			<meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/> <!-- QT <= 5.13 -->
 
 			<!-- 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_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/> <!-- QT <= 5.13 -->
+			<!--<meta-data android:name="android.app.load_local_libs_resource_id" android:resource="@array/load_local_libs"/>--> <!-- QT >= 5.14 -->
 			<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"/>
+			<meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
+			<meta-data android:value="@string/unsupported_android_version" android:name="android.app.unsupported_android_version"/>
+
+			<!-- Background running -->
+			<meta-data android:name="android.app.background_running" android:value="false"/>
+
+			<!-- Auto screen scale factor -->
+			<meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
+
+			<!-- Extract android style -->
+			<meta-data android:name="android.app.extract_android_style" android:value="default"/>
 		</activity>
 	</application>
 
 	<supports-screens android:anyDensity="true" android:normalScreens="true" android:smallScreens="true" android:largeScreens="true"/>
-	<uses-sdk android:minSdkVersion="18" android:targetSdkVersion="29"/>
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
 
 	<!-- Permissions -->
-	<uses-permission android:name="android.permission.INTERNET"/>
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<!-- %%INSERT_PERMISSIONS -->
+
+	<!-- Features -->
+	<!-- %%INSERT_FEATURES -->
 </manifest>
diff --git a/src/gui-qml/CMakeLists.txt b/src/gui-qml/CMakeLists.txt
@@ -59,10 +59,15 @@ if(ANDROID)
 		COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_BINARY_DIR}/languages/" "${ANDROID_PACKAGE_SOURCES}/assets/languages"
 	)
 
-	# Generate manifest file
-	configure_file("${CMAKE_CURRENT_LIST_DIR}/../dist/android/AndroidManifest.xml.in" "${CMAKE_CURRENT_LIST_DIR}/../dist/android/AndroidManifest.xml" @ONLY)
-
+	# Add target
 	include("qt-android-cmake/AddQtAndroidApk")
-	add_qt_android_apk("${PROJECT_NAME}_apk" ${PROJECT_NAME} BUILDTOOLS_REVISION "28.0.3" DEPENDS ${ANDROID_EXTRA_LIBS} PACKAGE_SOURCES ${ANDROID_PACKAGE_SOURCES})
+	add_qt_android_apk("${PROJECT_NAME}_apk" ${PROJECT_NAME}
+		NAME ${ANDROID_APP_NAME}
+		VERSION_CODE ${ANDROID_APP_VERSION_CODE}
+		PACKAGE_NAME ${ANDROID_APP_PACKAGE_NAME}
+		PACKAGE_SOURCES ${ANDROID_PACKAGE_SOURCES}
+		# KEYSTORE key.keystore alias
+		# KEYSTORE_PASSWORD *****
+		DEPENDS ${ANDROID_EXTRA_LIBS})
 	add_dependencies("${PROJECT_NAME}_apk" android_copy_assets_qml)
 endif()
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -153,12 +153,17 @@ if(ANDROID)
         COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_BINARY_DIR}/../languages/" "${ANDROID_PACKAGE_SOURCES}/assets/languages"
 	)
 
-	# Generate manifest file
-	configure_file("${CMAKE_CURRENT_LIST_DIR}/../dist/android/AndroidManifest.xml.in" "${CMAKE_CURRENT_LIST_DIR}/../dist/android/AndroidManifest.xml" @ONLY)
-
+	# Add target
 	include("qt-android-cmake/AddQtAndroidApk")
-	add_qt_android_apk("${PROJECT_NAME}_apk" ${PROJECT_NAME} BUILDTOOLS_REVISION "28.0.3" DEPENDS ${ANDROID_EXTRA_LIBS} PACKAGE_SOURCES ${ANDROID_PACKAGE_SOURCES})
-	add_dependencies("${PROJECT_NAME}_apk" android_copy_assets)
+	add_qt_android_apk("${PROJECT_NAME}_apk" ${PROJECT_NAME}
+		NAME ${ANDROID_APP_NAME}
+		VERSION_CODE ${ANDROID_APP_VERSION_CODE}
+		PACKAGE_NAME ${ANDROID_APP_PACKAGE_NAME}
+		PACKAGE_SOURCES ${ANDROID_PACKAGE_SOURCES}
+		# KEYSTORE key.keystore alias
+		# KEYSTORE_PASSWORD *****
+		DEPENDS ${ANDROID_EXTRA_LIBS})
+	add_dependencies("${PROJECT_NAME}_apk" android_copy_assets_qml)
 else()
 	set_target_properties(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/gui/$<0:>" OUTPUT_NAME "Grabber")
 	install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+37 −14		AddQtAndroidApk.cmake
+13 −4		AndroidManifest.xml.in
+7 −2		build.gradle.in
+4 −1		qtdeploy.json.in