From 2be0058fc4acddab611637656183accd052b40eb Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 31 Jul 2012 00:31:00 +0100 Subject: qt4: allow recipes building commercial edition To enable building the commercial edition of Qt (through additional recipes that are *not* provided by OE-Core) we need to tweak a few things: * Don't make recipes that inherit qt4x11.bbclass depend on qt4-x11-free - instead add qt4-x11 to DEPENDS and then have qt4-x11-free include this in its PROVIDES. A commercial equivalent recipe should do the same. * Add a QT_LICENSE_FILE variable that can be used to specify the license file required by the commercial edition. * Add a QT_LICENSE_FLAGS variable which the recipe can set to select the license option being used. The default of "-opensource" retains the current behaviour; a commercial recipe should set it to "-commercial". Fixes [YOCTO #2505]. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/classes/qt4x11.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/qt4x11.bbclass') diff --git a/meta/classes/qt4x11.bbclass b/meta/classes/qt4x11.bbclass index 610397d055..52190f45c1 100644 --- a/meta/classes/qt4x11.bbclass +++ b/meta/classes/qt4x11.bbclass @@ -1,4 +1,4 @@ -DEPENDS_prepend = "${@["qt4-x11-free ", ""][(d.getVar('BPN', True)[:12] == 'qt4-x11-free')]}" +DEPENDS_prepend = "${@base_contains("PROVIDES", "qt4-x11", "", "qt4-x11 ", d)}" inherit qmake2 -- cgit v1.2.3