AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

write forwarding pris to $outpath/mkspecs/modules

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-04-02 17:04:01 +02:00
parent 4aef57e02c
commit 45711a8b73
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/syncqt
View File

@ -1249,13 +1249,10 @@ foreach my $lib (@modules_to_sync) {
close MODULE_PRI_FILE;
utime(time, (stat($modulepri))[9], $moduleprifwd);
if ($cache_module_fwd) {
my $cacheStatement = "QMAKE_EXTRA_MODULE_FORWARDS = \"$module_fwd\"";
my $cacheFile = "$out_basedir/.qmake.cache";
my $existingQmakeCache = fileContents($cacheFile);
# Skip if it's already there.
if ($existingQmakeCache !~ $cacheStatement) {
if (!-f $cacheFile) {
open QMAKE_CACHE_FILE, ">>$cacheFile" or die("Could not open $cacheFile for writing");
print QMAKE_CACHE_FILE "$cacheStatement\n";
close(QMAKE_CACHE_FILE);
}
}

2
mkspecs/features/default_pre.prf
View File

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

12
mkspecs/features/qt_config.prf
View File

@ -1,19 +1,11 @@
# This file is loaded by the mkspecs, before .qmake.cache has been loaded.
# Consequently, we have to do some stunts to get values out of the cache.
exists($$_QMAKE_CACHE_) {
QMAKE_EXTRA_MODULE_FORWARDS = $$fromfile($$_QMAKE_CACHE_, QMAKE_EXTRA_MODULE_FORWARDS)
}
QMAKE_QT_CONFIG = $$[QT_HOST_DATA/get]/mkspecs/qconfig.pri
!exists($$QMAKE_QT_CONFIG)|!include($$QMAKE_QT_CONFIG, "", true) {
debug(1, "Cannot load qconfig.pri!")
} else {
debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)")
for(dir, $$list($$unique($$list($$replace($$list($$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR)), \
$, /modules) \
$$QMAKE_EXTRA_MODULE_FORWARDS)))) {
for(dir, $$list($$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR))) {
debug(1, "Loading modules from $${dir}")
for(mod, $$list($$files($$dir/qt_*.pri))) {
for(mod, $$list($$files($$dir/modules/qt_*.pri))) {
# For installed Qt these paths will be common for all modules
# For development these will vary per module, and syncqt will override the value in the
# qt_<module>.pri forwarding file