diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-07-31 00:31:00 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-31 07:55:55 +0100 |
| commit | 2be0058fc4acddab611637656183accd052b40eb (patch) | |
| tree | b397d38da763aee75f3703ae1647a06d5182860b /meta/recipes-qt/qt4/qt4-embedded.inc | |
| parent | 8a71c1a507289d38a0f675584ab206abfa9aad9a (diff) | |
| download | openembedded-core-2be0058fc4acddab611637656183accd052b40eb.tar.gz openembedded-core-2be0058fc4acddab611637656183accd052b40eb.tar.bz2 openembedded-core-2be0058fc4acddab611637656183accd052b40eb.zip | |
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 <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-embedded.inc')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index 9c5b4af93d..9e8bf3a0d7 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is SECTION = "libs" HOMEPAGE = "http://qt.nokia.com" DEPENDS += "directfb tslib" -INC_PR = "r46" +INC_PR = "r47" QT_BASE_LIB ?= "libqt-embedded" |