summaryrefslogtreecommitdiff
path: root/conf/distro/include/preferred-shr-versions.inc
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro/include/preferred-shr-versions.inc')
-rw-r--r--conf/distro/include/preferred-shr-versions.inc11
1 files changed, 10 insertions, 1 deletions
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index fd83e02afe..39b1f0764e 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -17,7 +17,7 @@ PREFERRED_VERSION_classpath-native = "0.98"
PREFERRED_VERSION_linux-libc-headers = "2.6.31"
# override EFL_SRCREV from sane-srcrevs.inc
-EFL_SRCREV ?= "44424"
+# EFL_SRCREV ?= "44424"
# specifically set an openssh version
# NOTE: whenever changing the version here make sure
@@ -36,6 +36,15 @@ PREFERRED_VERSION_usbutils = "0.82"
PREFERRED_VERSION_wpa-supplicant = "0.6.9"
UDEV_GE_141 = "1"
+ANGSTROM_QT_VERSION ?= "4.6.0"
+PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded-gles = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}"
+
+
# Downgraded
# python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py
PREFERRED_VERSION_python-pygtk = "2.10.4"