diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-18 09:58:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-18 09:58:45 +0200 |
| commit | 20efe759168b809b56489e90bc37b666784c07e6 (patch) | |
| tree | b33a99683e64b3fb3946d41f211677e53ef0f60f /qmake/generators/mac/pbuilder_pbx.cpp | |
| parent | 50c41bc8efb52b2b3f2aad66d79167320e9b2b31 (diff) | |
| parent | 189280026f091716dfda91ff652cc20b299683c2 (diff) | |
Merge remote-tracking branch 'origin/5.4.2' into 5.4
Change-Id: Ic1e8b154b43c8d8e3f682c96b074b2b77dbfe2ac
Diffstat (limited to 'qmake/generators/mac/pbuilder_pbx.cpp')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 8f24c20712..b54f634cf9 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -950,7 +950,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) if(!path.isEmpty() && !libdirs.contains(path)) libdirs += path; } - library = fileFixify(library); + library = fileFixify(library, FileFixifyAbsolute); QString filetype = xcodeFiletypeForFilename(library); QString key = keyFor(library); if (!project->values("QMAKE_PBX_LIBRARIES").contains(key)) { |