diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-01-05 09:16:37 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-01-05 09:16:37 (GMT) |
| commit | d00a226f623d5e3807a75caefdce77a83bfdedc2 (patch) | |
| tree | c343304f32162281fbe6a876a126080a6b993f8d /src | |
| parent | c08789f4540ac934ac4a20feaac205837fb0cf6f (diff) | |
| parent | dc50ba5885d27aff99d62ced52081eda851552e7 (diff) | |
| download | Qt-d00a226f623d5e3807a75caefdce77a83bfdedc2.zip Qt-d00a226f623d5e3807a75caefdce77a83bfdedc2.tar.gz Qt-d00a226f623d5e3807a75caefdce77a83bfdedc2.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/ChangeLog | 10 | ||||
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h | 12 | ||||
| -rw-r--r-- | src/3rdparty/webkit/VERSION | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog index 50cff63..a559d9b 100644 --- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog +++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog @@ -1,3 +1,13 @@ +2009-12-08 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> + + Reviewed by Darin Adler. + + Make WebKit build correctly on FreeBSD, IA64, and Alpha. + Based on work by Petr Salinger <Petr.Salinger@seznam.cz>, + and Colin Watson <cjwatson@ubuntu.com>. + + * wtf/Platform.h: + 2009-12-18 Yongjun Zhang <yongjun.zhang@nokia.com> Reviewed by Simon Hausmann. diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h index cb6c9b9..3e1093b 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h @@ -347,6 +347,16 @@ #define WTF_PLATFORM_X86_64 1 #endif +/* PLATFORM(IA64) */ +#if defined(__ia64__) +#define WTF_PLATFORM_IA64 1 +#endif + +/* PLATFORM(ALPHA) */ +#if defined(__alpha__) +#define WTF_PLATFORM_ALPHA 1 +#endif + /* PLATFORM(SH4) */ #if defined(__SH4__) #define WTF_PLATFORM_SH4 1 @@ -709,7 +719,7 @@ #endif #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) -#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(WIN_OS)) +#if (PLATFORM(X86_64) && (PLATFORM(UNIX) || PLATFORM(WIN_OS))) || PLATFORM(IA64) || PLATFORM(ALPHA) #define WTF_USE_JSVALUE64 1 #elif PLATFORM(ARM) || PLATFORM(PPC64) #define WTF_USE_JSVALUE32 1 diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index daa3be7..d36e419 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - 70b5989bdeea2f73bd950099fc0f0e954550ef54 + 5d691a1c283938dfbdf891883d8cff8a6ef040bf |