qt4: disable qmeegographicssystemhelper
We don't want this enabled just because we have EGL and OpenGL ES 2.0 enabled. (From OE-Core rev: 85aa73d397cb42a2fc8d6f901f8db1d601972741) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
4d326e5edf
commit
470fe27679
|
@ -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 \
|
||||
"
|
||||
|
|
|
@ -0,0 +1,28 @@
|
|||
From 0460e2a5f13aaf0081c3c9fec89280046842ddbb Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
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 <paul.eggleton@linux.intel.com>
|
||||
---
|
||||
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
|
||||
|
Loading…
Reference in New Issue