diff -r 41300fa6a67c -r f7bc934e204c mkspecs/features/symbian/qt.prf --- a/mkspecs/features/symbian/qt.prf Tue Feb 02 00:43:10 2010 +0200 +++ b/mkspecs/features/symbian/qt.prf Wed Mar 31 11:06:36 2010 +0300 @@ -2,7 +2,7 @@ CONFIG *= epocallowdlldata } -CONFIG += qtmain stl +CONFIG += qtmain load(qt) @@ -22,24 +22,29 @@ INCLUDEPATH = $$PREPEND_INCLUDEPATH $$INCLUDEPATH # Add dependency to Qt package to all other projects besides Qt libs. -# Note: Qt libs with full capabilities has UID3 of 0x2001E61C, +# Note: Qt libs package with full capabilities has UID3 of 0x2001E61C, # while self-signed version typically has temporary UID3 of 0xE001E61C. -contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0xE001E61C) { - default_deployment.pkg_prerules += \ +contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0xE001E61C):isEmpty(QT_LIBINFIX) { + pkg_depends_qt += \ "; 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): { + pkg_depends_webkit += \ + "; Dependency to Qt Webkit" \ + "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"QtWebKit\"}" + } else { + default_deployment.pkg_prerules -= pkg_depends_webkit + } +} else { + default_deployment.pkg_prerules -= pkg_depends_webkit pkg_depends_qt } 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 ."