From: Koen Kooi <k-kooi@ti.com>
Date: Fri, 18 Dec 2009 10:10:09 +0000 (+0100)
Subject: angstrom: switch to qt 4.6.0
X-Git-Tag: Release-2010-05/1~1229
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dea6574eb714f0daeb3cdaa99dd7970ca31da03f;p=openembedded.git

angstrom: switch to qt 4.6.0
---

diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 790b08e3bc..34affad46a 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,3 +1,5 @@
+ANGSTROM_QT_VERSION ?= "4.6.0"
+
 PREFERRED_VERSION_autoconf = "2.63"
 PREFERRED_VERSION_autoconf-native = "2.63"
 PREFERRED_VERSION_automake-native = "1.10.2"
@@ -31,6 +33,13 @@ PREFERRED_VERSION_pkgconfig	= "0.23"
 PREFERRED_VERSION_pkgconfig-native = "0.23"
 PREFERRED_VERSION_pulseaudio 	= "0.9.15"
 PREFERRED_VERSION_python = "2.6.2"
+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}"
+
 PREFERRED_VERSION_samba		= "3.3.9"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"