diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-07-12 20:25:31 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-07-13 03:30:22 +0000 |
| commit | 7cf25a5c1fdd3d56d4e933d9bc5973da041ab478 (patch) | |
| tree | f5013fa53fa7806869e4ae1fb76cd28ae90025e0 /packaging | |
| parent | 0571d849dfdf54bc7253daf5d36bab9527892b8a (diff) | |
Handle Qt 4 when looking for the Qt frameworks directory.
Do it in a loop, so we can change it to handle Qt 6 if, as, and when it
comes out (assuming they label its packages as Qt6Package).
Change-Id: I1d33d3e9726981b1940fb4409184c486628cb31b
Reviewed-on: https://code.wireshark.org/review/9615
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/macosx/osx-app.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 00408af52f..52ca477316 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -179,7 +179,14 @@ elif [ ! -d "$bundle" ] ; then fi if [ "$ui_toolkit" = "qt" ] ; then - qt_frameworks_dir=`pkg-config --libs Qt5Core | sed -e 's/-F//' -e 's/ -framework.*//'` + for i in 5 "" + do + qt_frameworks_dir=`pkg-config --libs Qt${i}Core | sed -e 's/-F//' -e 's/ -framework.*//'` + if [ ! -z "$qt_frameworks_dir" ] ; then + # found it + break; + fi + done if [ -z "$qt_frameworks_dir" ] ; then echo "Can't find the Qt frameworks directory" >&2 exit 1 |