diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-25 15:28:53 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-10-01 10:56:24 +0200 |
| commit | e9c1e3076c748149eed5296f999688db7a26488b (patch) | |
| tree | 3fe303c0f41f996c4bd5c8dd69ff7abb7312b5f7 | |
| parent | b56ff1f394b30d61f79c549903fa5b686d116868 (diff) | |
make top-level symlinks in bundles point to Current, not the major version
Current already points to the major version, and the other symlinks are
supposed to take advantage of that (so a hypothetical change of major
versions requires just one symlink to be adjusted).
https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html
Task-number: QTBUG-32895
Change-Id: I3c3a38c72ba18de6e48b20f2662341672022a274
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 2153b24c95..55a94bef90 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -794,7 +794,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) bundledFiles << link; t << link << ": \n\t" << mkdir_p_asstring(path) << "\n\t" - << "@$(SYMLINK) " << version << project->first(pkey) << " " << path << endl; + << "@$(SYMLINK) " << project->first(vkey) + "/Current/" << project->first(pkey) + << " " << path << endl; path += version; } path += project->first(pkey).toQString(); |