Skip to content

Commit

Permalink
XCode: Fix the output paths for extra compilers with fileFixify()
Browse files Browse the repository at this point in the history
This ensures that the generated XCode project can correctly find any
files that are referenced via a path containing "..".

Task-number: QTBUG-35131
Change-Id: I049bc2279b4c515a82acd61142d25b8c240e8f6e
Reviewed-by: Oswald Buddenhagen <[email protected]>
  • Loading branch information
AndyShawQt committed Mar 17, 2018
1 parent e4e87a2 commit 44137dc
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion qmake/generators/mac/pbuilder_pbx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -779,8 +779,9 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
mkt << "\\\n\t";
++added;
const QString file_name = fileFixify(fn, FileFixifyFromOutdir);
const QString tmpOut = fileFixify(tmp_out.first().toQString(), FileFixifyFromOutdir);
mkt << ' ' << escapeDependencyPath(Option::fixPathToTargetOS(
replaceExtraCompilerVariables(tmp_out.first().toQString(), file_name, QString(), NoShell)));
replaceExtraCompilerVariables(tmpOut, file_name, QString(), NoShell)));
}
}
}
Expand Down

0 comments on commit 44137dc

Please sign in to comment.