Comments
Patch
@@ -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
@@ -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"
@@ -4,8 +4,9 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
+PROVIDES += "qt4-x11"
-INC_PR = "r44"
+INC_PR = "r45"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
@@ -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
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> --- meta/classes/qt4x11.bbclass | 2 +- meta/recipes-qt/qt4/qt4-embedded.inc | 2 +- meta/recipes-qt/qt4/qt4-x11-free.inc | 3 ++- meta/recipes-qt/qt4/qt4.inc | 7 ++++++- 4 files changed, 10 insertions(+), 4 deletions(-)