comparison deploy/osx/copy-qt.sh @ 1829:8c3683eeb898 baselib-win-build

Merge
author Chris Cannam <cannam@all-day-breakfast.com>
date Thu, 24 May 2018 16:44:35 +0100
parents c187a791fd46
children 11342618ccbe
comparison
equal deleted inserted replaced
1827:e63cc95876cb 1829:8c3683eeb898
9 exit 2 9 exit 2
10 fi 10 fi
11 11
12 frameworks="QtCore QtNetwork QtGui QtXml QtSvg QtWidgets QtPrintSupport QtDBus" 12 frameworks="QtCore QtNetwork QtGui QtXml QtSvg QtWidgets QtPrintSupport QtDBus"
13 13
14 plugins="gif icns ico jpeg tga tiff wbmp webp cocoa macstyle minimal offscreen" 14 plugins="gif icns ico jpeg tga tiff wbmp webp cocoa minimal offscreen"
15 15
16 qtdir=$(grep "Command:" Makefile | head -1 | awk '{ print $3; }' | sed s,/bin/.*,,) 16 qtdir=$(grep "Command:" Makefile | head -1 | awk '{ print $3; }' | sed s,/bin/.*,,)
17 17
18 if [ ! -d "$qtdir" ]; then 18 if [ ! -d "$qtdir" ]; then
19 echo "Failed to discover Qt installation directory from Makefile, exiting" 19 echo "Failed to discover Qt installation directory from Makefile, exiting"