Remove special Phonon processing from syncqt.

Restore original Qt 4.4 behaviour. The capital P headers are not
correct because of frameworks on Mac.

More info, see thread:
http://lists.kde.org/?l=kde-multimedia&m=126045273702498&w=2

Task-number: QTBUG-4685
Reviewed-by: Trust Me

1 files changed, 11 insertions, 12 deletions

diff --git a/bin/syncqt b/bin/syncqt
index 704af36..b64fd42 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -800,9 +800,11 @@ foreach (@modules_to_sync) {
 			    foreach(@classes) {
 				my $header_base = basename($header);
 				my $class = $_;
-				if ($class =~ m/::/) {
-				    $class =~ s,::,/,g;
-				}
+				# Strip namespaces:
+				$class =~ s/^.*:://;
+#				if ($class =~ m/::/) {
+#				   class =~ s,::,/,g;
+#				}
 				$class_lib_map_contents .= "QT_CLASS_LIB($_, $lib, $header_base)\n";
 				$header_copies++ if(syncHeader("$out_basedir/include/$lib/$class", "$out_basedir/include/$lib/$header", 0));
 			    }
@@ -824,9 +826,11 @@ foreach (@modules_to_sync) {
 				my $pri_install_iheader = fixPaths($iheader, $current_dir);
 				foreach(@classes) {
 				    my $class = $_;
-				    if ($class =~ m/::/) {
-					$class =~ s,::,/,g;
-				    }
+				    # Strip namespaces:
+				    $class =~ s/^.*:://;
+#				    if ($class =~ m/::/) {
+#					$class =~ s,::,/,g;
+#				    }
 				    my $class_header = fixPaths("$out_basedir/include/$lib/$class",
 								$current_dir) . " ";
 				    $pri_install_classes .= $class_header
@@ -851,12 +855,7 @@ foreach (@modules_to_sync) {
 
     unless($showonly) {
         my @master_includes;
-        if ($lib eq "phonon") {
-            push @master_includes, "$out_basedir/include/phonon_compat/phonon/phonon";
-            push @master_includes, "$out_basedir/include/phonon/Phonon/Phonon";
-        } else {
-            push @master_includes, "$out_basedir/include/$lib/$lib";
-        }
+	push @master_includes, "$out_basedir/include/$lib/$lib";
         foreach my $master_include (@master_includes) {
             #generate the "master" include file
             $pri_install_files .= fixPaths($master_include, "$modules{$lib}") . " "; #get the master file installed too