From a56ef02b2d7b57bf06bd166a6d4fbad49c65872b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 2 Apr 2012 18:59:24 +0200 Subject: let default_pre add modules to the qmake path that way qmake is made aware of the forwarding pris which are generated for this module even when a top-level .qmake.cache prevents the module's root from being found automatically. the path is also added to the cache, so that subsequent partial qmake-ing of the tree will still find the module. this also makes the -cache-module-fwd parameter of syncqt useless, so remove it. Change-Id: I2afbc52a465c0b3260e9bcaf032c43a82ae8061f Reviewed-by: Joerg Bornemann --- mkspecs/features/default_pre.prf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mkspecs/features/default_pre.prf') diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 3f6e7afea1..65bd1da7c1 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -9,7 +9,9 @@ CONFIG = lex yacc warn_on debug exceptions $$CONFIG } else { isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$OUT_PWD modpath = $$MODULE_QMAKE_OUTDIR/mkspecs/modules - QTFWD = -module-fwd $$modpath -cache-module-fwd + QTFWD = -module-fwd $$modpath + !isEmpty(_QMAKE_SUPER_CACHE_):!contains(QMAKEMODULES, $$modpath): \ + cache(QMAKEMODULES, add super, modpath) unset(modpath) } -- cgit v1.2.3