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

Qmake: Make makesteps work in DeployConfiguration again

Browse Source 
Task-number: QTCREATORBUG-16795
Change-Id: I0772114a82dfd7d41002dc91e3ae5702434b952d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2016-08-29 11:44:44 +02:00
parent 3dc0598d83
commit d2a7fa00eb
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmakeprojectmanager/makestep.cpp
View File

@@ -113,6 +113,8 @@ QString MakeStep::effectiveMakeCommand() const
QString makeCmd = m_makeCmd; QString makeCmd = m_makeCmd;
if (makeCmd.isEmpty()) { if (makeCmd.isEmpty()) {
QmakeBuildConfiguration *bc = qmakeBuildConfiguration(); QmakeBuildConfiguration *bc = qmakeBuildConfiguration();
if (!bc)
bc = qobject_cast<QmakeBuildConfiguration *>(target()->activeBuildConfiguration());
ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit()); ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit());
if (bc && tc) if (bc && tc)