summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-12-28 13:30:38 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-06 12:11:33 +0000
commitec287053967753232575c25f23c1169b87026006 (patch)
treefa6d6ddfed13fd9349d8218c0350f94015713b8c
parent83634c3f809cc186aee7642db9746be96e24fade (diff)
downloadpoky-ec287053967753232575c25f23c1169b87026006.tar.gz
qt4-x11-free.inc: use QT_BASE_NAME from qt4x11.bbclass
(From OE-Core rev: 73fc8f706b08ec74087754eacd2257856fe829d1) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 5b93a984f2..40939deb1c 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,13 +5,12 @@ HOMEPAGE = "http://qt.nokia.com"
5SECTION = "x11/libs" 5SECTION = "x11/libs"
6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
7 7
8INC_PR = "r36" 8INC_PR = "r37"
9 9
10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
11QT_GLFLAGS_qemux86 = "-opengl" 11QT_GLFLAGS_qemux86 = "-opengl"
12QT_GLFLAGS_qemuppc = "-opengl" 12QT_GLFLAGS_qemuppc = "-opengl"
13QT_CONFIG_FLAGS += "-no-xinerama -no-xkb" 13QT_CONFIG_FLAGS += "-no-xinerama -no-xkb"
14QT_BASE_NAME ?= "qt4"
15QT_BASE_LIB ?= "libqt" 14QT_BASE_LIB ?= "libqt"
16 15
17inherit qt4x11 16inherit qt4x11