summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2018-11-08 13:09:25 +0100
committerOliver Wolff <oliver.wolff@qt.io>2018-11-22 14:16:53 +0000
commita90694d1a60f30ec2abffbfa9e8c7a336c45e736 (patch)
tree8411d8a1016c6ebf09bfb1fbba664fdd8244601c
parenteef9b4f0d5c3582364e327eca302f9499dffeea3 (diff)
syncqt: Do not clean header directory before "-minimal" run
It is possible that "syncqt -minimal" is run after a module's initial run (for example if a host tool relies on a module, but cannot use it directly and thus adds minimal_syncqt to its .pro file). In this case, the old directory content should not be wiped. Fixes: QTBUG-59319 Change-Id: I83767eff0ef74bcefae5efa9b18b7ab3724138e5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-rwxr-xr-xbin/syncqt.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/syncqt.pl b/bin/syncqt.pl
index 77ce90c164..972717efcf 100755
--- a/bin/syncqt.pl
+++ b/bin/syncqt.pl
@@ -941,7 +941,7 @@ foreach my $lib (@modules_to_sync) {
my %master_contents = ();
#remove the old files
- if($remove_stale) {
+ if ($remove_stale && !$minimal) {
my %injections = ();
for my $p (keys %inject_headers) {
next unless ($p =~ /^\Q$dir\E(\/|$)/);