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

Qmake: Use Utils::FileName in QMakeStep

Browse Source 
Change-Id: I311947e476818ae7b14f299e0c917280f077165d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-05-15 16:04:52 +02:00
parent 2226c1b87b
commit 666953c393
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -182,7 +182,7 @@ bool QMakeStep::init()
else
workingDirectory = qmakeBc->buildDirectory().toString();
m_qmakeExecutable = qtVersion->qmakeCommand().toString();
m_qmakeExecutable = qtVersion->qmakeCommand();
m_qmakeArguments = allArguments(qtVersion);
m_runMakeQmake = (qtVersion->qtVersion() >= QtVersionNumber(5, 0 ,0));
@@ -311,10 +311,10 @@ void QMakeStep::finish(bool success)
runNextCommand();
}
void QMakeStep::startOneCommand(const QString &command, const QString &args)
void QMakeStep::startOneCommand(const FileName &command, const QString &args)
{
ProcessParameters *pp = processParameters();
pp->setCommand(Utils::FileName::fromString(command));
pp->setCommand(command);
pp->setArguments(args);
pp->resolveAll();
@@ -436,10 +436,10 @@ void QMakeStep::setSeparateDebugInfo(bool enable)
qmakeBuildConfiguration()->emitProFileEvaluateNeeded();
}
QString QMakeStep::makeCommand() const
FileName QMakeStep::makeCommand() const
{
auto *ms = qobject_cast<BuildStepList *>(parent())->firstOfType<MakeStep>();
return ms ? ms->effectiveMakeCommand().toString() : QString();
auto ms = qobject_cast<BuildStepList *>(parent())->firstOfType<MakeStep>();
return ms ? ms->effectiveMakeCommand() : FileName();
}
QString QMakeStep::makeArguments(const QString &makefile) const
@@ -459,7 +459,7 @@ QString QMakeStep::effectiveQMakeCall() const
QString qmake = qtVersion ? qtVersion->qmakeCommand().toUserOutput() : QString();
if (qmake.isEmpty())
qmake = tr("<no Qt version>");
QString make = makeCommand();
QString make = makeCommand().toString();
if (make.isEmpty())
make = tr("<no Make step found>");