Try to support Qt 4.4-style Phonon includes in Qt.

This introduces an undocumented "phonon_compat" subdir and also adds
it to the INCLUDEPATH when QT += phonon is specified. With this, these
styles of #includes should be supported:

 #include <Phonon>
 #include <Phonon/Phonon>
 #include <phonon>
 #include <phonon/phonon>
 #include <Phonon/MediaObject>
 #include <phonon/mediaobject.h>

Still need to check if the headers get installed during "make
install". I couldn't find where in our code that is done.

BT: yes
Reviewed-By: Trust Me
(cherry picked from commit 0cb5038a3e5d3a6b0c33d081b89c6fe47cfc0b1b)
(cherry picked from commit 94ffd7e298a4ffa0440fd18a30b1823a71c6bb77)

2 files changed, 14 insertions, 3 deletions

diff --git a/bin/syncqt b/bin/syncqt
index a3addd8..edabeca 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -840,9 +840,15 @@ foreach (@modules_to_sync) {
     $master_contents .= "#endif\n";
 
     unless($showonly) {
-        unless ($lib eq "phonon") {
+        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";
+        }
+        foreach my $master_include (@master_includes) {
             #generate the "master" include file
-            my $master_include = "$out_basedir/include/$lib/$lib";
             $pri_install_files .= fixPaths($master_include, "$modules{$lib}") . " "; #get the master file installed too
             if($master_include && -e "$master_include") {
                 open MASTERINCLUDE, "<$master_include";
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 0c6e09a..dc833e7 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -149,8 +149,13 @@ for(QTLIB, $$list($$lower($$unique(QT)))) {
    else:isEqual(QTLIB, scripttools):qlib = QtScriptTools
    else:isEqual(QTLIB, testlib):qlib = QtTest
    else:isEqual(QTLIB, dbus):qlib = QtDBus
-   else:isEqual(QTLIB, phonon):qlib = phonon
    else:isEqual(QTLIB, webkit):qlib = QtWebKit
+   else:isEqual(QTLIB, phonon) {
+       qlib = phonon
+       INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon_compat/phonon
+       INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon_compat
+       INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon/Phonon
+   } else:isEqual(QTLIB, webkit):qlib = QtWebKit
    else:message("Unknown QT: $$QTLIB"):qlib =
    !isEmpty(qlib) {
       target_qt:isEqual(TARGET, qlib) {