summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2010-07-08 14:25:58 +0200
committerMaciej Mrozowski <reavertm@gentoo.org>2010-07-08 14:25:58 +0200
commitca96acd767fc801e96b0f116ea3e90729edc90ef (patch)
tree4aad431a9130de308aeca03e56c334022a765f8c
parente58a19d0f80ec8d5055461cdd8e654607180a368 (diff)
downloadkde-ca96acd767fc801e96b0f116ea3e90729edc90ef.tar.gz
kde-ca96acd767fc801e96b0f116ea3e90729edc90ef.tar.bz2
kde-ca96acd767fc801e96b0f116ea3e90729edc90ef.zip
[eclass/kde4-base] Raise Qt dependencies for KDE SC 4.5 to Qt-4.6.3 (known dbus menu bug)
-rw-r--r--eclass/kde4-base.eclass12
1 files changed, 7 insertions, 5 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index a819efe9ca7..d9435bfbc6a 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -188,14 +188,16 @@ esac
# @ECLASS-VARIABLE: QT_MINIMAL
# @DESCRIPTION:
# Determine version of qt we enforce as minimal for the package. 4.4.0 4.5.1..
-# Currently defaults to 4.5.1 for KDE 4.3 and earlier
-# or 4.6.0 for KDE 4.4 and later
-if slot_is_at_least 4.4 "${KDE_MINIMAL}"; then
+# Currently defaults to 4.5.1 for KDE 4.3 and earlier, 4.6.0 for KDE 4.4 and
+# later and 4.6.3 for KDE 4.5 and later.
+if slot_is_at_least 4.5 "${KDE_MINIMAL}"; then
+ QT_MINIMAL="${QT_MINIMAL:-4.6.3}"
+elif slot_is_at_least 4.4 "${KDE_MINIMAL}"; then
QT_MINIMAL="${QT_MINIMAL:-4.6.0}"
+else
+ QT_MINIMAL="${QT_MINIMAL:-4.5.1}"
fi
-QT_MINIMAL="${QT_MINIMAL:-4.5.1}"
-
# OpenGL dependencies
qtopengldepend="
>=x11-libs/qt-opengl-${QT_MINIMAL}:4