diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-02 17:04:01 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:40:01 +0200 |
commit | 45711a8b73c170c0a145a4dbcb24c91d6446a19d (patch) | |
tree | 40aa443ffc83d41507aad2b55bd812dde5dd138b /mkspecs/features/default_pre.prf | |
parent | 4aef57e02c2caf980dcfb98064bf0a3cebc4f38d (diff) |
write forwarding pris to $outpath/mkspecs/modules
this makes qmake find them automatically now.
consequently, also do not write QMAKE_EXTRA_MODULE_FORWARDS to
.qmake.cache. still write the cache file, though, as otherwise a
top-level cache would mess up the module root detection.
Change-Id: I998b94fcc73ca3f8bf1af09a394ff8d40cf1fb76
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'mkspecs/features/default_pre.prf')
-rw-r--r-- | mkspecs/features/default_pre.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 18d0d5f560..a88605b2b7 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -7,7 +7,7 @@ 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/module-paths/modules -cache-module-fwd + QTFWD = -module-fwd $$OUT_PWD/mkspecs/modules -cache-module-fwd } qtPrepareTool(QMAKE_SYNCQT, syncqt) |