diff options
| author | Thomas Kunze <thommycheck@gmx.de> | 2008-09-04 10:17:18 +0000 |
|---|---|---|
| committer | Thomas Kunze <thommycheck@gmx.de> | 2008-09-04 10:17:18 +0000 |
| commit | ae63a4dad7b06af132c6ba5bdb5fb98b2231525a (patch) | |
| tree | 62d8fae898721cffb503baa6c43ba795427045b9 /packages/webkit/webkit-gtk/WebKit.pro | |
| parent | 309c832c2c21ceb97fd589ebce8327d0d2bba731 (diff) | |
| parent | 3c20604cd26ca8da11ac9afb669629c20355c4e4 (diff) | |
merge of '0d3b0d788fccfc1c07e0da07e8f8596c062e2ef2'
and '8a4df13bdb5d6b154edb85a4b71e38ac457670a0'
Diffstat (limited to 'packages/webkit/webkit-gtk/WebKit.pro')
| -rw-r--r-- | packages/webkit/webkit-gtk/WebKit.pro | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/packages/webkit/webkit-gtk/WebKit.pro b/packages/webkit/webkit-gtk/WebKit.pro index bc14feb5f6..035f73aa3f 100644 --- a/packages/webkit/webkit-gtk/WebKit.pro +++ b/packages/webkit/webkit-gtk/WebKit.pro @@ -1,21 +1,12 @@ TEMPLATE = subdirs CONFIG += ordered -!gtk-port:CONFIG += qt-port -qt-port { - lessThan(QT_MINOR_VERSION, 4) { - !win32-*:SUBDIRS += WebKit/qt/Plugins - } -} + SUBDIRS += \ + JavaScriptCore \ WebCore \ - JavaScriptCore/kjs/testkjs.pro - -qt-port { - SUBDIRS += WebKit/qt/QtLauncher + JavaScriptCore/kjs/jsc.pro \ + WebKit/qt/QtLauncher \ + WebKit/qt/tests - !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro -} +!win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro -gtk-port:SUBDIRS += \ - WebKitTools/GtkLauncher \ - WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro |