From af9197ff91a7db229854b502b7634706cde0e547 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 6 Oct 2020 17:57:43 +0200 Subject: 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 --- cmake/QtPriHelpers.cmake | 7 +++++++ 1 file changed, 7 insertions(+) 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) -- cgit v1.2.3