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

fix support for multiple source directories per module

Browse Source 
Change-Id: I040cb928e016c3a8257a1bcbf20627d67f07c84d
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2012-12-03 20:33:48 +01:00 committed by The Qt Project
parent 27b66e43c0
commit 2274bef6b2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/syncqt
View File

@ -803,7 +803,8 @@ foreach my $lib (@modules_to_sync) {
die "No such module: $lib" unless(defined $modules{$lib}); die "No such module: $lib" unless(defined $modules{$lib});
#iteration info #iteration info
my $dir = $modules{$lib}; my @dirs = split(/;/, $modules{$lib});
my $dir = $dirs[0];
my $project = $dir; my $project = $dir;
$project =~ s,/([^/]+)$,/$1/$1.pro,; $project =~ s,/([^/]+)$,/$1/$1.pro,;
@ -870,7 +871,7 @@ foreach my $lib (@modules_to_sync) {
} }
#create the new ones #create the new ones
foreach my $current_dir (split(/;/, $dir)) { foreach my $current_dir (@dirs) {
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;
@ -1145,7 +1146,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($modules{$lib}); my @subdirs = listSubdirs(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);