summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-05-14 15:24:25 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-19 16:40:01 +0200
commit10075973e2fcde59f76d5ab8184b746898477b2d (patch)
tree0e1d62926bf579ea9a4e5f58d61a7a3055ab307e /mkspecs
parent45711a8b73c170c0a145a4dbcb24c91d6446a19d (diff)
make qmake module path configurable separately
this is needed by webkit's creative directory layout. Change-Id: I2317162c11696d2820423d63563b10d3024a6cb6 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/default_pre.prf5
1 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf
index a88605b2b7..b7f31c4c21 100644
--- a/mkspecs/features/default_pre.prf
+++ b/mkspecs/features/default_pre.prf
@@ -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)