From: Stephan Witt Date: Thu, 6 Feb 2020 21:19:15 +0000 (+0100) Subject: Allow externally provided list of components to skip for Qt framework builds on macOS X-Git-Tag: 2.3.6~96 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1467d12290de68be1afe4e8edb4f786ae48ac674;p=features.git Allow externally provided list of components to skip for Qt framework builds on macOS (cherry picked from commit 2817439ddd343ace9c9ba4d4b7898f8c38753ebc) --- diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh index 07b66bcc61..5812360821 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 ;; *)