diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-03-17 12:19:10 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-03-17 12:19:10 (GMT) |
| commit | 63520c42a85cc4b3d7e5da6f14b6e12774274fef (patch) | |
| tree | 7229b0e3bdf624f3d07906027d40085075c1aec6 /src/3rdparty/javascriptcore/JavaScriptCore/wscript | |
| parent | 8a5cd17c49888e5b6cb230516e1722af9adba251 (diff) | |
| parent | ed08d67fea713e550da0fd0542672cc4443806e2 (diff) | |
| download | Qt-63520c42a85cc4b3d7e5da6f14b6e12774274fef.zip Qt-63520c42a85cc4b3d7e5da6f14b6e12774274fef.tar.gz Qt-63520c42a85cc4b3d7e5da6f14b6e12774274fef.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
configure.exe
src/declarative/util/qdeclarativelistmodel.cpp
tools/qml/qml.pro
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/wscript')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wscript b/src/3rdparty/javascriptcore/JavaScriptCore/wscript index 9dd37c9..356950f 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wscript +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wscript @@ -29,8 +29,8 @@ import commands from settings import * -jscore_excludes = ['jsc.cpp', 'ucptable.cpp', 'GOwnPtr.cpp'] -jscore_excludes.extend(get_excludes(jscore_dir, ['*CF.cpp'])) +jscore_excludes = ['jsc.cpp', 'ucptable.cpp'] +jscore_excludes.extend(get_excludes(jscore_dir, ['*CF.cpp', '*Symbian.cpp'])) sources = [] |