summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eclass/qt5-build.eclass7
1 files changed, 7 insertions, 0 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b6c211bcad71..ef6865ba3377 100644
--- 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