diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-16 07:51:00 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-16 07:58:16 (GMT) |
| commit | 120329adb47dba60f532c1c2fd2ad0f37b812437 (patch) | |
| tree | fc2311cef4b69fe7294e8f5aab27fe6af2546123 /src/script | |
| parent | ce17ae5a6159d8ce3a5d2cc98f804a2debb860e5 (diff) | |
| download | Qt-120329adb47dba60f532c1c2fd2ad0f37b812437.zip Qt-120329adb47dba60f532c1c2fd2ad0f37b812437.tar.gz Qt-120329adb47dba60f532c1c2fd2ad0f37b812437.tar.bz2 | |
Separate the copy of JavaScriptCore that QtScript uses from the copy that
QtWebKit uses.
This is needed to decouple QtScript from QtWebKit, as discussed in the
WebKit team.
Reviewed-by: Kent Hansen
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/script.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/script.pro b/src/script/script.pro index 1a793b2..e59b2e7 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -19,7 +19,7 @@ win32-msvc*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4503 -wd4800 -wd4819 -wd4996 - # fall back to src/3rdparty otherwise WEBKITDIR = $$(WEBKITDIR) isEmpty(WEBKITDIR) { - WEBKITDIR = $$PWD/../3rdparty/webkit + WEBKITDIR = $$PWD/../3rdparty/javascriptcore # FIXME: not needed once JSCBISON works # TODO: or leave it like this since the generated file is available anyway? |