summaryrefslogtreecommitdiff
path: root/meta/recipes-qt/qt4
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-03-16 18:54:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-19 13:31:33 +0000
commit9ba01c3b7ce3d9f822e1cc08cd032e019a15180f (patch)
tree4dccc28ed485973e56b7f2f75061a16c1fabdb14 /meta/recipes-qt/qt4
parente447c5dcbab8a765d7c35558a240fff17fcc7ea4 (diff)
downloadopenembedded-core-9ba01c3b7ce3d9f822e1cc08cd032e019a15180f.tar.gz
openembedded-core-9ba01c3b7ce3d9f822e1cc08cd032e019a15180f.tar.bz2
openembedded-core-9ba01c3b7ce3d9f822e1cc08cd032e019a15180f.tar.xz
openembedded-core-9ba01c3b7ce3d9f822e1cc08cd032e019a15180f.zip
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4')
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4.inc3
3 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 0e57e5ad9..8c15352ff 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
SECTION = "libs"
HOMEPAGE = "http://qt.nokia.com"
DEPENDS += "directfb tslib"
-INC_PR = "r42"
+INC_PR = "r43"
QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index e1bef642a..072c522d4 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"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r40"
+INC_PR = "r41"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 7f1f6f07b..468a46ff7 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -155,6 +155,9 @@ RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \
RRECOMMENDS_${QT_BASE_NAME}-doc += " \
${QT_BASE_NAME}-demos-doc"
+RPROVIDES_${QT_BASE_NAME}-tools += "qmake2"
+RREPLACES_${QT_BASE_NAME}-tools += "qmake2"
+
FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc* ${bindir}/qmake ${bindir}/moc ${bindir}/uic* ${bindir}/rcc"
FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc* ${bindir}/.debug/qmake ${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc"
FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator"