--- a/mkspecs/features/symbian/qt.prf	Tue Feb 02 00:43:10 2010 +0200
+++ b/mkspecs/features/symbian/qt.prf	Fri Apr 16 15:50:13 2010 +0300
@@ -2,7 +2,7 @@
     CONFIG *= epocallowdlldata
 }
 
-CONFIG += qtmain stl
+CONFIG += qtmain
 
 load(qt)
 
@@ -28,18 +28,24 @@
     default_deployment.pkg_prerules += \
         "; Default dependency to Qt libraries" \
         "(0x2001E61C), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"Qt\"}"
+
+    # Projects linking to webkit need dependency to webkit
+    contains(QT, webkit): {
+        default_deployment.pkg_prerules += \
+            "; Dependency to Qt Webkit" \
+            "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"QtWebKit\"}"
+    }
 }
 
 isEmpty(TARGET.EPOCSTACKSIZE):TARGET.EPOCSTACKSIZE = 0x14000
 isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x020000 0x800000
 
-INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
-for(QTLIB, $$list($$lower($$unique(QT)))) {
-    unset(qlib)
-    isEqual(QTLIB, phonon):qlib = phonon
-    else:qlib = qt$$QTLIB
-    INCLUDEPATH += $$MW_LAYER_PUBLIC_EXPORT_PATH($$qlib)
-}
+INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
 #QTP: add userinclude 
-MMP_RULES+="USERINCLUDE  ."
\ No newline at end of file
+MMP_RULES+="USERINCLUDE  ."
+
+my_custom_rule = "$${LITERAL_HASH}if defined(ARMCC) && !defined(ARMCC_2_2) && !defined(ARMCC_3_1)"\
+"OPTION ARMCC --import_all_vtbl" \
+"$${LITERAL_HASH}endif"
+MMP_RULES += my_custom_rule
\ No newline at end of file