remove unnecessary conditional
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Fri, 18 May 2012 19:06:54 +0000 (21:06 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tue, 19 Jun 2012 14:46:06 +0000 (16:46 +0200)
the code above already deals with the differences

Change-Id: Ifb799e46f5187e7bd3d0f0169e868ad267bcfe23
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
qmake/generators/makefile.cpp

index bdf6c8b..bddcdf7 100644 (file)
@@ -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") &&