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

QmakePM: Fix support for custom Makefile names

Browse Source 
Task-number: QTCREATORBUG-16431
Change-Id: Ice2b18114c0d71e0a09ee63cd37559eb28b42034
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2016-06-13 17:01:40 +03:00
committed by Orgad Shaneh
parent 54cb7fef04
commit 9ed97cb732
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,8 +208,10 @@ bool QMakeStep::init(QList<const BuildStep *> &earlierSteps)
m_makeExecutable = makeCommand(); m_makeExecutable = makeCommand();
if (m_makeExecutable.isEmpty()) if (m_makeExecutable.isEmpty())
return false; return false;
m_makeArguments = makeArguments();
} else { } else {
m_makeExecutable.clear(); m_makeExecutable.clear();
m_makeArguments.clear();
} }
QString makefile = workingDirectory; QString makefile = workingDirectory;
@@ -374,7 +376,7 @@ void QMakeStep::runNextCommand()
parser->setWorkingDirectory(processParameters()->workingDirectory()); parser->setWorkingDirectory(processParameters()->workingDirectory());
setOutputParser(parser); setOutputParser(parser);
m_nextState = State::POST_PROCESS; m_nextState = State::POST_PROCESS;
startOneCommand(m_makeExecutable, QLatin1String("qmake_all")); startOneCommand(m_makeExecutable, m_makeArguments);
} }
return; return;
case State::POST_PROCESS: case State::POST_PROCESS:
@@ -456,6 +458,20 @@ QString QMakeStep::makeCommand() const
return ms ? ms->effectiveMakeCommand() : QString(); return ms ? ms->effectiveMakeCommand() : QString();
} }
QString QMakeStep::makeArguments() const
{
QString args;
if (QmakeBuildConfiguration *qmakeBc = qmakeBuildConfiguration()) {
const QString makefile = qmakeBc->makefile();
if (!makefile.isEmpty()) {
Utils::QtcProcess::addArg(&args, "-f");
Utils::QtcProcess::addArg(&args, makefile);
}
}
Utils::QtcProcess::addArg(&args, "qmake_all");
return args;
}
QString QMakeStep::effectiveQMakeCall() const QString QMakeStep::effectiveQMakeCall() const
{ {
BaseQtVersion *qtVersion = QtKitInformation::qtVersion(target()->kit()); BaseQtVersion *qtVersion = QtKitInformation::qtVersion(target()->kit());
@@ -468,7 +484,7 @@ QString QMakeStep::effectiveQMakeCall() const
QString result = qmake + QLatin1Char(' ') + allArguments(qtVersion); QString result = qmake + QLatin1Char(' ') + allArguments(qtVersion);
if (qtVersion->qtVersion() >= QtVersionNumber(5, 0, 0)) if (qtVersion->qtVersion() >= QtVersionNumber(5, 0, 0))
result.append(QString::fromLatin1(" && %1 qmake_all").arg(make)); result.append(QString::fromLatin1(" && %1 %2").arg(make).arg(makeArguments()));
return result; return result;
} }

2
src/plugins/qmakeprojectmanager/qmakestep.h
View File

@@ -145,6 +145,7 @@ public:
void setSeparateDebugInfo(bool enable); void setSeparateDebugInfo(bool enable);
QString makeCommand() const; QString makeCommand() const;
QString makeArguments() const;
QString effectiveQMakeCall() const; QString effectiveQMakeCall() const;
QVariantMap toMap() const override; QVariantMap toMap() const override;
@@ -171,6 +172,7 @@ private:
QString m_qmakeExecutable; QString m_qmakeExecutable;
QString m_qmakeArguments; QString m_qmakeArguments;
QString m_makeExecutable; QString m_makeExecutable;
QString m_makeArguments;
QString m_userArgs; QString m_userArgs;
QFutureInterface<bool> m_inputFuture; QFutureInterface<bool> m_inputFuture;