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.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.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 7f1f6f07b1..468a46ff74 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
@@ -155,6 +155,9 @@ RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \ | |||
155 | RRECOMMENDS_${QT_BASE_NAME}-doc += " \ | 155 | RRECOMMENDS_${QT_BASE_NAME}-doc += " \ |
156 | ${QT_BASE_NAME}-demos-doc" | 156 | ${QT_BASE_NAME}-demos-doc" |
157 | 157 | ||
158 | RPROVIDES_${QT_BASE_NAME}-tools += "qmake2" | ||
159 | RREPLACES_${QT_BASE_NAME}-tools += "qmake2" | ||
160 | |||
158 | FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc* ${bindir}/qmake ${bindir}/moc ${bindir}/uic* ${bindir}/rcc" | 161 | FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc* ${bindir}/qmake ${bindir}/moc ${bindir}/uic* ${bindir}/rcc" |
159 | FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc* ${bindir}/.debug/qmake ${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc" | 162 | FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc* ${bindir}/.debug/qmake ${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc" |
160 | FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator" | 163 | FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator" |