[oe-commits] Martin Jansa : preferred-shr-versions: prefer QT 4.6 as Angstrom does
git version control
git at git.openembedded.org
Fri Jan 15 00:17:14 UTC 2010
Module: openembedded.git
Branch: shr/merge
Commit: 966ae0bc491e727f4b257c5c3e535f3d20c243ee
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=966ae0bc491e727f4b257c5c3e535f3d20c243ee
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Fri Jan 15 00:27:38 2010 +0100
preferred-shr-versions: prefer QT 4.6 as Angstrom does
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
conf/distro/include/preferred-shr-versions.inc | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index c726e5f..39b1f07 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"
More information about the Openembedded-commits
mailing list