summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/webkit/files/WebKit.pri2
-rw-r--r--packages/webkit/files/WebKit.pro6
-rw-r--r--packages/webkit/webkit-gtk_svn.bb8
3 files changed, 12 insertions, 4 deletions
diff --git a/packages/webkit/files/WebKit.pri b/packages/webkit/files/WebKit.pri
index 350c95d311..0c47afe7fd 100644
--- a/packages/webkit/files/WebKit.pri
+++ b/packages/webkit/files/WebKit.pri
@@ -25,7 +25,7 @@ CONFIG(release) {
BASE_DIR = $$PWD
qt-port:INCLUDEPATH += \
- $$PWD/WebKitQt/Api
+ $$PWD/WebKit/qt/Api
gtk-port:INCLUDEPATH += \
$$BASE_DIR/WebCore/platform/gtk \
$$BASE_DIR/WebCore/platform/network/curl \
diff --git a/packages/webkit/files/WebKit.pro b/packages/webkit/files/WebKit.pro
index 8536c41515..dca2614109 100644
--- a/packages/webkit/files/WebKit.pro
+++ b/packages/webkit/files/WebKit.pro
@@ -1,15 +1,15 @@
TEMPLATE = subdirs
CONFIG += ordered
!gtk-port:CONFIG += qt-port
-qt-port:!win32-*:SUBDIRS += WebKitQt/Plugins
+qt-port:!win32-*:SUBDIRS += WebKit/qt/Plugins
SUBDIRS += \
WebCore \
JavaScriptCore/kjs/testkjs.pro
qt-port {
- SUBDIRS += WebKitQt/QtLauncher
+ SUBDIRS += WebKit/qt/QtLauncher
- !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
+ !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
}
gtk-port:SUBDIRS += \
diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb
index 35ab38a167..7ee08bf5ab 100644
--- a/packages/webkit/webkit-gtk_svn.bb
+++ b/packages/webkit/webkit-gtk_svn.bb
@@ -59,6 +59,14 @@ do_stage() {
oe_runmake install
}
+
+# Noooooooooooooooooooooooooooooooooooooooooooo...
+do_unstage() {
+ rm ${STAGING_LIBDIR}/libWebKitG* || true
+}
+
+addtask unstage before do_configure
+
PACKAGES =+ "webkit-gtklauncher-dbg webkit-gtklauncher"
FILES_webkit-gtklauncher = "${bindir}/GtkLauncher"