diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-02-04 11:29:38 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-02-05 11:05:51 +0100 |
| commit | 451c5cd71087077d2f09a539845caecaf2a2fa38 (patch) | |
| tree | 4ac53b18a3490b8fedc46082885831b9f2cb9afa /meta-oe/recipes-qt | |
| parent | 26f4012c8774d94c2317d916000fbcb1452fd55e (diff) | |
| download | meta-openembedded-451c5cd71087077d2f09a539845caecaf2a2fa38.tar.gz | |
qconnman: use RCONFLICTS correctly
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-qt')
| -rw-r--r-- | meta-oe/recipes-qt/qconnman/qconnman-e_git.bb | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-qt/qconnman/qconnman_git.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb b/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb index 2fcd3da02..1033bf241 100644 --- a/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb +++ b/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require qconnman.inc | 1 | require qconnman.inc |
| 2 | 2 | ||
| 3 | RCONFLICTS = "qconnman" | 3 | RCONFLICTS_${PN} = "qconnman" |
| 4 | 4 | ||
| 5 | inherit qt4e | 5 | inherit qt4e |
| 6 | 6 | ||
diff --git a/meta-oe/recipes-qt/qconnman/qconnman_git.bb b/meta-oe/recipes-qt/qconnman/qconnman_git.bb index 9f03b90af..d298cb521 100644 --- a/meta-oe/recipes-qt/qconnman/qconnman_git.bb +++ b/meta-oe/recipes-qt/qconnman/qconnman_git.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require qconnman.inc | 1 | require qconnman.inc |
| 2 | 2 | ||
| 3 | RCONFLICTS = "qconnman-e" | 3 | RCONFLICTS_${PN} = "qconnman-e" |
| 4 | 4 | ||
| 5 | inherit qt4x11 | 5 | inherit qt4x11 |
| 6 | 6 | ||