commit:     2a31ee5c821ef947ead4503e4fde9916246468fe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 14:29:52 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 16:15:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a31ee5c

qt5-build.eclass: Drop obsolete pre-Qt-5.15 quirks

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index cb385ea21ed..ad7f6a64a44 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

Reply via email to