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>

diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 352df1e..22eef7c 100644 (file)
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,6 +5,9 @@ PRIORITY = "optional"
 DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
 
 QT_GLFLAGS ?= "-no-opengl"
+QT_GLFLAGS_qemux86 = "-opengl"
+QT_GLFLAGS_emenlow = "-opengl"
+QT_GLFLAGS_atom-pc = "-opengl"
 QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}"
 QT_BASE_NAME ?= "qt4"
 QT_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 a6eb0cd..0a03e9b 100644 (file)
--- 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 @@
 require qt4-x11-free.inc
 require qt-4.6.3.inc
 
-PR = "r0"
+PR = "r1"
 
 QT_CONFIG_FLAGS += " -xrandr "