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

make master phonon compat header a forwarding header

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-04-25 12:28:36 +02:00
parent eae5135808
commit 8dba9e50ac
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/syncqt
View File

@ -1153,7 +1153,6 @@ foreach my $lib (@modules_to_sync) {
my @master_includes; my @master_includes;
push @master_includes, "$out_basedir/include/$lib/$lib"; 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) { foreach my $master_include (@master_includes) {
#generate the "master" include file #generate the "master" include file
my @tmp = split(/;/,$modules{$lib}); 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 #handle the headers.pri for each module
my $headers_pri_contents = ""; my $headers_pri_contents = "";
$headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n"; $headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n";