qt4-x11-free.inc: Do not override the var set by qt4-x11-free-gles

Another attempt to fix the dependencies of qt4-x11-free-gles. Do not
make libqt4-FOO-dev depend on qt4-x11-free-gles which will drag in
more dependencies.

A better fix would be to build the OpenVG graphicsengine unconditionally
and build the screendriver out of this tree and install it as a plugin.

Do the same change to qt4-embedded.inc.

diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index 962233efb1da7e4e2db2b74ebe8bebedac0be789..95b770a5a4a2c2d33235ea7ec2c24435ebe752ca 100644 (file)
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -6,8 +6,8 @@ HOMEPAGE = "http://www.trolltech.com"
 DEPENDS += "directfb tslib"
 INC_PR = "r14"
 
-QT_BASE_NAME = "qt4-embedded"
-QT_BASE_LIB  = "libqt-embedded"
+QT_BASE_NAME ?= "qt4-embedded"
+QT_BASE_LIB  ?= "libqt-embedded"
 QT_DIR_NAME = "qtopia"
 QT_LIBINFIX = "E"
 

diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
index 6ca20561cd46cae883941e02960f76fe437dfe16..59c973f20815880f08c37fe1f291621037380154 100644 (file)
--- a/recipes/qt4/qt4-x11-free.inc
+++ b/recipes/qt4/qt4-x11-free.inc
@@ -24,8 +24,8 @@ S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
 
 QT_GLFLAGS ?= "-no-opengl"
 QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}"
-QT_BASE_NAME = "qt4"
-QT_BASE_LIB  = "libqt"
+QT_BASE_NAME ?= "qt4"
+QT_BASE_LIB  ?= "libqt"
 QT_DIR_NAME = "qt4"
 QT_LIBINFIX = ""