From 6e54c86a860a81ae75991f21703281d661c48bc5 Mon Sep 17 00:00:00 2001 From: Stephan Witt Date: Thu, 6 Feb 2020 22:17:35 +0100 Subject: [PATCH] More flexible definition of Qt libraries to include as frameworks for macOS --- development/LyX-Mac-binary-release.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh index c3e756f636..1c50f42927 100644 --- a/development/LyX-Mac-binary-release.sh +++ b/development/LyX-Mac-binary-release.sh @@ -352,15 +352,19 @@ LyxAppPrefix="${LyxAppDir}.app" # don't change order here... case "${QtVersion}" in 5.0.*|5.1.*) - QtLibraries="QtSvg QtXml QtPrintSupport QtWidgets QtGui QtNetwork QtConcurrent QtCore" + QtLibraries=${QtLibraries:-"QtSvg QtXml QtPrintSupport QtWidgets QtGui QtNetwork QtConcurrent QtCore"} + QtFrameworkVersion="5" + ;; +5.12.*) + QtLibraries=${QtLibraries:-"QtDbus QtSvg QtXml QtPrintSupport QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore"} QtFrameworkVersion="5" ;; 5*) - QtLibraries="QtSvg QtXml QtPrintSupport QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore" + QtLibraries=${QtLibraries:-"QtSvg QtXml QtPrintSupport QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore"} QtFrameworkVersion="5" ;; *) - QtLibraries="QtSvg QtXml QtGui QtNetwork QtCore" + QtLibraries=${QtLibraries:-"QtSvg QtXml QtGui QtNetwork QtCore"} QtFrameworkVersion="4" ;; esac -- 2.39.5