summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-09-26 22:12:55 +0200
committerKoen Kooi <koen@openembedded.org>2010-09-26 22:12:55 +0200
commitd95fcc5d0c67c905924f909682aa7bbd770236a1 (patch)
tree501dbff33d9f5f0a3be805ba342fe7b481802e27 /conf
parent04773f5ff645f7c91c6bb1f3c5541194ba8caf23 (diff)
downloadopenembedded-d95fcc5d0c67c905924f909682aa7bbd770236a1.tar.gz
angstrom-next: switch to QT 4.7.0
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/angstrom-2010-preferred-versions.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/conf/distro/include/angstrom-2010-preferred-versions.inc b/conf/distro/include/angstrom-2010-preferred-versions.inc
index 5c190229de..f0a0a9fc5b 100644
--- a/conf/distro/include/angstrom-2010-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2010-preferred-versions.inc
@@ -1,5 +1,5 @@
ANGSTROM_MESA_VERSION = "7.8.2"
-ANGSTROM_QT_VERSION ?= "4.6.3"
+ANGSTROM_QT_VERSION ?= "4.7.0"
CE_VERSION ?= "2.25.01"
require conf/distro/include/angstrom-codec-engine-${CE_VERSION}-preferred-versions.inc
@@ -39,6 +39,7 @@ PREFERRED_VERSION_mythtv = "0.22"
PREFERRED_VERSION_mplayer = "0.0+1.0rc3+svnr30165"
PREFERRED_VERSION_network-manager-applet = "0.8.1"
PREFERRED_VERSION_networkmanager = "0.8.1"
+PREFERRED_VERSION_networkmanager-openvpn = "0.8.1"
PREFERRED_VERSION_openssl = "1.0.0a"
PREFERRED_VERSION_openssl-native = "1.0.0a"
PREFERRED_VERSION_pango = "1.24.4"