summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4.inc1
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0027-tools.pro-disable-qmeegographicssystemhelper.patch28
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4.inc b/meta/recipes-qt/qt4/qt4-4.8.4.inc
index e87daccf5a..0a8e00b16b 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.4.inc
@@ -26,6 +26,7 @@ SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-sr
26 file://0024-Change-all-shmget-calls-to-user-only-memory.patch \ 26 file://0024-Change-all-shmget-calls-to-user-only-memory.patch \
27 file://0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch \ 27 file://0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch \
28 file://0026-Don-t-overwrite-QMAKE_QT_CONFIG-with-empty-value.patch \ 28 file://0026-Don-t-overwrite-QMAKE_QT_CONFIG-with-empty-value.patch \
29 file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \
29 file://g++.conf \ 30 file://g++.conf \
30 file://linux.conf \ 31 file://linux.conf \
31 " 32 "
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0027-tools.pro-disable-qmeegographicssystemhelper.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0027-tools.pro-disable-qmeegographicssystemhelper.patch
new file mode 100644
index 0000000000..6e30aeed02
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0027-tools.pro-disable-qmeegographicssystemhelper.patch
@@ -0,0 +1,28 @@
1From 0460e2a5f13aaf0081c3c9fec89280046842ddbb Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Wed, 3 Jul 2013 17:48:30 +0100
4Subject: [PATCH] tools.pro: disable qmeegographicssystemhelper
5
6We don't want this enabled just because we have EGL and OpenGL ES 2.0
7enabled.
8
9Upstream-Status: Inappropriate [config]
10
11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
12---
13 tools/tools.pro | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/tools/tools.pro b/tools/tools.pro
17index 0e27053..2d3f36d 100644
18--- a/tools/tools.pro
19+++ b/tools/tools.pro
20@@ -49,4 +49,4 @@ QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)"
21
22 !win32:!embedded:!mac:!symbian:CONFIG += x11
23
24-x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper
25+#x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper
26--
271.8.1.2
28