diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2012-03-07 21:36:28 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-13 11:45:10 +0000 |
| commit | 7b6cd925d445bf69373bb9f33d90317ca8bc1a80 (patch) | |
| tree | 2077165705f15d40db010b500b358cc14fab0662 /meta/recipes-qt/qt4/qt4-x11-free.inc | |
| parent | 1a61109d0305725af9c7ff0fc8a7f14078ca2ff8 (diff) | |
| download | poky-7b6cd925d445bf69373bb9f33d90317ca8bc1a80.tar.gz | |
qt4: fix deps in libQtWebkit.la and QtWebKit.pc
* Both files contain -L../../WebCore/release -L../../JavaScriptCore/release -lwebcore -ljscore
* These paths and libs don't get installed.
* When building a shared lib with libtool, that links
with libQtWebKit, libtool adds these unneeded parameters
to the linker command-line, thus linking fails.
(From OE-Core rev: 4c41a3204ef72f53813ddc86fe525fa9c6714daa)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
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 75487f756b..56f349a31b 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 = "r38" | 8 | INC_PR = "r39" |
| 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" |