diff --git a/LedDisplayController/LedDisplayController.pro b/LedDisplayController/LedDisplayController.pro index 492ae1a..1f6144e 100644 --- a/LedDisplayController/LedDisplayController.pro +++ b/LedDisplayController/LedDisplayController.pro @@ -2,7 +2,7 @@ QT += gui quick bluetooth quickcontrols2 CONFIG += c++11 TARGET = ItsblueLedDisplayController -VERSION = 1.0.0 +VERSION = 1.2.0 TEMPLATE = app @@ -54,6 +54,20 @@ android { QT += androidextras ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android 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 diff --git a/LedDisplayController/android/AndroidManifest.xml b/LedDisplayController/android/AndroidManifest.xml index 2b130af..132a9e5 100644 --- a/LedDisplayController/android/AndroidManifest.xml +++ b/LedDisplayController/android/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/LedDisplayController/android/build.gradle b/LedDisplayController/android/build.gradle index 8039fc4..d5b3b93 100644 --- a/LedDisplayController/android/build.gradle +++ b/LedDisplayController/android/build.gradle @@ -63,7 +63,6 @@ android { defaultConfig { resConfig "en" minSdkVersion = qtMinSdkVersion - targetSdkVersion = 29 - //qtTargetSdkVersion + targetSdkVersion = qtTargetSdkVersion } }