diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
| commit | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch) | |
| tree | 8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /WebKit.pro | |
| parent | d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff) | |
| download | qtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz | |
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'WebKit.pro')
| -rw-r--r-- | WebKit.pro | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/WebKit.pro b/WebKit.pro index 2df08f5eb..d055e7bc9 100644 --- a/WebKit.pro +++ b/WebKit.pro @@ -14,10 +14,15 @@ isEmpty(QMAKEPATH)|!exists($${QMAKEPATH}/mkspecs) { # 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,14 +39,3 @@ QtWebKit.makefile = Makefile.QtWebKit SUBDIRS += QtWebKit SUBDIRS += Tools - -OTHER_FILES = \ - Tools/qmake/README \ - Tools/qmake/configure.pro \ - Tools/qmake/sync.profile \ - Tools/qmake/config.tests/fontconfig/* \ - Tools/qmake/mkspecs/modules/* \ - Tools/qmake/mkspecs/features/*.prf \ - Tools/qmake/mkspecs/features/mac/*.prf \ - Tools/qmake/mkspecs/features/unix/*.prf \ - Tools/qmake/mkspecs/features/win32/*.prf |