forked from qt-creator/qt-creator
Android: Fix android-*-deployment-settings.json detection
Qt 6.0 + CMake: The name for the Android deployment settings file needs to be determined by using the build key of the current run configuration rather than by using the display name of the project root node. Since in contrast to qmake/Qbs, CMake does not supply us with the file name and we have to contruct it ourselves. Therefore, it makes sense to move the value into the Android plugin. This change adds AndroidQtVersion::androidDeploymentSettings which lets qmake and Qbs still provide the value as before while handling the CMake fallback. Fixes: QTCREATORBUG-25209 Change-Id: I12314d06a45d6e045cb654d9140f9d2ed4602f67 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
@@ -32,6 +32,7 @@
|
||||
#include "androidconstants.h"
|
||||
#include "androidglobal.h"
|
||||
#include "androidavdmanager.h"
|
||||
#include "androidqtversion.h"
|
||||
|
||||
#include <coreplugin/fileutils.h>
|
||||
#include <coreplugin/icore.h>
|
||||
@@ -200,7 +201,7 @@ bool AndroidDeployQtStep::init()
|
||||
m_command = AndroidConfigurations::currentConfig().adbToolPath();
|
||||
AndroidManager::setManifestPath(target(), m_manifestName);
|
||||
} else {
|
||||
QString jsonFile = node->data(Constants::AndroidDeploySettingsFile).toString();
|
||||
QString jsonFile = AndroidQtVersion::androidDeploymentSettings(target()).toString();
|
||||
if (jsonFile.isEmpty()) {
|
||||
const QString error = tr("Cannot find the androiddeploy Json file.");
|
||||
emit addOutput(error, OutputFormat::Stderr);
|
||||
|
||||
Reference in New Issue
Block a user