diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-15 19:47:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-15 19:47:57 +0200 |
| commit | 40a1f69e8663fb79560c26cfad5ead45b1b3ee5f (patch) | |
| tree | a8ceb093a098a38b29c0fe27e41af480ae10b876 /bin/syncqt.pl | |
| parent | 446afc10451d5097d7bd20b1b8d20325c4d54fa5 (diff) | |
| parent | 6b2071c697d4c48f0cd289b28b443ebffc3432e6 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
configure.json
mkspecs/macx-tvos-clang/qmake.conf
mkspecs/macx-watchos-clang/qmake.conf
Change-Id: Iaf32339ace59dff9ed344972472744c55d75025c
Diffstat (limited to 'bin/syncqt.pl')
| -rwxr-xr-x | bin/syncqt.pl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/syncqt.pl b/bin/syncqt.pl index 7410762985..b531dce374 100755 --- a/bin/syncqt.pl +++ b/bin/syncqt.pl @@ -934,6 +934,8 @@ foreach my $lib (@modules_to_sync) { foreach my $subdir (@subdirs) { if (opendir DIR, $subdir) { foreach my $t (sort { $b cmp $a } readdir(DIR)) { + next if ($t =~ /\.pri$/); + next if ($t =~ /^qt[a-z0-9]+-config(_p)?\.h$/); my $file = "$subdir/$t"; if(-d $file) { push @subdirs, $file unless($t eq "." || $t eq ".."); @@ -984,6 +986,7 @@ foreach my $lib (@modules_to_sync) { #calc files and "copy" them foreach my $subdir (@subdirs) { my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0); + @headers = grep(!/^qt[a-z0-9]+-config(_p)?\.h$/, @headers); if (defined $inject_headers{$subdir}) { foreach my $if (@{$inject_headers{$subdir}}) { @headers = grep(!/^\Q$if\E$/, @headers); #in case we configure'd previously |