diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-02 23:06:44 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-06-02 23:39:22 +0000 |
| commit | 754efa57d89c62d1796e01b407e9222e67450f52 (patch) | |
| tree | ebbe795a4067da7b1e75f5597de2373aaf4ba308 /qmake/generators/mac/pbuilder_pbx.cpp | |
| parent | f44a59f390be9b67365db8796aa6a54fe9241028 (diff) | |
| parent | 166c2499d989919a037a599942fb95beb362971e (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5.0' into 5.5" into refs/staging/5.5
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 adf6ca5fb06..deacac2c837 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")); |