diff options
| author | Alexis Menard <alexis.menard@trolltech.com> | 2011-05-30 21:40:30 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@trolltech.com> | 2011-05-30 21:40:30 (GMT) |
| commit | 5f4e810e50c102384d3623afa47629777a4af26d (patch) | |
| tree | e5a0e6699eb3bff37f0ffeaab799bb0146d3cea1 /src/src.pro | |
| parent | 95fe761f2e3d5c578e79bf59a0e2818eed310c67 (diff) | |
| download | Qt-5f4e810e50c102384d3623afa47629777a4af26d.zip Qt-5f4e810e50c102384d3623afa47629777a4af26d.tar.gz Qt-5f4e810e50c102384d3623afa47629777a4af26d.tar.bz2 | |
Updated WebKit to d14495f006a09eaee01d155fa57c80537408a835
Reviewed-by: Andreas Kling
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/src.pro b/src/src.pro index 0908911..9dc0408 100644 --- a/src/src.pro +++ b/src/src.pro @@ -22,7 +22,7 @@ contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg contains(QT_CONFIG, script): SRC_SUBDIRS += src_script contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_declarative contains(QT_CONFIG, webkit) { - exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): SRC_SUBDIRS += src_javascriptcore + exists($$QT_SOURCE_TREE/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pro): SRC_SUBDIRS += src_javascriptcore SRC_SUBDIRS += src_webkit } !contains(QT_CONFIG, no-gui):contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools @@ -78,13 +78,13 @@ src_imports.subdir = $$QT_SOURCE_TREE/src/imports src_imports.target = sub-imports src_testlib.subdir = $$QT_SOURCE_TREE/src/testlib src_testlib.target = sub-testlib -src_javascriptcore.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore +src_javascriptcore.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/JavaScriptCore src_javascriptcore.target = sub-javascriptcore -src_webkit.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebCore +src_webkit.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/WebCore src_webkit.target = sub-webkit src_declarative.subdir = $$QT_SOURCE_TREE/src/declarative src_declarative.target = sub-declarative -src_webkit_declarative.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/declarative +src_webkit_declarative.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/WebKit/qt/declarative src_webkit_declarative.target = sub-webkitdeclarative #CONFIG += ordered @@ -121,7 +121,7 @@ src_webkit_declarative.target = sub-webkitdeclarative src_webkit.depends = src_gui src_sql src_network contains(QT_CONFIG, xmlpatterns): src_webkit.depends += src_xmlpatterns src_imports.depends += src_webkit - exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro) { + exists($$QT_SOURCE_TREE/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pro) { src_webkit.depends += src_javascriptcore src_javascriptcore.depends = src_corelib } @@ -200,7 +200,7 @@ contains(CONFIG, run_on_phone) { src_runonphone_target.commands = $(MAKE) -C $$QT_BUILD_TREE/src/s60installs runonphone src_runonphone_target.depends = first contains(QT_CONFIG, webkit) { - src_runonphone_target.commands += && $(MAKE) -C $$QT_BUILD_TREE/src/3rdparty/webkit/WebCore runonphone + src_runonphone_target.commands += && $(MAKE) -C $$QT_BUILD_TREE/src/3rdparty/webkit/Source/WebCore runonphone } QMAKE_EXTRA_TARGETS += src_runonphone_target } |