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

20
src/plugins/android/androidpackageinstallationstep.cpp
View File

@@ -67,10 +67,6 @@ public:
AndroidPackageInstallationStep(BuildStepList *bsl, Id id);
QString nativeAndroidBuildPath() const;
Utils::FilePath androidBuildDirectory() const;
Utils::FilePath buildDirectory() const;
private:
bool init() final;
void setupOutputFormatter(OutputFormatter *formatter) final;
@@ -108,7 +104,7 @@ bool AndroidPackageInstallationStep::init()
processParameters()->setCommandLine(cmd);
// This is useful when running an example target from a Qt module project.
processParameters()->setWorkingDirectory(buildDirectory());
processParameters()->setWorkingDirectory(AndroidManager::buildDirectory(target()));
m_androidDirsToClean.clear();
// don't remove gradle's cache, it takes ages to rebuild it.
@@ -120,7 +116,7 @@ bool AndroidPackageInstallationStep::init()
QString AndroidPackageInstallationStep::nativeAndroidBuildPath() const
{
QString buildPath = androidBuildDirectory().toString();
QString buildPath = AndroidManager::androidBuildDirectory(target()).toString();
if (HostOsInfo::isWindowsHost())
if (buildEnvironment().searchInPath("sh.exe").isEmpty())
buildPath = QDir::toNativeSeparators(buildPath);
@@ -128,18 +124,6 @@ QString AndroidPackageInstallationStep::nativeAndroidBuildPath() const
return buildPath;
}
FilePath AndroidPackageInstallationStep::androidBuildDirectory() const
{
return buildDirectory() / Constants::ANDROID_BUILD_DIRECTORY;
}
FilePath AndroidPackageInstallationStep::buildDirectory() const
{
if (const BuildSystem *bs = buildSystem())
return bs->buildTarget(target()->activeBuildKey()).workingDirectory;
return {};
}
void AndroidPackageInstallationStep::setupOutputFormatter(OutputFormatter *formatter)
{
formatter->addLineParser(new GnuMakeParser);