5d85af61b7
Following patches are removed since they are upstreamed: - qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch - qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch Remove "-nomake demos" from configure options since "demos" directory is merged into examples. Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com> Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From cbffa1e467a4c8b9e8061364b69e250b23fb7b59 Mon Sep 17 00:00:00 2001
|
||
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
|
||
Date: Sun, 15 Sep 2013 11:15:33 +0300
|
||
Subject: [PATCH] xcb: Add egl cflags when opengles2 is enabled
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
This patch is sent to upstream and applied:
|
||
https://qt.gitorious.org/qt/qtbase/commit/ff7b57bbb936bc86a64aa2a947fa8984adf400c8
|
||
|
||
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
|
||
---
|
||
src/plugins/platforms/xcb/xcb-plugin.pro | 2 +-
|
||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
||
diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro
|
||
index 8299528..bc21afe 100644
|
||
--- a/src/plugins/platforms/xcb/xcb-plugin.pro
|
||
+++ b/src/plugins/platforms/xcb/xcb-plugin.pro
|
||
@@ -73,7 +73,7 @@ contains(QT_CONFIG, xcb-render) {
|
||
contains(QT_CONFIG, opengl) {
|
||
contains(QT_CONFIG, opengles2) {
|
||
DEFINES += XCB_USE_EGL
|
||
- LIBS += -lEGL
|
||
+ CONFIG += egl
|
||
HEADERS += qxcbeglsurface.h
|
||
|
||
# EGL on MeeGo 1.2 Harmattan needs this macro to map EGLNativeDisplayType
|
||
--
|
||
1.7.10.4
|
||
|