diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 04:14:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 04:14:30 (GMT) |
| commit | 8592bcc80b7ec245b485fa54f8bd41c4484e93e0 (patch) | |
| tree | 3cda496d06c89d337e37583df6d9af8546c30124 /qmake/generators | |
| parent | 85b089dec584fcc51ad7703ea015ea724c132ed4 (diff) | |
| parent | 2caea6081fc46217636f0ab70d09891efd2d2864 (diff) | |
| download | Qt-8592bcc80b7ec245b485fa54f8bd41c4484e93e0.zip Qt-8592bcc80b7ec245b485fa54f8bd41c4484e93e0.tar.gz Qt-8592bcc80b7ec245b485fa54f8bd41c4484e93e0.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
Fixed license header.
Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/makefile.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 595768f..e4764e0 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2638,10 +2638,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT QString out_directory_cdin, out_directory_cdout; MAKE_CD_IN_AND_OUT(out_directory); - //don't need the makefile arg if it isn't changed - QString makefilein; - if(subtarget->makefile != "$(MAKEFILE)") - makefilein = " -f " + subtarget->makefile; + QString makefilein = " -f " + subtarget->makefile; //write the rule/depends if(flags & SubTargetOrdered) { |