diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-15 22:39:25 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-15 22:39:25 +0200 |
| commit | e5bcf68d3055d6738b56cbbafb407bad4363e63c (patch) | |
| tree | d70319316c926697e136527ce9a6628d34f0ebc4 /bin | |
| parent | d57d184b6d18deab172ac400b9db973e6aacab21 (diff) | |
| parent | be4b80af8235d5f5664f03589258eec0e43da78b (diff) | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/syncqt.pl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bin/syncqt.pl b/bin/syncqt.pl index d1424f0c32..8c1e04e0d0 100755 --- a/bin/syncqt.pl +++ b/bin/syncqt.pl @@ -805,7 +805,9 @@ foreach my $lib (@modules_to_sync) { die "No such module: $lib" unless(defined $modules{$lib}); #iteration info - my @dirs = split(/;/, $modules{$lib}); + my $module = $modules{$lib}; + my $is_qt = !($module =~ s/^!//); + my @dirs = split(/;/, $module); my $dir = $dirs[0]; my $pathtoheaders = ""; @@ -914,7 +916,7 @@ foreach my $lib (@modules_to_sync) { } my $iheader = $subdir . "/" . $header; - my @classes = $public_header && !$minimal ? classNames($iheader) : (); + my @classes = $public_header && (!$minimal && $is_qt) ? classNames($iheader) : (); if($showonly) { print "$header [$lib]\n"; foreach(@classes) { @@ -1024,7 +1026,7 @@ foreach my $lib (@modules_to_sync) { "#include \"".lc($lib)."version.h\"\n" . "#endif\n"; - unless ($showonly || $minimal) { + unless ($showonly || $minimal || !$is_qt) { # create deprecated headers my $first = 1; while (my ($header, $include) = each %{$deprecatedheaders{$lib}}) { @@ -1112,7 +1114,9 @@ foreach my $lib (@modules_to_sync) { my $master_include = "$out_basedir/include/$lib/$lib"; $pri_install_files .= fixPaths($master_include, $dir) . " "; writeFile($master_include, $master_contents, $lib, "master header"); + } + unless ($showonly || $minimal) { #handle the headers.pri for each module my $headers_pri_contents = ""; $headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n"; @@ -1126,6 +1130,7 @@ foreach my $lib (@modules_to_sync) { if($check_includes) { foreach my $lib (@modules_to_sync) { + next if ($modules{$lib} =~ /^!/); #calc subdirs my @subdirs = listSubdirs(map { s/^\^//; $_ } split(/;/, $modules{$lib})); |