diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-12-29 11:36:54 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-12-29 11:56:24 (GMT) |
| commit | 337931b28cb1157512ae2b6ab67ceaaf63bf1e48 (patch) | |
| tree | e5c3dde1738ead499f179b9e3342dc6962e76734 /mkspecs/features/symbian | |
| parent | 48d2b516c6713160c29850a0a253ee295620d681 (diff) | |
| download | Qt-337931b28cb1157512ae2b6ab67ceaaf63bf1e48.zip Qt-337931b28cb1157512ae2b6ab67ceaaf63bf1e48.tar.gz Qt-337931b28cb1157512ae2b6ab67ceaaf63bf1e48.tar.bz2 | |
Removed QtWebkit.dll from Qt.sis in Symbian builds
In preparation for future removal of Webkit from Qt, Qt.sis no longer
contains QtWebkit.dll. All projects that have webkit dependency now
automatically also add dependency qtwebkit.sis into their .pkg files.
To create qtwebkit.sis, run "make sis" in src\3rdparty\webkit\WebCore
directory.
Task-number: QTBUG-6841
Reviewed-by: Simon Hausmann
Reviewed-by: Janne Koskinen
Diffstat (limited to 'mkspecs/features/symbian')
| -rw-r--r-- | mkspecs/features/symbian/qt.prf | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf index 0f5b08b..99f5ece 100644 --- a/mkspecs/features/symbian/qt.prf +++ b/mkspecs/features/symbian/qt.prf @@ -28,6 +28,13 @@ contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0 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 |