diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-07-13 11:52:41 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-07-13 18:53:01 +0000 |
| commit | 5c2a98bf57348254f8686f8cd2378b8fcae096a7 (patch) | |
| tree | b737b6ef3d0088bab094061eca6067ae7731bfe2 /packaging/macosx | |
| parent | 8ba94798ec1506b86abf9418a3fb849d375e62b6 (diff) | |
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 <guy@alum.mit.edu>
Diffstat (limited to 'packaging/macosx')
| -rwxr-xr-x | packaging/macosx/osx-app.sh | 5 |
1 files changed, 5 insertions, 0 deletions
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 |