diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-07-03 18:04:37 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-05 15:26:22 +0100 |
| commit | 85aa73d397cb42a2fc8d6f901f8db1d601972741 (patch) | |
| tree | 2188590723bde0923cff600873aa50546867953a /meta/recipes-qt/qt4 | |
| parent | ed585cad2e1fdc323c05fa82055a071bcf98d1bc (diff) | |
| download | openembedded-core-85aa73d397cb42a2fc8d6f901f8db1d601972741.tar.gz openembedded-core-85aa73d397cb42a2fc8d6f901f8db1d601972741.tar.bz2 openembedded-core-85aa73d397cb42a2fc8d6f901f8db1d601972741.zip | |
qt4: disable qmeegographicssystemhelper
We don't want this enabled just because we have EGL and OpenGL ES 2.0
enabled.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.4.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.4/0027-tools.pro-disable-qmeegographicssystemhelper.patch | 28 |
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 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 \ " 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 @@ +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 + |