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

ProjectExplorer: Make ToolChain::makeCommand return a FileName

Browse Source 
... instead of a QString. This is in line with the qmakeCommand().

Change-Id: I617cb03522be5ebaac6cab58a3606f659fddb833
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-05-15 10:45:36 +02:00
parent 4dd72bd899
commit 86f072daeb
21 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,7 @@ bool AndroidPackageInstallationStep::init()
ProcessParameters *pp = processParameters();
pp->setMacroExpander(bc->macroExpander());
pp->setWorkingDirectory(bc->buildDirectory().toString());
pp->setCommand(tc->makeCommand(bc->environment()));
pp->setCommand(tc->makeCommand(bc->environment()).toString());
Environment env = bc->environment();
Environment::setupEnglishOutput(&env);
pp->setEnvironment(env);

4
src/plugins/android/androidtoolchain.cpp
View File

@@ -130,11 +130,11 @@ FileNameList AndroidToolChain::suggestedMkspecList() const
<< FileName::fromLatin1("android-clang");
}
QString AndroidToolChain::makeCommand(const Environment &env) const
FileName AndroidToolChain::makeCommand(const Environment &env) const
{
Q_UNUSED(env);
FileName makePath = AndroidConfigurations::currentConfig().makePath();
return makePath.exists() ? makePath.toString() : "make";
return makePath.exists() ? makePath : FileName::fromString("make");
}
GccToolChain::DetectedAbisResult AndroidToolChain::detectSupportedAbis() const

2
src/plugins/android/androidtoolchain.h
View File

@@ -45,7 +45,7 @@ public:
Utils::FileName suggestedDebugger() const override;
Utils::FileName suggestedGdbServer() const;
Utils::FileNameList suggestedMkspecList() const override;
QString makeCommand(const Utils::Environment &environment) const override;
Utils::FileName makeCommand(const Utils::Environment &environment) const override;
bool fromMap(const QVariantMap &data) override;
protected: