--- a/src/qt_install.pri	Tue Feb 02 00:43:10 2010 +0200
+++ b/src/qt_install.pri	Fri Feb 19 23:40:16 2010 +0200
@@ -10,16 +10,16 @@
 !symbian: {
     HEADER_INSTALL_PATH = $$[QT_INSTALL_HEADERS]
 } else {
-    # QT_BOOTSTRAPPED qmake doesn't seem to take care of -headedir 
+    # :QTP: QT_BOOTSTRAPPED qmake doesn't seem to take care of -headerdir 
     HEADER_INSTALL_PATH = /epoc32/include/mw
 }
 
 qt_install_headers {
     INSTALL_HEADERS = $$SYNCQT.HEADER_FILES
     equals(TARGET, QtCore) {
-        #headers generated by configure
-        INSTALL_HEADERS *= $$QT_BUILD_TREE/src/corelib/global/qconfig.h \
-                           $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH/arch
+       #headers generated by configure
+       INSTALL_HEADERS *= $$QT_BUILD_TREE/src/corelib/global/qconfig.h \
+                          $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH/arch
     }
     # :QTP: avoid duplicate exports for qconfig.h and qxmlstream.h
     symbian: {
@@ -30,13 +30,13 @@
             INSTALL_HEADERS -= $$QT_BUILD_TREE/src/corelib/global/qconfig.h
         }
         equals(TARGET, phonon) {
-            INSTALL_HEADERS -= ../../include/phonon_compat/phonon/phonon \
+            INSTALL_HEADERS -= ../../include/phonon_compat/Phonon/Phonon \
                                ../../include/phonon/Phonon/Phonon
         }
     }
 
     equals(TARGET, phonon) {
-        class_headers.path = $$HEADER_INSTALL_PATH/$$TARGET/Phonon
+        class_headers.path = $$HEADER_INSTALL_PATH/$$TARGET
     } else {
         flat_headers.files = $$INSTALL_HEADERS
         flat_headers.path = $$HEADER_INSTALL_PATH/Qt