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>

1 files changed, 6 insertions, 1 deletions

diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index df70e09918..9b42f69861 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -192,6 +192,10 @@ FILES_${QT_BASE_NAME}-xmlpatterns-dbg      = "${bindir}/.debug/xmlpatterns*"
 FILES_${QT_BASE_NAME}-qml-plugins          = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*"
 FILES_${QT_BASE_NAME}-qml-plugins-dbg      = "${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/.debug"
 
+# License options, to be set by the recipe if different values are needed
+QT_LICENSE_FILE ?= ""
+QT_LICENSE_FLAGS ?= "-opensource"
+
 do_configure() {
         unset QMAKESPEC
         unset QTDIR
@@ -231,7 +235,7 @@ do_configure() {
 
         ${EXTRA_QMAKE_MUNGE}|| true
 
-        (echo o; echo yes) | ./configure -v \
+        echo yes | QT_LICENSE_FILE="${QT_LICENSE_FILE}" ./configure -v \
                         -prefix ${prefix}/ \
                         -bindir ${bindir} \
                         -libdir ${libdir} \
@@ -248,6 +252,7 @@ do_configure() {
                         -xplatform ${TARGET_OS}-oe-g++ \
                         ${QT_ENDIAN} \
                         -crossarch ${QT_ARCH} \
+                        ${QT_LICENSE_FLAGS} \
                         ${QT_CONFIG_FLAGS} -no-fast \
                         -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \
                         -I${STAGING_INCDIR}/freetype2