diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-25 12:28:36 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:46:01 +0200 |
commit | 8dba9e50ac7149b3a40e2e15b0120a26df801f08 (patch) | |
tree | 66870077b3647b1249893916f307a5fbc3d03083 /bin/syncqt | |
parent | eae51358085bd68abe5207ad782ec77e51051388 (diff) | |
download | qtbase-8dba9e50ac7149b3a40e2e15b0120a26df801f08.tar.gz |
make master phonon compat header a forwarding header
instead of writing the same file twice, just forward to the compat
header, like it is done for every other header.
Change-Id: I8c908f80149aff4720cca6d51ab5b550c31f78b1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'bin/syncqt')
-rwxr-xr-x | bin/syncqt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/syncqt b/bin/syncqt index dbde5b478c..eb7d9f0533 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -1153,7 +1153,6 @@ foreach my $lib (@modules_to_sync) { my @master_includes; push @master_includes, "$out_basedir/include/$lib/$lib"; - push @master_includes, "$out_basedir/include/phonon_compat/Phonon/Phonon" if ($lib eq "phonon"); foreach my $master_include (@master_includes) { #generate the "master" include file my @tmp = split(/;/,$modules{$lib}); @@ -1177,6 +1176,12 @@ foreach my $lib (@modules_to_sync) { } } + # KDE-Compat master header for Phonon + if ($lib eq "phonon") { + syncHeader($lib, "$out_basedir/include/phonon_compat/Phonon/Phonon", "$out_basedir/include/phonon/phonon", 0); + $pri_install_files .= fixPaths("$out_basedir/include/phonon/phonon", "$basedir/src/phonon") . " "; + } + #handle the headers.pri for each module my $headers_pri_contents = ""; $headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n"; |