summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-08-21 05:22:59 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-08-21 05:22:59 (GMT)
commit9093368f33ddc422047103a89effcd40338b4dbc (patch)
tree78c9660b403214de7ba793c9b06bbb0b65cd5eac /src/3rdparty
parent5365c1cdf1e79b60f913f8fba2b5a25058d65b5c (diff)
parent1af6fc12def29e3f44dd7fcf5635c688902f29c8 (diff)
downloadQt-9093368f33ddc422047103a89effcd40338b4dbc.zip
Qt-9093368f33ddc422047103a89effcd40338b4dbc.tar.gz
Qt-9093368f33ddc422047103a89effcd40338b4dbc.tar.bz2
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
index b43602e..d65095d 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
@@ -128,7 +128,7 @@ SOURCES += \
yarr/RegexJIT.cpp \
interpreter/RegisterFile.cpp
-win32-*: SOURCES += jit/ExecutableAllocatorWin.cpp
+win32-*|wince*: SOURCES += jit/ExecutableAllocatorWin.cpp
else: SOURCES += jit/ExecutableAllocatorPosix.cpp
# AllInOneFile.cpp helps gcc analize and optimize code