commit d2c179a0b0a4629e2ab66d058e3a58339e339d0f
Author: Stephan Witt <[email protected]>
Date: Thu Feb 6 22:17:35 2020 +0100
More flexible definition of Qt libraries to include as frameworks for macOS
(cherry picked from commit 6e54c86a860a81ae75991f21703281d661c48bc5)
---
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 5ea5d7d..07b66bc 100644
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -357,15 +357,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
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
