2008-03-07 Stephanie <slewis@apple.com>
[WebKit-https.git] / WebKit.pro
index 8e2e9442e201f43ca6998e695aecd5ed8032af19..bc14feb5f6b430ef787104d45e688e1237a3c29d 100644 (file)
@@ -1,17 +1,21 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 TEMPLATE = subdirs
 CONFIG += ordered
-!gdk-port:CONFIG += qt-port
-qt-port:!win32-*:SUBDIRS += WebKitQt/Plugins
+!gtk-port:CONFIG += qt-port
+qt-port {
+    lessThan(QT_MINOR_VERSION, 4) {
+        !win32-*:SUBDIRS += WebKit/qt/Plugins
+    }
+}
 SUBDIRS += \
 SUBDIRS += \
-        JavaScriptCore/pcre/dftables.pro \
         WebCore \
         JavaScriptCore/kjs/testkjs.pro
 
 qt-port {
         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
 }
 
 }
 
-gdk-port:SUBDIRS += \
-        WebKitTools/GdkLauncher
+gtk-port:SUBDIRS += \
+        WebKitTools/GtkLauncher \
+        WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro