From 58c439ad105d6fdcb71713206a7141e40650efee Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Mon, 4 Feb 2013 11:29:38 +0000
Subject: [PATCH] qconnman: use RCONFLICTS correctly

(From meta-openembedded rev: 451c5cd71087077d2f09a539845caecaf2a2fa38)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---
 meta-openembedded/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb | 2 +-
 meta-openembedded/meta-oe/recipes-qt/qconnman/qconnman_git.bb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-openembedded/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb b/meta-openembedded/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb
index 2fcd3da..1033bf2 100644
--- a/meta-openembedded/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb
+++ b/meta-openembedded/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb
@@ -1,6 +1,6 @@
 require qconnman.inc
 
-RCONFLICTS = "qconnman"
+RCONFLICTS_${PN} = "qconnman"
 
 inherit qt4e
 
diff --git a/meta-openembedded/meta-oe/recipes-qt/qconnman/qconnman_git.bb b/meta-openembedded/meta-oe/recipes-qt/qconnman/qconnman_git.bb
index 9f03b90..d298cb5 100644
--- a/meta-openembedded/meta-oe/recipes-qt/qconnman/qconnman_git.bb
+++ b/meta-openembedded/meta-oe/recipes-qt/qconnman/qconnman_git.bb
@@ -1,6 +1,6 @@
 require qconnman.inc
 
-RCONFLICTS = "qconnman-e"
+RCONFLICTS_${PN} = "qconnman-e"
 
 inherit qt4x11
 
-- 
2.7.4