diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-21 08:59:26 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-21 08:59:26 +0100 |
| commit | cc920b4cddc170a7442d8fdfb53076c208a3d71e (patch) | |
| tree | e4757cffe420bd3c61dda1d369b452a0fac9eff7 /qmake | |
| parent | c8c8cc790a315710b0dae2282dc32e3472e107ee (diff) | |
| parent | fc8fd508165c8e4dcfe0da397b63cf99f15178e3 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I35a6555e3885e489f88aa9b4b0142e1017f7a959
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index db7a1b2714..3b1f904253 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -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))); } } } |