MIRRORS/meta-freescale-distro
1
0
Fork 0
mirror of https://github.com/Freescale/meta-freescale-distro.git synced 2025-10-22 23:13:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

qt-in-use: Fix RCONFLICTS to be package specific

Browse Source 
Change-Id: Ib1640692ee0da495243335eb618d603164827475
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
Otavio Salvador 2013-02-07 14:02:04 -02:00
parent 723db3f8ea
commit f7b3b3c689
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-qt/qt-in-use/qt-in-industrial-embedded-common.inc
View File

@ -6,7 +6,7 @@ PV = "0.0+gitr${SRCPV}"
SRCREV = "4b10cbfd32391c83251bbc61520eeab03461db0a" SRCREV = "4b10cbfd32391c83251bbc61520eeab03461db0a"
SRC_URI = "git://gitorious.org/qt-in-use/qt-in-industrial-embedded.git" SRC_URI = "git://gitorious.org/qt-in-use/qt-in-industrial-embedded.git"
PR = "r2" PR = "r3"
S = "${WORKDIR}/git/${DEMO}" S = "${WORKDIR}/git/${DEMO}"

2
recipes-qt/qt-in-use/qt-in-industrial-embedded-smarthome-e_git.bb
View File

@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
DEMO = "smarthome" DEMO = "smarthome"
RDEPENDS_${PN} += "${QT_BASE_NAME}-fonts" RDEPENDS_${PN} += "${QT_BASE_NAME}-fonts"
RCONFLICTS = "qt-in-industrial-embedded-smarthome" RCONFLICTS_${PN} = "qt-in-industrial-embedded-smarthome"
inherit qt4e inherit qt4e

2
recipes-qt/qt-in-use/qt-in-industrial-embedded-smarthome_git.bb
View File

@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
DEMO = "smarthome" DEMO = "smarthome"
RCONFLICTS = "qt-in-industrial-embedded-smarthome-e" RCONFLICTS_${PN} = "qt-in-industrial-embedded-smarthome-e"
inherit qt4x11 inherit qt4x11