commit 1467d12290de68be1afe4e8edb4f786ae48ac674
Author: Stephan Witt <[email protected]>
Date: Thu Feb 6 22:19:15 2020 +0100
Allow externally provided list of components to skip for Qt framework
builds on macOS
(cherry picked from commit 2817439ddd343ace9c9ba4d4b7898f8c38753ebc)
---
development/LyX-Mac-binary-release.sh | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/development/LyX-Mac-binary-release.sh
b/development/LyX-Mac-binary-release.sh
index 07b66bc..5812360 100644
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -12,7 +12,7 @@ QtVersion=${QtVersion:-"4.6.3"}
QtSourceVersion=${QtSourceVersion:-"qt-everywhere-opensource-src-${QtVersion}"}
QtBuildSubDir="qt-${QtVersion}-build${QtAPI}"
QtConfigureOptions=${QtConfigureOptions:-"-release"}
-
+QtSkipComponents=${QtSkipComponents:-"qtconnectivity qtscript qtquickcontrols
qtmultimedia qtvirtualkeyboard qtwayland qtwebengine"}
LibMagicVersion=${LibMagicVersion:-"5.19"}
LibMagicSource="file-${LibMagicVersion}"
LibMagicLibrary="libmagic.1.dylib"
@@ -79,9 +79,9 @@ case "${QtVersion}:${QtAPI}" in
QtConfigureOptions="${QtConfigureOptions} -no-strip"
QtConfigureOptions="${QtConfigureOptions} -no-kms -no-pkg-config"
QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake
tools"
- QtConfigureOptions="${QtConfigureOptions} -skip qtquick1 -skip qtwebkit
-skip qtconnectivity -skip qtscript"
- QtConfigureOptions="${QtConfigureOptions} -skip qtquickcontrols"
-# QtConfigureOptions="${QtConfigureOptions} -skip qtdeclarative"
+ for component in ${QtSkipComponents} ; do
+ QtConfigureOptions="${QtConfigureOptions} -skip ${component}"
+ done
QtMajorVersion=qt5
;;
*)
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
