summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-05-18 21:06:54 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-19 16:46:06 +0200
commit4fdd663208d4951b55c85253a764214c7890f4b8 (patch)
treed1ab92a51faaea6a843875ad484a722352c51f19 /qmake
parentd83619f65f9d98814bb5a5afb53f8ed93b71dc16 (diff)
remove unnecessary conditional
the code above already deals with the differences Change-Id: Ifb799e46f5187e7bd3d0f0169e868ad267bcfe23 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/makefile.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index bdf6c8b391..bddcdf7b76 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -2661,12 +2661,8 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
sub_targ = project->first((*qut_it) + ".recurse_target");
//write the commands
- if(!out_directory.isEmpty()) {
- writeSubMakeCall(t, out_directory_cdin, makefilein + " " + sub_targ,
- out_directory_cdout);
- } else {
- writeSubMakeCall(t, "\n\t", makefilein + " " + sub_targ, QString());
- }
+ writeSubMakeCall(t, out_directory_cdin, makefilein + " " + sub_targ,
+ out_directory_cdout);
}
}
if(project->isEmpty("QMAKE_NOFORCE") &&