diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-10-13 16:29:52 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-10-18 18:15:28 +0200 |
| commit | 2a31ee5c821ef947ead4503e4fde9916246468fe (patch) | |
| tree | 7abce5f945cf28127386d8abe2e6050b1a05f92b /eclass | |
| parent | qt5-build.eclass: Drop dev branch support, closing with 5.15.9999 (diff) | |
| download | gentoo-2a31ee5c821ef947ead4503e4fde9916246468fe.tar.gz gentoo-2a31ee5c821ef947ead4503e4fde9916246468fe.tar.bz2 gentoo-2a31ee5c821ef947ead4503e4fde9916246468fe.zip | |
qt5-build.eclass: Drop obsolete pre-Qt-5.15 quirks
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index cb385ea21ed9..ad7f6a64a447 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -185,7 +185,7 @@ 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 + if [[ ${QT5_MODULE} == qttools ]] && [[ -z ${QT5_TARGET_SUBDIRS[@]} ]]; then qt5_tools_configure fi @@ -564,8 +564,7 @@ qt5_base_configure() { # bug 672340 -no-xkbcommon - $([[ ${QT5_MINOR_VERSION} -lt 15 ]] && echo -no-xcb-xinput) - $([[ ${QT5_MINOR_VERSION} -ge 15 ]] && echo -no-bundled-xcb-xinput) + -no-bundled-xcb-xinput # cannot use -no-gif because there is no way to override it later #-no-gif @@ -610,10 +609,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 - # disable undocumented X11-related flags, override in qtgui - # (not shown in ./configure -help output) - $([[ ${QT5_MINOR_VERSION} -lt 15 ]] && echo -no-xkb) - # always enable session management support: it doesn't need extra deps # at configure time and turning it off is dangerous, see bug 518262 -sm |