From 9e4dcbac05f3a62d4cdc5d4b9d76fa3e93bf7501 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Jul 2013 11:55:28 +0200 Subject: [PATCH] mac frameworks: link target alias to Current version by convention, $target.framework/$target links to Versions/Current/$target, not Versions/$version/$target. Versions/Current already links to $version. so this adds one indirection, but is otherwise the same. Change-Id: If3d1a3713712f4221ec31883977e50bce6f91764 Reviewed-by: Jake Petroules Reviewed-by: Joerg Bornemann --- qmake/generators/unix/unixmake2.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index c81b7d8d129..8d63ccdf2ad 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -561,9 +561,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) << mkdir_p_asstring("\"`dirname $(DESTDIR)$(TARGETD)`\"", false) << "\n\t" << "-$(MOVE) $(TARGET) $(DESTDIR)$(TARGETD)\n\t" << mkdir_p_asstring("\"`dirname $(DESTDIR)$(TARGET0)`\"", false) << "\n\t" - << varGlue("QMAKE_LN_SHLIB","-"," "," Versions/" + - project->first("QMAKE_FRAMEWORK_VERSION") + - "/$(TARGET) $(DESTDIR)$(TARGET0)") << "\n\t" + << varGlue("QMAKE_LN_SHLIB", "-", " ", + " Versions/Current/$(TARGET) $(DESTDIR)$(TARGET0)") << "\n\t" << "-$(DEL_FILE) " << destdir << "Versions/Current\n\t" << varGlue("QMAKE_LN_SHLIB","-"," ", " " + project->first("QMAKE_FRAMEWORK_VERSION") + " " + destdir + "Versions/Current") << "\n\t";