diff options
| author | Simon Busch <morphis@gravedo.de> | 2011-09-25 14:57:43 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:37:50 +0000 |
| commit | 84865e45ea5d01554204966a2e7b024ca436d473 (patch) | |
| tree | dd25b9af0bcabaed63e17a8392d9822bf6a0a824 /meta/recipes-qt/qt4/qt4-x11-free.inc | |
| parent | ae97dbe1dbe4294f7f18a1f2643c3560c3813330 (diff) | |
| download | poky-84865e45ea5d01554204966a2e7b024ca436d473.tar.gz | |
meta: qt4: fix postprocessing of pkg-config files
When building qt4-embedded the generated and cleaned pkg-config files for qt are wrong.
The Cflags variable contains something like ${includedir}/qtopia/QtCore where
${includedir} is already /usr/include/qtopia/QtCore.
This patch reverts the fix up of the Cflags variable implemented in do_install.
(From OE-Core rev: b40b9c024be5e1ec81a31961158b3e6b529acfe0)
(From OE-Core rev: 960318ebd271ad5330a0863047927ab827b5e107)
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-x11-free.inc')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 0a714be87a..a360ec3440 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc | |||
| @@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com" | |||
| 5 | SECTION = "x11/libs" | 5 | SECTION = "x11/libs" |
| 6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" | 6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" |
| 7 | 7 | ||
| 8 | INC_PR = "r27" | 8 | INC_PR = "r28" |
| 9 | 9 | ||
| 10 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " | 10 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " |
| 11 | QT_GLFLAGS_qemux86 = "-opengl" | 11 | QT_GLFLAGS_qemux86 = "-opengl" |