AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove phonon vestiges

Browse Source 
Change-Id: Id345fdd986dd60d4e7212fde265bd7357794bd9a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2012-12-12 12:06:21 +01:00 committed by The Qt Project
parent 692de02818
commit a8b7553e46
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/syncqt
View File

@ -291,8 +291,7 @@ sub classNames {
foreach my $symbol (@symbols) { foreach my $symbol (@symbols) {
$symbol = (join("::", @namespaces) . "::" . $symbol) if (scalar @namespaces); $symbol = (join("::", @namespaces) . "::" . $symbol) if (scalar @namespaces);
if ($symbol =~ /^Q[^:]*$/ # no-namespace, starting with Q if ($symbol =~ /^Q[^:]*$/) { # no-namespace, starting with Q
|| $symbol =~ /^Phonon::/) { # or in the Phonon namespace
push @ret, $symbol; push @ret, $symbol;
} elsif (defined($publicclassregexp)) { } elsif (defined($publicclassregexp)) {
push @ret, $symbol if ($symbol =~ $publicclassregexp); push @ret, $symbol if ($symbol =~ $publicclassregexp);
@ -946,11 +945,6 @@ foreach my $lib (@modules_to_sync) {
$class_lib_map_contents .= "QT_CLASS_LIB($full_class, $lib, $header_base)\n"; $class_lib_map_contents .= "QT_CLASS_LIB($full_class, $lib, $header_base)\n";
$header_copies++ if(syncHeader($lib, "$out_basedir/include/$lib/$class", "$out_basedir/include/$lib/$header", 0, $ts)); $header_copies++ if(syncHeader($lib, "$out_basedir/include/$lib/$class", "$out_basedir/include/$lib/$header", 0, $ts));
} }
# KDE-Compat headers for Phonon
if ($lib eq "phonon") {
$header_copies++ if (syncHeader($lib, "$out_basedir/include/phonon_compat/Phonon/$class", "$out_basedir/include/$lib/$header", 0, $ts));
}
} }
if ($explicitheaders{$lib}{basename($header)}) { if ($explicitheaders{$lib}{basename($header)}) {
@ -1094,11 +1088,6 @@ foreach my $lib (@modules_to_sync) {
$pri_install_files .= fixPaths($vheader, $dir) . " "; $pri_install_files .= fixPaths($vheader, $dir) . " ";
$pri_install_classes .= fixPaths($VHeader, $dir) . " "; $pri_install_classes .= fixPaths($VHeader, $dir) . " ";
# 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);
}
#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";