diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-12-01 16:46:14 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-12-09 12:22:36 +0000 |
commit | c4a0a450b4275cc3869cf389c92e86b62f09fcea (patch) | |
tree | 6705cbb48ae3d433639bad3e78e239d210e13dee /classes | |
parent | 4e113c7b8e0a7512d2f0ad306decc8b4885ef807 (diff) |
qt5: update submodules
New configuration system is now used for more modules, so add new
EXTRA_QMAKEVARS_CONFIGURE variable that can be used for configure
modules with -[no-]feature flags.
SHA1s are now from the release 5.8.0 branches, so need to add "nobranch=1"
option so that there is no build break when release branches are removed.
Add recipe for QtGamepad module, it's already used by Qt3D.
Change-Id: I152b3b66b68c802d07445f4a7f1e81802308418e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/qmake5_base.bbclass | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 3da8e655..50e5a306 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -162,11 +162,16 @@ qmake5_base_do_configure () { bbnote "qmake prevar substitution: '${EXTRA_QMAKEVARS_PRE}'" fi + if [ ! -z "${EXTRA_QMAKEVARS_CONFIGURE}" ]; then + QMAKE_VARSUBST_CONFIGURE="${EXTRA_QMAKEVARS_CONFIGURE}" + bbnote "qmake configure substitution: '${EXTRA_QMAKEVARS_CONFIGURE}'" + fi + # for config.tests to read this export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}" - CMD="${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_QTCONF} ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST" - ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_QTCONF} ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling $CMD" + CMD="${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_QTCONF} ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST -- $QMAKE_VARSUBST_CONFIGURE" + ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_QTCONF} ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST -- $QMAKE_VARSUBST_CONFIGURE || die "Error calling $CMD" } qmake5_base_native_do_install() { |