summaryrefslogtreecommitdiff
path: root/packages/webkit/files/WebKit.pro
diff options
context:
space:
mode:
authorLeon Woestenberg <leon.woestenberg@gmail.com>2007-10-05 12:43:03 +0000
committerLeon Woestenberg <leon.woestenberg@gmail.com>2007-10-05 12:43:03 +0000
commitfb5a8ff3d88fca827e22ad48f136c7fe1c6cea10 (patch)
treef28b9b4a860576cf9909d567efc7baeb20dd2740 /packages/webkit/files/WebKit.pro
parentf0f72d8aa5de6a41796117c6e781e150bbacbe47 (diff)
parentbab0c48ac5132ad63b4f3da27a1c39c20b5db86c (diff)
merge of 'aac60b186b977130a688c4d00bfde913fb6221eb'
and 'f42403739ba7106ebfe92b3af59bf9c81b54f06d'
Diffstat (limited to 'packages/webkit/files/WebKit.pro')
-rw-r--r--packages/webkit/files/WebKit.pro17
1 files changed, 10 insertions, 7 deletions
diff --git a/packages/webkit/files/WebKit.pro b/packages/webkit/files/WebKit.pro
index 335d11e6e7..8536c41515 100644
--- a/packages/webkit/files/WebKit.pro
+++ b/packages/webkit/files/WebKit.pro
@@ -1,13 +1,16 @@
TEMPLATE = subdirs
CONFIG += ordered
-!gdk-port:CONFIG += qt-port
-qt-port:SUBDIRS += WebKitQt/Plugins
+!gtk-port:CONFIG += qt-port
+qt-port:!win32-*:SUBDIRS += WebKitQt/Plugins
SUBDIRS += \
WebCore \
JavaScriptCore/kjs/testkjs.pro
-qt-port:SUBDIRS += \
- WebKitQt/QtLauncher \
- WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
-gdk-port:SUBDIRS += \
- WebKitTools/GdkLauncher
+qt-port {
+ SUBDIRS += WebKitQt/QtLauncher
+
+ !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
+}
+
+gtk-port:SUBDIRS += \
+ WebKitTools/GtkLauncher