From e6663ffa5ffe2ac388a1b40c0fd0cddb055b8731 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 2 Oct 2012 23:26:09 +0100
Subject: qt4: Avoid circular dependencies with multilib

Without this, circular dependencies are found when attempting to build
multilib versions of qt4 (or bitbake world in a multilib enabled build).

(From OE-Core rev: b2e8cc5ae227656211fb7f32260e7dc4e2fb556e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/qt4e.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'meta/classes/qt4e.bbclass')

diff --git a/meta/classes/qt4e.bbclass b/meta/classes/qt4e.bbclass
index 05c24efaa1..de2a68d25b 100644
--- a/meta/classes/qt4e.bbclass
+++ b/meta/classes/qt4e.bbclass
@@ -1,4 +1,5 @@
-DEPENDS_prepend = "${@["qt4-embedded ", ""][(d.getVar('PN', True)[:12] == 'qt4-embedded')]}"
+QT4EDEPENDS ?= "qt4-embedded "
+DEPENDS_prepend = "${QT4EDEPENDS}"
 
 inherit qmake2
 
-- 
cgit v1.2.3-54-g00ecf