summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit.pro
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@nokia.com>2010-04-06 10:36:47 (GMT)
committerJocelyn Turcotte <jocelyn.turcotte@nokia.com>2010-04-06 10:36:47 (GMT)
commitbb35b65bbfba82e0dd0ac306d3dab54436cdaff6 (patch)
tree8174cb262a960ff7b2e4aa8f1aaf154db71d2636 /src/3rdparty/webkit/WebKit.pro
parent4b27d0d887269583a0f76e922948f8c25e96ab88 (diff)
downloadQt-bb35b65bbfba82e0dd0ac306d3dab54436cdaff6.zip
Qt-bb35b65bbfba82e0dd0ac306d3dab54436cdaff6.tar.gz
Qt-bb35b65bbfba82e0dd0ac306d3dab54436cdaff6.tar.bz2
Update src/3rdparty/webkit from trunk.
Imported from 839d8709327f925aacb3b6362c06152594def97e in branch qtwebkit-2.0 of repository git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git Rubber-stamped-by: Simon Hausmann
Diffstat (limited to 'src/3rdparty/webkit/WebKit.pro')
-rw-r--r--src/3rdparty/webkit/WebKit.pro35
1 files changed, 35 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKit.pro b/src/3rdparty/webkit/WebKit.pro
new file mode 100644
index 0000000..3c6b1a7
--- /dev/null
+++ b/src/3rdparty/webkit/WebKit.pro
@@ -0,0 +1,35 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+
+include(WebKit.pri)
+
+SUBDIRS += \
+ JavaScriptCore \
+ WebCore \
+ WebKitTools/QtLauncher
+
+!CONFIG(standalone_package) {
+ SUBDIRS += JavaScriptCore/jsc.pro \
+ WebKit/qt/tests \
+ WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
+
+ !win32:!symbian {
+ SUBDIRS += WebKitTools/DumpRenderTree/qt/ImageDiff.pro
+ SUBDIRS += WebKitTools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
+ }
+
+}
+
+build-qtscript {
+ SUBDIRS += \
+ JavaScriptCore/qt/api/QtScript.pro \
+ JavaScriptCore/qt/tests
+}
+
+symbian {
+ # Forward the install target to WebCore. A workaround since INSTALLS is not implemented for symbian
+ install.commands = $(MAKE) -C WebCore install
+ QMAKE_EXTRA_TARGETS += install
+}
+
+include(WebKit/qt/docs/docs.pri)