Skip to contentSkip to conversation

qt4: disable qmeegographicssystemhelper

PATCH In review Paul Eggleton 2 participants 4 messages Jul 3, 2013 – Jul 4, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qt4: disable qmeegographicssystemhelper

We don't want this enabled just because we have EGL and OpenGL ES 2.0 enabled.

---
 meta/recipes-qt/qt4/qt4-4.8.4.inc                  |  1 +
 ...ls.pro-disable-qmeegographicssystemhelper.patch | 28 ++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 meta/recipes-qt/qt4/qt4-4.8.4/0027-tools.pro-disable-qmeegographicssystemhelper.patch
meta/recipes-qt/qt4/qt4-4.8.4.inc +1 -0
index e87dacc..0a8e00b 100644
@@ -26,6 +26,7 @@ SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-sr
            file://0024-Change-all-shmget-calls-to-user-only-memory.patch \
            file://0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch \
            file://0026-Don-t-overwrite-QMAKE_QT_CONFIG-with-empty-value.patch \
+           file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \
            file://g++.conf \
            file://linux.conf \
            "
meta/recipes-qt/qt4/qt4-4.8.4/0027-tools.pro-disable-qmeegographicssystemhelper.patch new file +28 -0
new file mode 100644
index 0000000..6e30aee
@@ -0,0 +1,28 @@
+From 0460e2a5f13aaf0081c3c9fec89280046842ddbb Mon Sep 17 00:00:00 2001
+From: Paul Eggleton <[email protected]>
+Date: Wed, 3 Jul 2013 17:48:30 +0100
+Subject: [PATCH] tools.pro: disable qmeegographicssystemhelper
+
+We don't want this enabled just because we have EGL and OpenGL ES 2.0
+enabled.
+
+Upstream-Status: Inappropriate [config]
+
+Signed-off-by: Paul Eggleton <[email protected]>
+---
+ tools/tools.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/tools.pro b/tools/tools.pro
+index 0e27053..2d3f36d 100644
+--- a/tools/tools.pro
++++ b/tools/tools.pro
+@@ -49,4 +49,4 @@ QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)"
+ 
+ !win32:!embedded:!mac:!symbian:CONFIG += x11
+ 
+-x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper
++#x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper
+-- 
+1.8.1.2
+
Signature · 1 line
1.8.1.2
#2 lore raw
Quoted 9 lines · On Thursday 04 July 2013 10:10:52 Otavio Salvador wrote:

On Wed, Jul 3, 2013 at 2:04 PM, Paul Eggleton

Quoted 4 lines · <[email protected]> wrote:

We don't want this enabled just because we have EGL and OpenGL ES 2.0 enabled.

Agreed; maybe this could be considered for dylan as well?

Sounds reasonable to me; once it's merged to master I will include it in my queue for dylan.

To be honest it would be nice if it were fixed properly upstream; building it based on the conditional given seems wrong.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#3 lore raw
Quoted 9 lines · Paul Eggleton
Quoted 8 lines · On Thursday 04 July 2013 10:10:52 Otavio Salvador wrote:

On Wed, Jul 3, 2013 at 2:04 PM, Paul Eggleton

Quoted 4 lines · <[email protected]> wrote:

We don't want this enabled just because we have EGL and OpenGL ES 2.0 enabled.

Quoted 7 lines
Quoted 1 line

Agreed; maybe this could be considered for dylan as well?

Sounds reasonable to me; once it's merged to master I will include it in my queue for dylan.

To be honest it would be nice if it were fixed properly upstream; building it based on the conditional given seems wrong.

I fully agree but until it is fixed (if it is ever fixed) your patch seems the way to go! :-)

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750