From d9c741cce23ed6ff741ed67b77f57e04e5b440b8 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Wed, 18 Feb 2015 21:57:57 +0100 Subject: qmake5: don't always look in directories recursively QT needs to be compiled without the -r parameter from the qmake command line. This is necessary to avoid those errors when building qtdeclarative or qt3d without opengl for example: Project ERROR: Unknown module(s) in QT: quick-private or Project ERROR: Unknown module(s) in QT: quick Also update comments regarding the dependencies. Signed-off-by: Alexandre Belloni Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index e7b85e35..44575c4c 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -13,6 +13,9 @@ OE_QMAKE_PLATFORM = "linux-oe-g++" # Add -d to show debug output from every qmake call, but it prints *a lot*, better to add it only to debugged recipe OE_QMAKE_DEBUG_OUTPUT ?= "" +# Look through supplied directories recursively by default +OE_QMAKE_RECURSIVE ?= "-r" + # Paths in .prl files contain SYSROOT value SSTATE_SCAN_FILES += "*.pri *.prl *.prf" @@ -159,8 +162,8 @@ qmake5_base_do_configure () { # for config.tests to read this export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}" - CMD="${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} -r $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST" - ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} -r $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling $CMD" + CMD="${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST" + ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling $CMD" } qmake5_base_do_install() { -- cgit v1.2.3-54-g00ecf