From d2a7fa00ebbb68f69b2e334a10aafca1c0cacfc3 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 29 Aug 2016 11:44:44 +0200 Subject: [PATCH] Qmake: Make makesteps work in DeployConfiguration again Task-number: QTCREATORBUG-16795 Change-Id: I0772114a82dfd7d41002dc91e3ae5702434b952d Reviewed-by: Eike Ziller --- src/plugins/qmakeprojectmanager/makestep.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/qmakeprojectmanager/makestep.cpp b/src/plugins/qmakeprojectmanager/makestep.cpp index 4a1e77e91ac..79f283cf6bd 100644 --- a/src/plugins/qmakeprojectmanager/makestep.cpp +++ b/src/plugins/qmakeprojectmanager/makestep.cpp @@ -113,6 +113,8 @@ QString MakeStep::effectiveMakeCommand() const QString makeCmd = m_makeCmd; if (makeCmd.isEmpty()) { QmakeBuildConfiguration *bc = qmakeBuildConfiguration(); + if (!bc) + bc = qobject_cast(target()->activeBuildConfiguration()); ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit()); if (bc && tc)