From 8499718351f3b2068a67c99c7ccd2981f1eeb5c4 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 25 Nov 2020 13:39:00 +0200 Subject: [PATCH] CMake: don't add empty QT_ANDROID_APPLICATION_ARGUMENTS to Json Pick-to: 6.0 Change-Id: I471da3f733046aeaa8381bbdeeba3ee2775b97eb Reviewed-by: Alexandru Croitor --- src/corelib/Qt6AndroidMacros.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index aa95eb99b28..6556bb59e09 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -177,8 +177,10 @@ endif() " \"application-binary\": \"${target_output_name}\",\n") # App command-line arguments - string(APPEND file_contents - " \"android-application-arguments\": \"${QT_ANDROID_APPLICATION_ARGUMENTS}\",\n") + if (QT_ANDROID_APPLICATION_ARGUMENTS) + string(APPEND file_contents + " \"android-application-arguments\": \"${QT_ANDROID_APPLICATION_ARGUMENTS}\",\n") + endif() # Override qmlimportscanner binary path set(qml_importscanner_binary_path "${QT_HOST_PATH}/bin/qmlimportscanner")