1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support flagging all headers from a particular source directory as privates

Browse Source 
Change-Id: Ia893abc95b358d8a8ffd690563f2f02bc20fd98d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2012-12-03 20:35:02 +01:00 committed by The Qt Project
parent 2274bef6b2
commit 24f623beda
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/syncqt
View File

@ -872,6 +872,8 @@ foreach my $lib (@modules_to_sync) {
#create the new ones #create the new ones
foreach my $current_dir (@dirs) { foreach my $current_dir (@dirs) {
my $thisprivate = 0;
($current_dir =~ s/^\^//) and $thisprivate = 1;
my @headers_paths = split(/;/, $pathtoheaders); my @headers_paths = split(/;/, $pathtoheaders);
if (@headers_paths) { if (@headers_paths) {
@headers_paths = map { "$current_dir/$_" } @headers_paths; @headers_paths = map { "$current_dir/$_" } @headers_paths;
@ -907,7 +909,7 @@ foreach my $lib (@modules_to_sync) {
if(isQpaHeader($public_header)) { if(isQpaHeader($public_header)) {
$public_header = 0; $public_header = 0;
$qpa_header = 1; $qpa_header = 1;
} elsif($allheadersprivate || $public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) { } elsif($allheadersprivate || $thisprivate || $public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) {
$public_header = 0; $public_header = 0;
} else { } else {
foreach (@ignore_for_master_contents) { foreach (@ignore_for_master_contents) {
@ -1146,7 +1148,7 @@ unless($showonly || !$create_uic_class_map) {
if($check_includes) { if($check_includes) {
for my $lib (keys(%modules)) { for my $lib (keys(%modules)) {
#calc subdirs #calc subdirs
my @subdirs = listSubdirs(split(/;/, $modules{$lib})); my @subdirs = listSubdirs(map { s/^\^//; $_ } split(/;/, $modules{$lib}));
foreach my $subdir (@subdirs) { foreach my $subdir (@subdirs) {
my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0); my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0);