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

CMake: make QT_ANDROID_DEPLOYMENT_SETTINGS_FILE consistent with qmake

Browse Source 
Make name format of QT_ANDROID_DEPLOYMENT_SETTINGS_FILE consistent with
qmake, that is android-${target}-deployment-settings.json.

Task-number: QTCREATORBUG-24678
Change-Id: I2bdb056cf7a82fd83aaf658f3a405a0c9ef05756
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Assam Boudjelthia 2020-09-28 16:00:32 +03:00
parent 3d54f47cea
commit bfd07072fe
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtPlatformAndroid.cmake
View File

@ -142,9 +142,9 @@ define_property(TARGET
PROPERTY PROPERTY
QT_ANDROID_DEPLOYMENT_SETTINGS_FILE QT_ANDROID_DEPLOYMENT_SETTINGS_FILE
BRIEF_DOCS BRIEF_DOCS
" " "This variable is used to specify the deployment settings JSON file for androiddeployqt."
FULL_DOCS FULL_DOCS
" " "This variable points to the path of the deployment settings JSON file, which holds properties required by androiddeployqt to package the Android app."
) )
# Add a test for Android which will be run by the android test runner tool # Add a test for Android which will be run by the android test runner tool

2
src/corelib/Qt6AndroidMacros.cmake
View File

@ -19,7 +19,7 @@ function(qt6_android_generate_deployment_settings target)
if (NOT target_output_name) if (NOT target_output_name)
set(target_output_name ${target}) set(target_output_name ${target})
endif() endif()
set(deploy_file "${target_binary_dir}/android-lib${target_output_name}.so-deployment-settings.json") set(deploy_file "${target_binary_dir}/android-${target_output_name}-deployment-settings.json")
set(file_contents "{\n") set(file_contents "{\n")
# content begin # content begin

2
src/tools/androiddeployqt/main.cpp
View File

@ -565,7 +565,7 @@ Options parseOptions()
} }
if (options.inputFileName.isEmpty()) if (options.inputFileName.isEmpty())
options.inputFileName = QLatin1String("android-lib%1.so-deployment-settings.json").arg(QDir::current().dirName()); options.inputFileName = QLatin1String("android-%1-deployment-settings.json").arg(QDir::current().dirName());
options.timing = qEnvironmentVariableIsSet("ANDROIDDEPLOYQT_TIMING_OUTPUT"); options.timing = qEnvironmentVariableIsSet("ANDROIDDEPLOYQT_TIMING_OUTPUT");