summaryrefslogtreecommitdiff
path: root/WebKit.pro
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-06-27 09:28:46 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-06-27 09:28:46 +0200
commit6668b07fcd51f86be243b9e08e667224e30c0cf8 (patch)
tree64f466e09b68a77ae1156c0d35cd5b95e18a34ca /WebKit.pro
parente7923d9de38974f0c6fb7646c898a6ea618261e8 (diff)
downloadqtwebkit-6668b07fcd51f86be243b9e08e667224e30c0cf8.tar.gz
Imported WebKit commit 26cd9bd8ab0471ffe987c9b60368f63dc0f1f31b (http://svn.webkit.org/repository/webkit/trunk@121325)
New snapshot with more Windows build fixes
Diffstat (limited to 'WebKit.pro')
-rw-r--r--WebKit.pro8
1 files changed, 7 insertions, 1 deletions
diff --git a/WebKit.pro b/WebKit.pro
index eb23fd331..9b4007b51 100644
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -30,12 +30,18 @@ WebCore.file = Source/WebCore/WebCore.pro
WebCore.makefile = Makefile.WebCore
SUBDIRS += WebCore
-!CONFIG(no_webkit2) {
+!no_webkit2 {
webkit2.file = Source/WebKit2/WebKit2.pro
webkit2.makefile = Makefile.WebKit2
SUBDIRS += webkit2
}
+!no_webkit1 {
+ webkit1.file = Source/WebKit/WebKit1.pro
+ webkit1.makefile = Makefile.WebKit1
+ SUBDIRS += webkit1
+}
+
QtWebKit.file = Source/QtWebKit.pro
QtWebKit.makefile = Makefile.QtWebKit
SUBDIRS += QtWebKit