From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 23 Sep 2010 08:45:46 +0000 (+0200)
Subject: SHR: prefer QT 4.7.0
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bafea11a8e5e5aea4f16789a780ca9f491f94ebe;p=openembedded.git

SHR: prefer QT 4.7.0

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 0319ec316a..3bfb1fe5bf 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -46,7 +46,7 @@ PREFERRED_VERSION_openssl-native = "1.0.0a"
 UDEV_GE_141 = "1"
 
 PREFERRED_VERSION_postgresql = "8.4.4"
-ANGSTROM_QT_VERSION ?= "4.6.3+4.7.0-beta2"
+ANGSTROM_QT_VERSION ?= "4.7.0"
 PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}"
 PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}"
 PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}"