qt4: allow recipes building commercial edition
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Mon, 30 Jul 2012 23:31:00 +0000 (00:31 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 31 Jul 2012 07:02:09 +0000 (08:02 +0100)
commitbd91b17f2eb4ea08d39a30539be76f827739cec3
tree0137f1c821d066281fe8ce733f99716fb61c75a7
parent6495e6b8946984667c17f95dd0f25ccbb52d4db9
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].

(From OE-Core rev: 2be0058fc4acddab611637656183accd052b40eb)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/qt4x11.bbclass
meta/recipes-qt/qt4/qt4-embedded.inc
meta/recipes-qt/qt4/qt4-x11-free.inc
meta/recipes-qt/qt4/qt4.inc