summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-12-03 20:33:48 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-04 13:57:48 +0100
commit2274bef6b27a57deb1edd9fd2aee94d0d928c9f5 (patch)
tree005348b07e5a867fb0684c08d40d7d5bcd6e0407 /bin
parent27b66e43c08faed5e76399cfcbaba75a63bfc020 (diff)
fix support for multiple source directories per module
Change-Id: I040cb928e016c3a8257a1bcbf20627d67f07c84d Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/syncqt7
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/syncqt b/bin/syncqt
index 21ddff48a7..53d07fc826 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -803,7 +803,8 @@ foreach my $lib (@modules_to_sync) {
die "No such module: $lib" unless(defined $modules{$lib});
#iteration info
- my $dir = $modules{$lib};
+ my @dirs = split(/;/, $modules{$lib});
+ my $dir = $dirs[0];
my $project = $dir;
$project =~ s,/([^/]+)$,/$1/$1.pro,;
@@ -870,7 +871,7 @@ foreach my $lib (@modules_to_sync) {
}
#create the new ones
- foreach my $current_dir (split(/;/, $dir)) {
+ foreach my $current_dir (@dirs) {
my @headers_paths = split(/;/, $pathtoheaders);
if (@headers_paths) {
@headers_paths = map { "$current_dir/$_" } @headers_paths;
@@ -1145,7 +1146,7 @@ unless($showonly || !$create_uic_class_map) {
if($check_includes) {
for my $lib (keys(%modules)) {
#calc subdirs
- my @subdirs = listSubdirs($modules{$lib});
+ my @subdirs = listSubdirs(split(/;/, $modules{$lib}));
foreach my $subdir (@subdirs) {
my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0);