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

fix fixPathToTargetOS() nesting

Browse Source 
first replaceExtraCompilerVariables(..., NoShell), then fix the final result.

Change-Id: If8cebeaa59f48d91b33b5a74e6a48a0d2d049643
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2014-11-24 20:36:28 +01:00
parent 5527411437
commit 6c4d8ee835
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/generators/mac/pbuilder_pbx.cpp
View File

@ -771,8 +771,8 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
mkt << "\\\n\t"; mkt << "\\\n\t";
++added; ++added;
const QString file_name = fileFixify(fn, Option::output_dir, Option::output_dir); const QString file_name = fileFixify(fn, Option::output_dir, Option::output_dir);
mkt << " " << escapeDependencyPath(replaceExtraCompilerVariables( mkt << ' ' << escapeDependencyPath(Option::fixPathToTargetOS(
Option::fixPathToTargetOS(tmp_out.first().toQString(), false), file_name, QString(), NoShell)); replaceExtraCompilerVariables(tmp_out.first().toQString(), file_name, QString(), NoShell)));
} }
} }
} }