diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-11-06 15:16:38 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-11-06 15:16:38 +0000 |
| commit | f0eb3fa507e436d44b943bedfcd8afa5ff760971 (patch) | |
| tree | 15a57fffc1a01825821f35508fc84ce2a08fd93e /packages/webkit/webkit-qt.inc | |
| parent | 51d30ada0db9ff322925628fe9d965687685f52d (diff) | |
| parent | b8a64f32a1bd74900ef43067e40fa1153c5f27cc (diff) | |
merge of 'c5d7d939915c058ea8efba4e6e2fa2e5f1648626'
and 'd6978786d6310b56cb0f5a93790659cd481ca0d5'
Diffstat (limited to 'packages/webkit/webkit-qt.inc')
| -rw-r--r-- | packages/webkit/webkit-qt.inc | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/packages/webkit/webkit-qt.inc b/packages/webkit/webkit-qt.inc index bba8d83cce..1dbf71c010 100644 --- a/packages/webkit/webkit-qt.inc +++ b/packages/webkit/webkit-qt.inc @@ -1,12 +1,17 @@ WEBKIT_PORT = "qt" WEBKIT_EXTRA_OPTIONS = "" -PACKAGES =+ "webkit-qtlauncher-dbg webkit-qtlauncher" -FILES_webkit-qtlauncher = "${bindir}/QtLauncher" -FILES_webkit-qtlauncher-dbg = "${bindir}/.debug/*" +FILES_${PN}launcher = "${bindir}/QtLauncher" +FILES_${PN}launcher-dbg = "${bindir}/.debug/*" + +RDEPENDS += "openssl" require webkit.inc +PR = "r6" +SRC_URI += " file://qt-api-changes.diff;patch=0;pnum=0 \ + file://qtwebkit-use-image-decoders.patch;patch=0 " + do_install() { install -d ${D}${bindir} install -d ${D}${libdir} @@ -16,5 +21,12 @@ do_install() { cd ${S}/WebKitBuilds/Debug PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir} $PWD/../../WebKit.pro oe_runmake install + + oe_libinstall -C ${S}/WebKitBuilds/Debug/lib libQtWebKit ${D}${libdir} } +# disabled as Qt and Qtopia will not like each other... +#do_stage_prepend() { +# oe_libinstall -C ${S}/WebKitBuilds/Debug/lib libQtWebKit ${D}${libdir} +#} + |