diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-12-29 11:36:54 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-11 12:55:52 (GMT) |
| commit | 7c2193617d3631432ee7c3265aa1482b19721773 (patch) | |
| tree | ed81eb3072574618b4142fe530e951b950b42d71 | |
| parent | 0b9607623915bfa7262ed4c6f817034487eca08f (diff) | |
| download | Qt-7c2193617d3631432ee7c3265aa1482b19721773.zip Qt-7c2193617d3631432ee7c3265aa1482b19721773.tar.gz Qt-7c2193617d3631432ee7c3265aa1482b19721773.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
(cherry picked from commit 337931b28cb1157512ae2b6ab67ceaaf63bf1e48)
| -rw-r--r-- | demos/embedded/fluidlauncher/fluidlauncher.pro | 5 | ||||
| -rw-r--r-- | mkspecs/features/symbian/qt.prf | 7 | ||||
| -rw-r--r-- | src/s60installs/s60installs.pro | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro index b47f6a0..bb8835b 100644 --- a/demos/embedded/fluidlauncher/fluidlauncher.pro +++ b/demos/embedded/fluidlauncher/fluidlauncher.pro @@ -163,6 +163,11 @@ symbian { resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.rsc mifs.sources += \ $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.mif + + # Since Fluidlauncher itself doesn't link webkit, we won't get dependency automatically + executables.pkg_prerules += \ + "; Dependency to Qt Webkit" \ + "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"QtWebKit\"}" } contains(QT_CONFIG, phonon) { 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 diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 0184675..eb35419 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -104,10 +104,6 @@ symbian: { qtlibraries.sources += QtDeclarative.dll } - contains(QT_CONFIG, webkit): { - qtlibraries.sources += QtWebKit.dll - } - graphicssystems_plugins.path = c:$$QT_PLUGINS_BASE_DIR/graphicssystems contains(QT_CONFIG, openvg) { qtlibraries.sources += QtOpenVG.dll |