diff options
| -rwxr-xr-x | bin/syncqt | 16 | ||||
| -rw-r--r-- | mkspecs/features/default_pre.prf | 4 |
2 files changed, 3 insertions, 17 deletions
diff --git a/bin/syncqt b/bin/syncqt index 4b1338ef36..5f8bbe248a 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -102,7 +102,6 @@ my $copy_headers = 0; my $create_uic_class_map = 0; my $create_private_headers = 1; my $module_fwd = ""; -my $cache_module_fwd = 0; my $developer_build = 0; my @modules_to_sync ; $force_relative = 1 if ( -d "/System/Library/Frameworks" ); @@ -138,8 +137,6 @@ sub showUsage print " -private Force copy private headers (default: " . ($create_private_headers ? "yes" : "no") . ")\n"; print " -module-fwd <PATH> Create fwd includes for module pri files in the given\n"; print " path (default: none)\n"; - print " -cache-module-fwd Create a .qmake.cache file to cache the location of the\n"; - print " fwd includes\n"; print " -developer-build Point libraries and binaries to a common directory for\n"; print " easy development\n"; print " -help This help\n"; @@ -621,9 +618,6 @@ while ( @ARGV ) { } elsif($arg eq "-module-fwd") { $var = "module_fwd"; $val = shift @ARGV; - } elsif($arg eq "-cache-module-fwd") { - $var = "cache_module_fwd"; - $val = "yes"; } elsif($arg eq "-developer-build") { $var = "developer_build"; $val = "yes"; @@ -737,8 +731,6 @@ while ( @ARGV ) { } } elsif ($var eq "module_fwd") { $module_fwd = $val; - } elsif ($var eq "cache_module_fwd") { - $cache_module_fwd = 1; } elsif ($var eq "developer_build") { $developer_build = 1; } elsif ($var eq "output") { @@ -1148,14 +1140,6 @@ foreach my $lib (@modules_to_sync) { print MODULE_PRI_FILE "include($modulepri)\n"; close MODULE_PRI_FILE; utime(time, (stat($modulepri))[9], $moduleprifwd); - if ($cache_module_fwd) { - my $cacheFile = "$out_basedir/.qmake.cache"; - # Skip if it's already there. - if (!-f $cacheFile) { - open QMAKE_CACHE_FILE, ">>$cacheFile" or die("Could not open $cacheFile for writing"); - close(QMAKE_CACHE_FILE); - } - } } elsif ($modulepri) { print "$lib: WARNING: Module\'s pri file '$modulepri' not found.\n$lib: Skipped creating forwarding pri.\n"; } diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 3f6e7afea1..65bd1da7c1 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -9,7 +9,9 @@ CONFIG = lex yacc warn_on debug exceptions $$CONFIG } else { isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$OUT_PWD modpath = $$MODULE_QMAKE_OUTDIR/mkspecs/modules - QTFWD = -module-fwd $$modpath -cache-module-fwd + QTFWD = -module-fwd $$modpath + !isEmpty(_QMAKE_SUPER_CACHE_):!contains(QMAKEMODULES, $$modpath): \ + cache(QMAKEMODULES, add super, modpath) unset(modpath) } |