From 425732f810da228a439952c03fdde22ee948c5cf Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Mon, 7 Oct 2019 10:51:53 +0200
Subject: QMake: Let the user decide whether to run a make step for subdir
 builds

Amends 66237a6e04.

Fixes: QTCREATORBUG-22956
Change-Id: I1c611a281eb0c2bad1f066a9753e685595b1eee1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
---
 src/plugins/qmakeprojectmanager/qmakemakestep.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/plugins/qmakeprojectmanager')

diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
index ec318b63e6..140ec97502 100644
--- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
@@ -60,6 +60,7 @@ QmakeMakeStep::QmakeMakeStep(BuildStepList *bsl)
         setClean(true);
         setUserArguments("clean");
     }
+    supportDisablingForSubdirs();
 }
 
 bool QmakeMakeStep::init()
@@ -79,8 +80,7 @@ bool QmakeMakeStep::init()
     }
 
     // Ignore all but the first make step for a non-top-level build. See QTCREATORBUG-15794.
-    m_ignoredNonTopLevelBuild = (bc->fileNodeBuild() || bc->subNodeBuild())
-            && stepList()->firstOfType<QmakeMakeStep>() != this;
+    m_ignoredNonTopLevelBuild = (bc->fileNodeBuild() || bc->subNodeBuild()) && !enabledForSubDirs();
 
     ProcessParameters *pp = processParameters();
     pp->setMacroExpander(bc->macroExpander());
-- 
cgit v1.2.1