summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-12-29 11:36:54 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-12-29 11:56:24 (GMT)
commit337931b28cb1157512ae2b6ab67ceaaf63bf1e48 (patch)
treee5c3dde1738ead499f179b9e3342dc6962e76734 /demos
parent48d2b516c6713160c29850a0a253ee295620d681 (diff)
downloadQt-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 'demos')
-rw-r--r--demos/embedded/fluidlauncher/fluidlauncher.pro5
1 files changed, 5 insertions, 0 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) {