diff options
| -rw-r--r-- | cmake/QtPlatformAndroid.cmake | 4 | ||||
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 2 | ||||
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake index e832e02964..62fc7fe8cf 100644 --- a/cmake/QtPlatformAndroid.cmake +++ b/cmake/QtPlatformAndroid.cmake @@ -142,9 +142,9 @@ define_property(TARGET PROPERTY QT_ANDROID_DEPLOYMENT_SETTINGS_FILE BRIEF_DOCS - " " + "This variable is used to specify the deployment settings JSON file for androiddeployqt." 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 diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index b75e255e46..05a094d2f8 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -19,7 +19,7 @@ function(qt6_android_generate_deployment_settings target) if (NOT target_output_name) set(target_output_name ${target}) 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") # content begin diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 558e503973..48c3fa70b2 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -565,7 +565,7 @@ Options parseOptions() } 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"); |