make qmake module path configurable separately
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Mon, 14 May 2012 13:24:25 +0000 (15:24 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tue, 19 Jun 2012 14:40:01 +0000 (16:40 +0200)
this is needed by webkit's creative directory layout.

Change-Id: I2317162c11696d2820423d63563b10d3024a6cb6
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
mkspecs/features/default_pre.prf

index a88605b..b7f31c4 100644 (file)
@@ -7,7 +7,10 @@ CONFIG = lex yacc warn_on debug exceptions $$CONFIG
     exists($$QTDIR/.qmake.cache) {
         QTFWD = -module-fwd $$QTDIR/mkspecs/modules -developer-build
     } else {
-        QTFWD = -module-fwd $$OUT_PWD/mkspecs/modules -cache-module-fwd
+        isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$OUT_PWD
+        modpath = $$MODULE_QMAKE_OUTDIR/mkspecs/modules
+        QTFWD = -module-fwd $$modpath -cache-module-fwd
+        unset(modpath)
     }
 
     qtPrepareTool(QMAKE_SYNCQT, syncqt)