qt5-build.eclass: create a forwarding header for qtbase

Since 5.8, the build system no longer creates a forwarding header causing the
system config to be used instead of what was passed to configure.

Gentoo-bug: 599636

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b6c211bcad71690af66475bf149b93f619388926..ef6865ba3377ee78ab5481bf2c791344b7f8c51f 100644 (file)
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -679,7 +679,14 @@ qt5_base_configure() {
        einfo "Configuring with: ${conf[@]}"
        "${S}"/configure "${conf[@]}" || die "configure failed"
 
+       if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then
+               # a forwarding header is no longer created since 5.8, causing the system
+               # config to always be used. bug 599636
+               cp src/corelib/global/qconfig.h include/QtCore/ || die
+       fi
+
        popd >/dev/null || die
+
 }
 
 # @FUNCTION: qt5_qmake