diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-02 09:43:46 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-02 09:44:03 +0200 |
| commit | 166c2499d989919a037a599942fb95beb362971e (patch) | |
| tree | 748e58d2ed42422aae1e32a28f57180f5bb1cbea /qmake/generators/mac/pbuilder_pbx.cpp | |
| parent | f7047d52da47a8426189d0aff8c5104b23cbfd89 (diff) | |
| parent | 7bc9310a2265e14b6880aa29d96adba6d3d7aed0 (diff) | |
Merge remote-tracking branch 'origin/5.5.0' into 5.5
Change-Id: I060b0e10e55487a4a4a101f77ad7c8dc8cf0f553
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 adf6ca5fb0..deacac2c83 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -918,7 +918,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) if(!path.isEmpty() && !libdirs.contains(path)) libdirs += path; } - library = fileFixify(library, FileFixifyFromOutdir); + library = fileFixify(library, FileFixifyFromOutdir | FileFixifyAbsolute); QString key = keyFor(library); if (!project->values("QMAKE_PBX_LIBRARIES").contains(key)) { bool is_frmwrk = (library.endsWith(".framework")); |