feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/5.0' into 6.0

Browse Source 
Conflicts:
	src/plugins/android/androidpackageinstallationstep.cpp
	src/plugins/cppeditor/cppmodelmanager.cpp

Change-Id: I3bad38e1cfe717e98209d49461c9813a8e555eff
This commit is contained in:
Eike Ziller
2021-10-26 09:13:24 +02:00
parent 712caf10dc fbcb45c105
commit e8ba5b75cf
11 changed files with 274 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/android/androidmanager.cpp
View File

@@ -268,7 +268,20 @@ FilePath AndroidManager::buildDirectory(const Target *target)
{
if (const BuildSystem *bs = target->buildSystem()) {
const QString buildKey = target->activeBuildKey();
const FilePath buildDir = bs->buildTarget(target->activeBuildKey()).workingDirectory;
// Get the target build dir based on the settings file path
FilePath buildDir;
const ProjectNode *node = target->project()->findNodeForBuildKey(buildKey);
if (node) {
const QString settingsFile = node->data(Constants::AndroidDeploySettingsFile).toString();
buildDir = FilePath::fromUserInput(settingsFile).parentDir();
}
if (!buildDir.isEmpty())
return buildDir;
// Otherwise fallback to target working dir
buildDir = bs->buildTarget(target->activeBuildKey()).workingDirectory;
if (isQt5CmakeProject(target)) {
// Return the main build dir and not the android libs dir
const QString libsDir = QString(Constants::ANDROID_BUILD_DIRECTORY) + "/libs";