Skip to content

Commit 8fe0fa9

Browse files
committed
Add some comments on (probably) redundant commands
1 parent d9d869b commit 8fe0fa9

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

install.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,20 @@ echo 'Installing hook'
2323
cp build/qtbase/lib/QtNetwork.framework/Versions/5/QtNetwork \
2424
"$TARGET_APP/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork"
2525

26+
# @todo Consider removing this. Current Qt/OSX buildchain set the ID to
27+
# '@rpath/QtNetwork.framework/Versions/5/QtNetwork', which should work fine.
28+
# Whereas back in 2014 it would typically be set to an absolute path on the
29+
# build machine. Anyway, forcing it to be based on '@executable_path/...'
30+
# still seems to work, but we can probably drop it sometime, with testing.
2631
install_name_tool -id \
2732
'@executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork' \
2833
"$TARGET_APP/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork"
2934

35+
# @todo Consider removing this. It actually does nothing now, since current Qt
36+
# versions set the relevant name to '@rpath/QtCore.framework/Versions/5/QtCore'
37+
# so the following `-change` doesn't find anything to change anymore.
3038
install_name_tool -change \
31-
'/usr/local/Qt-5.1.1/lib/QtCore.framework/Versions/5/QtCore' \
39+
'/usr/local/Qt-5.5.1/lib/QtCore.framework/Versions/5/QtCore' \
3240
'@executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore' \
3341
"$TARGET_APP/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork"
3442

0 commit comments

Comments
 (0)