summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-01-06 12:22:16 +0800
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-01-07 11:21:46 +0100
commitd27fb2aec799ec77bb645541d7bd3fc9aa63529d (patch)
tree44d3696830616bf9d146e228cceb65d49cb98ace /conf
parent2bc2e6b801236fe9768da3be3711e60b44753bb1 (diff)
qt4x11: Cease out the qt4x11 PROVIDER
* The LGPL and Commercial edition are actually the same tarball. * If someone sees the need he can take qt qt4-recipes and specify -commercial in the compilation.
Diffstat (limited to 'conf')
-rw-r--r--conf/compatibility-providers.conf2
-rw-r--r--conf/distro/kaeilos.conf4
2 files changed, 1 insertions, 5 deletions
diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf
index 10a81f2943..61a373003c 100644
--- a/conf/compatibility-providers.conf
+++ b/conf/compatibility-providers.conf
@@ -47,7 +47,7 @@ PREFERRED_PROVIDER_openmoko-alsa-scenarios ?= "alsa-scenarii-shr"
PREFERRED_PROVIDER_opkg ?= "opkg"
#PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
PREFERRED_PROVIDER_qemu-native ?= "qemu-native"
-PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
+PREFERRED_PROVIDER_qt4-x11-free ?= "qt4-x11-free"
PREFERRED_PROVIDER_task-bootstrap ?= "task-bootstrap"
PREFERRED_PROVIDER_tslib-conf ?= "tslib"
PREFERRED_PROVIDER_tslib ?= "tslib"
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index 4d790f4e1f..03595dba1d 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -182,10 +182,6 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+"
PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
-# QT stuff:
-# There are several flavours of qt4x11 in OE, so lets pick one that is buildable for everyone
-PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
-
#Silence a warning during parsing
PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"