lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-24 16:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

create top-level .qmake.super instead of .qmake.cache

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen
2012-05-18 10:50:10 +02:00
committed by Qt by Nokia
parent 7c0959338e
commit 1317419aa2
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@@ -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);

3
qt.pro
View File

@@ -1,3 +1,6 @@
# Create the super cache so modules will add themselves to it.
cache(, super)
TEMPLATE = subdirs
module_qtbase.subdir = qtbase