diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2009-08-09 08:24:10 +0200 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2009-08-09 08:26:30 +0200 |
commit | 8e50ddc4839d4537425132599cb60ba0d5b546cd (patch) | |
tree | ee5b8dc9ffe1c1ce29b7a851fe6ca156e3f05fdb | |
parent | e513208d784ab2df564c9b99031523599aa528c7 (diff) |
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.
-rw-r--r-- | recipes/qt4/qt4-embedded.inc | 4 | ||||
-rw-r--r-- | recipes/qt4/qt4-x11-free.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc index 962233efb1..95b770a5a4 100644 --- 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 6ca20561cd..59c973f208 100644 --- 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 = "" |