diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-12 12:06:21 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-13 09:10:49 +0100 |
| commit | a8b7553e469be7af7c8380954e7efebf380b8fa8 (patch) | |
| tree | 2157ffb127b22682972b9ab78443080bf0078a2f | |
| parent | 692de02818d574dbfb510ed66ee358fa9af5a36a (diff) | |
remove phonon vestiges
Change-Id: Id345fdd986dd60d4e7212fde265bd7357794bd9a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rwxr-xr-x | bin/syncqt | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/bin/syncqt b/bin/syncqt index 01a24ad9df..ff55a9a8f1 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -291,8 +291,7 @@ sub classNames { foreach my $symbol (@symbols) { $symbol = (join("::", @namespaces) . "::" . $symbol) if (scalar @namespaces); - if ($symbol =~ /^Q[^:]*$/ # no-namespace, starting with Q - || $symbol =~ /^Phonon::/) { # or in the Phonon namespace + if ($symbol =~ /^Q[^:]*$/) { # no-namespace, starting with Q push @ret, $symbol; } elsif (defined($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"; $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)}) { @@ -1094,11 +1088,6 @@ foreach my $lib (@modules_to_sync) { $pri_install_files .= 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 my $headers_pri_contents = ""; $headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n"; |