diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-06 17:57:43 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-07 10:08:37 +0200 |
| commit | af9197ff91a7db229854b502b7634706cde0e547 (patch) | |
| tree | cd50f65b29bbe5486fa553d0fd038569bfca60e1 | |
| parent | 4270522916fb9534aedbe5dad023399bdd1c9dbe (diff) | |
CMake: Add missing Android values in qdevice.pri
These were introduced in
675805e9eb0dc68a6e96622353073fd54161bdaf and
b9c85d6b0e274bf0a6287cd56d9e3d7376b0d004
They should be exported if they were set.
Change-Id: Ieec565980ba148f675f84dcdd7c19894e349085f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | cmake/QtPriHelpers.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index e06f457bc3..166fae7713 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -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. 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() if(QT_UIKIT_SDK) |