[LyX/master] More flexible definition of Qt libraries to include as frameworks for macOS

Stephan Witt switt at lyx.org
Thu Feb 6 21:37:01 UTC 2020


commit 6e54c86a860a81ae75991f21703281d661c48bc5
Author: Stephan Witt <switt at lyx.org>
Date:   Thu Feb 6 22:17:35 2020 +0100

    More flexible definition of Qt libraries to include as frameworks for macOS
---
 development/LyX-Mac-binary-release.sh |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh
index c3e756f..1c50f42 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


More information about the lyx-cvs mailing list