]> git.lyx.org Git - features.git/commitdiff
Allow externally provided list of components to skip for Qt framework builds on macOS
authorStephan Witt <switt@lyx.org>
Thu, 6 Feb 2020 21:19:15 +0000 (22:19 +0100)
committerStephan Witt <switt@lyx.org>
Sun, 7 Jun 2020 18:33:39 +0000 (20:33 +0200)
(cherry picked from commit 2817439ddd343ace9c9ba4d4b7898f8c38753ebc)

development/LyX-Mac-binary-release.sh

index 07b66bcc61a9660e519cff0cbf5bb952ea5c71ad..5812360821a967679cbc73b82433a0be2b947d65 100644 (file)
@@ -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
        ;;
 *)