summaryrefslogtreecommitdiff
path: root/packages/webkit
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2007-10-23 15:03:38 +0000
committerHolger Freyther <zecke@selfish.org>2007-10-23 15:03:38 +0000
commit63dd0ca2b28510d8ad9d71fd4ba6e55ebc8f01d4 (patch)
tree4f145a9c0f51808985a238506e3e42d7d440f103 /packages/webkit
parent1f9d1e13d95e330d7bd47183eeb4ce7d098431aa (diff)
parent92d1fb2c780cc5787e7bca3c81086948e853ca5f (diff)
merge of '57f94c184ca1457e6b7683e84bcdf4863b46cd03'
and '730545b38a3f93aa84767feb0e823edcd31ab0b5'
Diffstat (limited to 'packages/webkit')
-rw-r--r--packages/webkit/webkit-qt.inc6
-rw-r--r--packages/webkit/webkit-qt_svn.bb2
-rw-r--r--packages/webkit/webkit-qtopia_svn.bb3
3 files changed, 7 insertions, 4 deletions
diff --git a/packages/webkit/webkit-qt.inc b/packages/webkit/webkit-qt.inc
index bba8d83cce..cb9c1f7943 100644
--- a/packages/webkit/webkit-qt.inc
+++ b/packages/webkit/webkit-qt.inc
@@ -1,9 +1,9 @@
WEBKIT_PORT = "qt"
WEBKIT_EXTRA_OPTIONS = ""
-PACKAGES =+ "webkit-qtlauncher-dbg webkit-qtlauncher"
+PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"
-FILES_webkit-qtlauncher = "${bindir}/QtLauncher"
-FILES_webkit-qtlauncher-dbg = "${bindir}/.debug/*"
+FILES_${PN}launcher = "${bindir}/QtLauncher"
+FILES_${PN}launcher-dbg = "${bindir}/.debug/*"
require webkit.inc
diff --git a/packages/webkit/webkit-qt_svn.bb b/packages/webkit/webkit-qt_svn.bb
index 75b36a4a58..e681e7a41b 100644
--- a/packages/webkit/webkit-qt_svn.bb
+++ b/packages/webkit/webkit-qt_svn.bb
@@ -1,2 +1,4 @@
require webkit-qt.inc
inherit qt4x11
+
+PR = "r1"
diff --git a/packages/webkit/webkit-qtopia_svn.bb b/packages/webkit/webkit-qtopia_svn.bb
index cfd96c8956..706f0f1cd1 100644
--- a/packages/webkit/webkit-qtopia_svn.bb
+++ b/packages/webkit/webkit-qtopia_svn.bb
@@ -1,3 +1,4 @@
-BROKEN="1"
require webkit-qt.inc
inherit qtopia4core
+
+PR = "r1"