From: Ming Liu <[email protected]> QT_EDITION defaults to 'opensource', but the end users could override it with 'commercial' if they want.
Signed-off-by: Ming Liu <[email protected]> --- conf/layer.conf | 1 + recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 7eb3b2d..7751ce2 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -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" diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 33be99e..3aeb2ab 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -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 \ diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 4c6b701..597b45e 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -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() { diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 4e8dc4c..e2784d8 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -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} \ -- 2.7.4 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
