AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Add missing Android values in qdevice.pri

Browse Source 
These were introduced in
675805e9eb and
b9c85d6b0e

They should be exported if they were set.

Change-Id: Ieec565980ba148f675f84dcdd7c19894e349085f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-10-06 17:57:43 +02:00
parent 4270522916
commit af9197ff91
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/QtPriHelpers.cmake
View File

@ -565,6 +565,13 @@ function(qt_generate_global_device_pri_file)
# TODO: QTBUG-80943 When we eventually support Android multi-abi, this should be changed. # TODO: QTBUG-80943 When we eventually support Android multi-abi, this should be changed.
string(APPEND content "DEFAULT_ANDROID_ABIS = ${ANDROID_ABI}\n") string(APPEND content "DEFAULT_ANDROID_ABIS = ${ANDROID_ABI}\n")
if(QT_ANDROID_JAVAC_SOURCE)
string(APPEND content "ANDROID_JAVAC_SOURCE_VERSION = ${QT_ANDROID_JAVAC_SOURCE}\n")
endif()
if(QT_ANDROID_JAVAC_TARGET)
string(APPEND content "ANDROID_JAVAC_TARGET_VERSION = ${QT_ANDROID_JAVAC_TARGET}\n")
endif()
endif() endif()
if(QT_UIKIT_SDK) if(QT_UIKIT_SDK)