diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-18 10:50:10 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 03:41:41 +0200 |
commit | 1317419aa25b50e262ecfadf579ad753b720a13e (patch) | |
tree | 5e61f7f24134f17bd1f09fabf903f1acae35c2b5 | |
parent | 7c0959338e4ac385a5b23c5be2ab5972994ac4ca (diff) |
create top-level .qmake.super instead of .qmake.cache
at this point, the cache is needed only to aggregate the modules,
not to "export" qtbase internals. the modules now have private caches
for "real" config data.
Change-Id: I4c70d220bbc054023710680545a04c171e238aff
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rwxr-xr-x | configure | 4 | ||||
-rw-r--r-- | qt.pro | 3 |
2 files changed, 3 insertions, 4 deletions
@@ -108,9 +108,5 @@ if (! -e ".qmake.cache") { chdir("$outpath"); -open QMAKE_CACHE, ">.qmake.cache" || die "Could not open .qmake.cache for writing!\n"; -print QMAKE_CACHE "include(\$\$PWD/qtbase/.qmake.cache)\n"; -close QMAKE_CACHE; - $ret = system_v("$outpath/qtbase/bin/qmake $relpath/qt.pro"); exit ($ret>>8); @@ -1,3 +1,6 @@ +# Create the super cache so modules will add themselves to it. +cache(, super) + TEMPLATE = subdirs module_qtbase.subdir = qtbase |