[Release] Webkit-EFL Ver. 2.0_beta_118996_0.6.19

[framework/web/webkit-efl.git] / WebKit.pro

diff --git a/WebKit.pro b/WebKit.pro
index 2836323..eb23fd3 100644 (file)
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -8,16 +8,23 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 
+load(features)
+
 QMAKEPATH = $$(QMAKEPATH)
 isEmpty(QMAKEPATH)|!exists($${QMAKEPATH}/mkspecs) {
     error("The environment variable QMAKEPATH needs to point to $WEBKITSRC/Tools/qmake")
     # Otherwise we won't pick up the feature prf files needed for the build
 }
 
-# Always go into JavaScriptCore to at least build WTF.
-JavaScriptCore.file = Source/JavaScriptCore/JavaScriptCore.pro
-JavaScriptCore.makefile = Makefile.JavaScriptCore
-SUBDIRS += JavaScriptCore
+WTF.file = Source/WTF/WTF.pro
+WTF.makefile = Makefile.WTF
+SUBDIRS += WTF
+
+!v8 {
+    JavaScriptCore.file = Source/JavaScriptCore/JavaScriptCore.pro
+    JavaScriptCore.makefile = Makefile.JavaScriptCore
+    SUBDIRS += JavaScriptCore
+}
 
 WebCore.file = Source/WebCore/WebCore.pro
 WebCore.makefile = Makefile.WebCore
@@ -34,11 +41,3 @@ QtWebKit.makefile = Makefile.QtWebKit
 SUBDIRS += QtWebKit
 
 SUBDIRS += Tools
-
-OTHER_FILES = \
-    Tools/qmake/README \
-    Tools/qmake/mkspecs/modules/qt_webkit.pri \
-    Tools/qmake/mkspecs/features/*.prf \
-    Tools/qmake/mkspecs/features/mac/*.prf \
-    Tools/qmake/mkspecs/features/unix/*.prf \
-    Tools/qmake/mkspecs/features/win32/*.prf