summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJingdong Lu <jingdong.lu@windriver.com>2010-12-03 17:13:29 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-12-10 21:57:08 -0800
commit0e4df9592b32308c27876897389f9091aec918d8 (patch)
tree60f567750866e4a4fbbfd0ff118e184f8fb77cae /meta
parent4806041a85b766e1f95cc282e43aef718354a536 (diff)
downloadpoky-0e4df9592b32308c27876897389f9091aec918d8.tar.gz
Enable '-opengl' option for qt4 in order to generate libQtOpenGL.so
qt4-x11-free: Only build opengl for x86 platforms since only these have GL support at present [sgw@linux.intel.com: merged and fixed Signed-off-bys] Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc3
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb2
2 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 352df1e5a7..22eef7c0eb 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,6 +5,9 @@ PRIORITY = "optional"
5DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 5DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
6 6
7QT_GLFLAGS ?= "-no-opengl" 7QT_GLFLAGS ?= "-no-opengl"
8QT_GLFLAGS_qemux86 = "-opengl"
9QT_GLFLAGS_emenlow = "-opengl"
10QT_GLFLAGS_atom-pc = "-opengl"
8QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}" 11QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}"
9QT_BASE_NAME ?= "qt4" 12QT_BASE_NAME ?= "qt4"
10QT_BASE_LIB ?= "libqt" 13QT_BASE_LIB ?= "libqt"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
index a6eb0cdd54..0a03e9b5a3 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
@@ -1,7 +1,7 @@
1require qt4-x11-free.inc 1require qt4-x11-free.inc
2require qt-4.6.3.inc 2require qt-4.6.3.inc
3 3
4PR = "r0" 4PR = "r1"
5 5
6QT_CONFIG_FLAGS += " -xrandr " 6QT_CONFIG_FLAGS += " -xrandr "
7 7