1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: don't add empty QT_ANDROID_APPLICATION_ARGUMENTS to Json

Browse Source 
Change-Id: I471da3f733046aeaa8381bbdeeba3ee2775b97eb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 8499718351f3b2068a67c99c7ccd2981f1eeb5c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Assam Boudjelthia 2020-11-25 13:39:00 +02:00 committed by Qt Cherry-pick Bot
parent 48558bbb67
commit 32aeba4e38
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/Qt6AndroidMacros.cmake
View File

@ -174,8 +174,10 @@ function(qt6_android_generate_deployment_settings target)
" \"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")