From 5c2a98bf57348254f8686f8cd2378b8fcae096a7 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 13 Jul 2015 11:52:41 -0700 Subject: Don't treat Qt frameworks as dependencies. macdeployqt will stuff them into the bundle for us; exclude anything in the Qt frameworks directory from the lists of dependencies for us to copy or munge. (We don't copy them correctly - that results in the underlying binary being copied to the Frameworks directory - and we leave it up to macdeployqt to do the munging.) Change-Id: I10cfb8dcb2abadde9d5c52252979267912710f80 Reviewed-on: https://code.wireshark.org/review/9627 Reviewed-by: Guy Harris --- packaging/macosx/osx-app.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'packaging/macosx') diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index c58a24b6b5..eb87a604b6 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -191,6 +191,11 @@ if [ "$ui_toolkit" = "qt" ] ; then echo "Can't find the Qt frameworks directory" >&2 exit 1 fi + + # + # Leave the Qt frameworks out of the special processing. + # + exclude_prefixes="$exclude_prefixes|$qt_frameworks_dir" fi # Package paths -- cgit v1.2.3