1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unnecessary conditional

Browse Source 
the code above already deals with the differences

Change-Id: Ifb799e46f5187e7bd3d0f0169e868ad267bcfe23
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-05-18 21:06:54 +02:00
parent d83619f65f
commit 4fdd663208
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qmake/generators/makefile.cpp
View File

@ -2661,12 +2661,8 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
sub_targ = project->first((*qut_it) + ".recurse_target"); sub_targ = project->first((*qut_it) + ".recurse_target");
//write the commands //write the commands
if(!out_directory.isEmpty()) { writeSubMakeCall(t, out_directory_cdin, makefilein + " " + sub_targ,
writeSubMakeCall(t, out_directory_cdin, makefilein + " " + sub_targ, out_directory_cdout);
out_directory_cdout);
} else {
writeSubMakeCall(t, "\n\t", makefilein + " " + sub_targ, QString());
}
} }
} }
if(project->isEmpty("QMAKE_NOFORCE") && if(project->isEmpty("QMAKE_NOFORCE") &&