itsblue-development/LedDisplay
itsblue-development/LedDisplay
2
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Chore: New android version

Browse source
This commit is contained in:
Dorian Zedler 2022-08-02 22:23:26 +02:00
parent bd9bfe858e
commit 2eaef1cb27
Signed by: dorian
GPG key ID: 989DE36109AFA354
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
LedDisplayController/LedDisplayController.pro
View file

@ -2,7 +2,7 @@ QT += gui quick bluetooth quickcontrols2
CONFIG += c++11 CONFIG += c++11
TARGET = ItsblueLedDisplayController TARGET = ItsblueLedDisplayController
VERSION = 1.0.0 VERSION = 1.2.0
TEMPLATE = app TEMPLATE = app
@ -54,6 +54,20 @@ android {
QT += androidextras QT += androidextras
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
ANDROID_ABIS = "armeabi-v7a arm64-v8a" ANDROID_ABIS = "armeabi-v7a arm64-v8a"
defineReplace(droidVersionCode) {
segments = $$split(1, ".")
for (segment, segments): vCode = "$$first(vCode)$$format_number($$segment, width=3 zeropad)"
contains(ANDROID_TARGET_ARCH, arm64-v8a): \
suffix = 1
else:contains(ANDROID_TARGET_ARCH, armeabi-v7a): \
suffix = 0
# add more cases as needed
return($$first(vCode)$$first(suffix))
}
ANDROID_VERSION_NAME = $$VERSION
ANDROID_VERSION_CODE = $$droidVersionCode($$ANDROID_VERSION_NAME)
ANDROID_TARGET_SDK_VERSION = 30
} }
ANDROID_ABIS = armeabi-v7a arm64-v8a ANDROID_ABIS = armeabi-v7a arm64-v8a

2
LedDisplayController/android/AndroidManifest.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<manifest package="de.itsblue.LedDisplayController" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.1" android:versionCode="4" android:installLocation="auto"> <manifest package="de.itsblue.LedDisplayController" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto">
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application. <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
Remove the comment if you do not require these default permissions. --> Remove the comment if you do not require these default permissions. -->
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>

3
LedDisplayController/android/build.gradle
View file

@ -63,7 +63,6 @@ android {
defaultConfig { defaultConfig {
resConfig "en" resConfig "en"
minSdkVersion = qtMinSdkVersion minSdkVersion = qtMinSdkVersion
targetSdkVersion = 29 targetSdkVersion = qtTargetSdkVersion
//qtTargetSdkVersion
} }
} }