diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-01-30 21:12:28 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-01-30 21:12:28 +0000 |
commit | 6324a8e01afdc7b19cc8b091503d78d8c75b0167 (patch) | |
tree | 6d4f7b0bca1651f74d4640a82b7aa0f76f7a6cfc /meta/packages/webkit/files/WebKit.pro | |
parent | 5d57d6e1b2d3fa8ad11f798803d5d6d49f9af1c0 (diff) | |
download | openembedded-core-6324a8e01afdc7b19cc8b091503d78d8c75b0167.tar.gz openembedded-core-6324a8e01afdc7b19cc8b091503d78d8c75b0167.tar.bz2 openembedded-core-6324a8e01afdc7b19cc8b091503d78d8c75b0167.tar.xz openembedded-core-6324a8e01afdc7b19cc8b091503d78d8c75b0167.zip |
webkit-gtk: merge with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3639 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/webkit/files/WebKit.pro')
-rw-r--r-- | meta/packages/webkit/files/WebKit.pro | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/meta/packages/webkit/files/WebKit.pro b/meta/packages/webkit/files/WebKit.pro index aab0209a9..027017bd8 100644 --- a/meta/packages/webkit/files/WebKit.pro +++ b/meta/packages/webkit/files/WebKit.pro @@ -3,9 +3,15 @@ CONFIG += ordered !gtk-port:CONFIG += qt-port qt-port:!win32-*:SUBDIRS += WebKit/qt/Plugins SUBDIRS += \ - WebCore + WebCore \ + JavaScriptCore/kjs/testkjs.pro + +qt-port { + SUBDIRS += WebKit/qt/QtLauncher + + !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro +} -qt-port:SUBDIRS += \ - WebKit/qt/QtLauncher gtk-port:SUBDIRS += \ - WebKitTools/GtkLauncher + WebKitTools/GtkLauncher \ + WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro |