diff options
| author | Christoph Keller <gri@not-censored.com> | 2018-07-03 17:17:48 +0200 |
|---|---|---|
| committer | Christoph Keller <gri@not-censored.com> | 2018-07-04 14:13:05 +0000 |
| commit | ebd04a5aa891521d577eeed152347310753af214 (patch) | |
| tree | e47506ab50ae0133df7ef719ca94661eac973ef2 /qmake/generators | |
| parent | 9fc6b021f9327b17008576e79a1f45c85b1b2d6e (diff) | |
qmake: Fix xcode problems with invalid build paths
Qmake accidentally replaced all occurrences of the library name in the
build path. This would lead to problems if the (shadow) build path also
contains the library name.
Task-number: QTBUG-69279
Change-Id: If99acccc779ff0874433b193be7e7fc53625b245
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 80891e682f..3206174d93 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -874,7 +874,9 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) name.chop(librarySuffix.length()); } } else { - library.replace(name, name + suffixSetting); + int pos = library.lastIndexOf(name); + if (pos != -1) + library.insert(pos + name.length(), suffixSetting); } } } |