From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 14 Jan 2010 23:27:38 +0000 (+0100)
Subject: preferred-shr-versions: prefer QT 4.6 as Angstrom does
X-Git-Tag: Release-2010-05/1~888
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=966ae0bc491e727f4b257c5c3e535f3d20c243ee;p=openembedded.git

preferred-shr-versions: prefer QT 4.6 as Angstrom does

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---

diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index c726e5fdf9..39b1f0764e 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -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"