commit:     90571f78e8d2fc24aa6d34051a36edde7ddb1efc
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 16:50:38 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 16:50:38 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90571f78

qt5-build.eclass: initial support for Qt 5.6 and 5.7 (dev branch)

Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

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

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index cd4571a..66ba829 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -544,6 +544,7 @@ qt5_base_configure() {
                # disable everything to prevent automagic deps (part 1)
                -no-mtdev
                -no-journald
+               $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-syslog)
                -no-libpng -no-libjpeg
                -no-freetype -no-harfbuzz
                -no-openssl
@@ -559,10 +560,7 @@ qt5_base_configure() {
 
                # disable everything to prevent automagic deps (part 2)
                -no-pulseaudio -no-alsa
-
-               # override in qtgui and qtwidgets where x11-libs/cairo[qt4] is 
blocked
-               # to avoid adding qt4 include paths (bug 433826)
-               -no-gtkstyle
+               $([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -no-gtk || echo 
-no-gtkstyle)
 
                # exclude examples and tests from default build
                -nomake examples
@@ -606,7 +604,8 @@ qt5_base_configure() {
                #-use-gold-linker
 
                # disable all platform plugins by default, override in qtgui
-               -no-xcb -no-eglfs -no-directfb -no-linuxfb -no-kms
+               -no-xcb -no-eglfs -no-kms -no-directfb -no-linuxfb
+               $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-mirclient)
 
                # disable undocumented X11-related flags, override in qtgui
                # (not shown in ./configure -help output)

Reply via email to