summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <abcd@gentoo.org>2012-02-04 18:49:55 -0500
committerJonathan Callen <abcd@gentoo.org>2012-02-04 18:49:55 -0500
commit0d4a36892a12b23b1eed860793d26fee30bf36ef (patch)
tree2314c63c3e0e1d849681282eb08e0a6fb9b3164a
parent5b5ce3282bfb45bce44f5f7105e46322aa09ba10 (diff)
downloadkde-0d4a36892a12b23b1eed860793d26fee30bf36ef.tar.gz
kde-0d4a36892a12b23b1eed860793d26fee30bf36ef.tar.bz2
kde-0d4a36892a12b23b1eed860793d26fee30bf36ef.zip
[eclass] Upstream now effectively requires Qt 4.8 for KDE 4.9+
-rw-r--r--eclass/kde4-base.eclass5
1 files changed, 4 insertions, 1 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index e85b3750c8b..e622f375847 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -199,7 +199,10 @@ esac
# @ECLASS-VARIABLE: QT_MINIMAL
# @DESCRIPTION:
# Determine version of qt we enforce as minimal for the package.
-if version_is_at_least 4.7.80 "${KDE_MINIMAL}"; then
+if version_is_at_least 4.8.50 "${KDE_MINIMAL}"; then
+ # Upstream has added an *undeclared* dependency on Qt 4.8...
+ QT_MINIMAL="${QT_MINIMAL:-4.8.0}"
+elif version_is_at_least 4.7.80 "${KDE_MINIMAL}"; then
QT_MINIMAL="${QT_MINIMAL:-4.7.4}"
else
QT_MINIMAL="${QT_MINIMAL:-4.7.0}"