diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-06 12:44:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-06 12:44:20 (GMT) |
| commit | d63accf173ed58c7746ecd1e3a40ecac263f186f (patch) | |
| tree | 87573a93956f4844bde449bde3161972db826eb1 /src/3rdparty/webkit/JavaScriptCore | |
| parent | b0fd5e82c0d7d62a01cce2c1cdcb925bc5a34182 (diff) | |
| parent | e8b3defc466fff9110ee00b6e730d405cde52abc (diff) | |
| download | Qt-d63accf173ed58c7746ecd1e3a40ecac263f186f.zip Qt-d63accf173ed58c7746ecd1e3a40ecac263f186f.tar.gz Qt-d63accf173ed58c7746ecd1e3a40ecac263f186f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
Fix QT_NO_CONTEXTMENU
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 865abd2871c801c1d3d0f4eebd985b2daab89ebe )
Fix license check failure.
QHttpSocketEngine: Remove unneeded code
doc: Clarified that .lnk files are System files on Windows.
doc: Clarified that the scene owns its items and destroys them.
QAbstractSocket: Fix warnings when compiling with QABSTRACTSOCKET_DEBUG
QAbstractSocket: Warn when wrong QHostInfo was received
doc: Fixed references to currsor position().
Prevent a crash when creating an inputContext from the QApplication dtor.
doc: Added some missing macro descriptions.
Small optimization in QIODevice::readAll()
doc: Added note explaining grabMouse() for Cocoa and Carbon.
doc: Replaced usses of rootState() with state machine pointer.
doc: Fixed typo.
doc: Clarified which values were added in Qt 4.4.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 5d691a1c283938dfbdf891883d8cff8a6ef040bf )
doc: Clarified next and previous activation order.
Fix typo in QFSFileEnginePrivate::canonicalized
tst_qhostinfo benchmark: Fix license header
...
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/ChangeLog | 10 | ||||
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h | 12 |
2 files changed, 21 insertions, 1 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 |