From 45711a8b73c170c0a145a4dbcb24c91d6446a19d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 2 Apr 2012 17:04:01 +0200 Subject: 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 --- bin/syncqt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'bin/syncqt') diff --git a/bin/syncqt b/bin/syncqt index 03d7ea6525..713f8da9f6 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -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); } } -- cgit v1.2.3