diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-10-23 11:18:42 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-10-23 11:18:42 (GMT) |
| commit | 97d28c26ba981332f51ab81024bb8b0224afeb81 (patch) | |
| tree | 9c03fd067695043b3a061ad192b6f45e2cf6ecba /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | |
| parent | d48c3129992bf4b962201fa908f37f0e2a61f7c4 (diff) | |
| parent | 180d9189e8098d98848367f673fff723ddd1d068 (diff) | |
| download | Qt-97d28c26ba981332f51ab81024bb8b0224afeb81.zip Qt-97d28c26ba981332f51ab81024bb8b0224afeb81.tar.gz Qt-97d28c26ba981332f51ab81024bb8b0224afeb81.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri index 2b08980..89c483e 100644 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri @@ -137,7 +137,8 @@ SOURCES += \ interpreter/RegisterFile.cpp symbian { - SOURCES += runtime/MarkStackSymbian.cpp + SOURCES += jit/ExecutableAllocatorSymbian.cpp \ + runtime/MarkStackSymbian.cpp } else { win32-*|wince* { SOURCES += jit/ExecutableAllocatorWin.cpp \ @@ -148,6 +149,10 @@ symbian { } } +!contains(DEFINES, USE_SYSTEM_MALLOC) { + SOURCES += wtf/TCSystemAlloc.cpp +} + # AllInOneFile.cpp helps gcc analize and optimize code # Other compilers may be able to do this at link time SOURCES += \ |