Conflicts: qmake/generators/makefile.cpp Change-Id: Ib3715e626f2fd32804c75c16ea9aa06a1216e76d |
||
|---|---|---|
| .. | ||
| mac | ||
| unix | ||
| win32 | ||
| makefile.cpp | ||
| makefile.h | ||
| makefiledeps.cpp | ||
| makefiledeps.h | ||
| metamakefile.cpp | ||
| metamakefile.h | ||
| projectgenerator.cpp | ||
| projectgenerator.h | ||
| xmloutput.cpp | ||
| xmloutput.h | ||