From bfd07072fed89c10470560efe2ab545c56c302e0 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 28 Sep 2020 16:00:32 +0300 Subject: CMake: make QT_ANDROID_DEPLOYMENT_SETTINGS_FILE consistent with qmake 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 --- src/tools/androiddeployqt/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tools') 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"); -- cgit v1.2.3