qtbase: introduce QT_EDITION

QT_EDITION defaults to 'opensource', but the end users could override
it with 'commercial' if they want.

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Ming Liu
2018-01-08 06:52:06 +01:00
committed by Martin Jansa
parent 0fd9104da4
commit f5cb85e629
4 changed files with 4 additions and 3 deletions

View File

@@ -36,3 +36,4 @@ IMAGE_FEATURES[validitems] += "qtcreator-debug"
QT_GIT ?= "git://github.com/qt"
QT_LABS_GIT ?= "git://github.com/qt-labs"
QT_GIT_PROTOCOL ?= "git"
QT_EDITION ?= "opensource"

View File

@@ -103,7 +103,7 @@ deltask generate_qt_config_file
do_configure() {
${S}/configure -v \
-opensource -confirm-license \
-${QT_EDITION} -confirm-license \
-sysroot ${STAGING_DIR_TARGET} \
-no-gcc-sysroot \
-system-zlib \

View File

@@ -103,7 +103,7 @@ do_configure_prepend() {
# Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory"
touch ${S}/mkspecs/oe-device-extra.pri
MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -opensource -confirm-license ${PACKAGECONFIG_CONFARGS} || die "Configuring qt failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}"
MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -${QT_EDITION} -confirm-license ${PACKAGECONFIG_CONFARGS} || die "Configuring qt failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}"
}
do_install() {

View File

@@ -171,7 +171,7 @@ do_configure() {
touch ${S}/mkspecs/oe-device-extra.pri
${S}/configure -v \
-opensource -confirm-license \
-${QT_EDITION} -confirm-license \
-sysroot ${STAGING_DIR_TARGET} \
-prefix ${OE_QMAKE_PATH_PREFIX} \
-bindir ${OE_QMAKE_PATH_BINS} \