diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-03-16 18:54:02 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-19 14:37:42 +0000 |
| commit | 4c263823977c911900e9a9c016c6ee78262603e5 (patch) | |
| tree | 8cb62847974ef6e1a4c8846a6788121eafbb5939 /meta/recipes-qt/qt4/qt4-x11-free.inc | |
| parent | d3c6832e32fdfa3b7819b5db6d647a84f8cca2cd (diff) | |
| download | poky-4c263823977c911900e9a9c016c6ee78262603e5.tar.gz | |
qt4: add RPROVIDES/RREPLACES for qmake2 recipe
OE-Classic and meta-oe provide a qmake2 recipe; since this has been
obsoleted by the recent change to provide qmake within the tools package
and (in the latter case) will soon be removed, add an RREPLACES to aid
upgrades and RPROVIDES to make it easy to install.
(From OE-Core rev: 9ba01c3b7ce3d9f822e1cc08cd032e019a15180f)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
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 e1bef642a6..072c522d43 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 = "r40" | 8 | INC_PR = "r41" |
| 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" |