diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
| commit | f516638b7fe9592837389826a6152a7e1b251c54 (patch) | |
| tree | 8bfecb640b7b6403d7a3d662d923eed630033da7 /eclass/qt5-build.eclass | |
| parent | 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff) | |
gentoo resync : 30.05.2020
Diffstat (limited to 'eclass/qt5-build.eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 9a757ccedf2f..cd2e19b0aa6a 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -194,6 +194,9 @@ qt5-build_src_configure() { if [[ ${QT5_MODULE} == qtbase ]]; then qt5_base_configure fi + if [[ ${QT5_MINOR_VERSION} -ge 15 ]] && [[ ${QT5_MODULE} == qttools ]] && [[ -z ${QT5_TARGET_SUBDIRS[@]} ]]; then + qt5_tools_configure + fi qt5_foreach_target_subdir qt5_qmake } @@ -565,7 +568,7 @@ qt5_base_configure() { -no-libpng -no-libjpeg -no-freetype -no-harfbuzz -no-openssl -no-libproxy - $([[ ${QT5_MINOR_VERSION} -ge 14 ]] && echo -no-feature-gssapi) + -no-feature-gssapi -no-xcb-xlib # bug 672340 @@ -615,7 +618,6 @@ qt5_base_configure() { # disable all platform plugins by default, override in qtgui -no-xcb -no-eglfs -no-kms -no-gbm -no-directfb -no-linuxfb - $([[ ${QT5_MINOR_VERSION} -lt 14 ]] && echo -no-mirclient) # disable undocumented X11-related flags, override in qtgui # (not shown in ./configure -help output) @@ -670,6 +672,34 @@ qt5_base_configure() { } +# @FUNCTION: qt5_tools_configure +# @INTERNAL +# @DESCRIPTION: +# Disables modules other than ${PN} belonging to qttools. +qt5_tools_configure() { + # configure arguments + local qmakeargs=( + -- + # not packaged in Gentoo + -no-feature-distancefieldgenerator + -no-feature-kmap2qmap + -no-feature-macdeployqt + -no-feature-makeqpf + -no-feature-qev + -no-feature-qtattributionsscanner + -no-feature-windeployqt + -no-feature-winrtrunner + ) + + local i + for i in assistant designer linguist pixeltool qdbus qdoc qtdiag qtpaths qtplugininfo; do + [[ ${PN} == ${i} ]] || qmakeargs+=( -no-feature-${i} ) + done + + # allow the ebuild to override what we set here + myqmakeargs=( "${qmakeargs[@]}" "${myqmakeargs[@]}" ) +} + # @FUNCTION: qt5_qmake_args # @INTERNAL # @DESCRIPTION: |