Attempt at readding the capital P headers for Phonon

2 files changed, 7 insertions, 0 deletions

diff --git a/bin/syncqt b/bin/syncqt
index b64fd42..6c1a438 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -807,6 +807,11 @@ foreach (@modules_to_sync) {
 #				}
 				$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));
+
+				# KDE-Compat headers for Phonon
+				if ($lib eq "phonon") {
+				    $header_copies++ if (syncHeader("$out_basedir/include/phonon_compat/Phonon/$class", "$out_basedir/include/$lib/$header", 0));
+				}
 			    }
 			} else {
 			    @headers = ( "$out_basedir/include/$lib/private/$header" );
@@ -856,6 +861,7 @@ foreach (@modules_to_sync) {
     unless($showonly) {
         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
             $pri_install_files .= fixPaths($master_include, "$modules{$lib}") . " "; #get the master file installed too
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 831f5b6..cf32685 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -160,6 +160,7 @@ for(QTLIB, $$list($$lower($$unique(QT)))) {
    else:isEqual(QTLIB, dbus):qlib = QtDBus
    else:isEqual(QTLIB, phonon) {
        qlib = phonon
+       INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon_compat
 
        # The Helix backend requires this. Since we can't let a plugin set it,
        # we bump the values for all Symbian Phonon plugins.