d1528919de
ProjectBuilderMakefileGenerator::openOutput should only change back Option::output_dir when creating a pbx file inside an Xcode project. Since the pbx file will be placed inside a different directory than output_dir when creating an Xcode project, MakefileGenerator::openOutput() will redirect output_dir to be inside the Xcode project as well. Since we don't want this redirection, we change output_dir back to what it was once the call returns. But we should only do this when creating the whole Xcode project, since only then we create a pbx file that is different from output_dir in the first place. A bug with this is seen when making qt_makeqmake.mak (which is a helper makefile inside the Xcode project). That file will only regenerate the pbx file (and not the whole Xcode project), which means that we don't enter the fileName.isEmpty() section, which means that output_dir should stay as it is. Task-number: QTBUG-45826 Change-Id: I03d5c3dec395ff4768f9272fd1981c6fd35efb1e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> |
||
|---|---|---|
| .. | ||
| mac | ||
| unix | ||
| win32 | ||
| makefile.cpp | ||
| makefile.h | ||
| makefiledeps.cpp | ||
| makefiledeps.h | ||
| metamakefile.cpp | ||
| metamakefile.h | ||
| projectgenerator.cpp | ||
| projectgenerator.h | ||
| xmloutput.cpp | ||
| xmloutput.h | ||