diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-07 12:55:17 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-07 12:55:17 (GMT) |
| commit | 58200ea1b99d8ac823c68b1e7cf603989a561a8c (patch) | |
| tree | c2cf19b89e1622c58758a82e82f0081321415f11 /src/3rdparty/webkit/JavaScriptCore | |
| parent | d3527d779b784ad89285bcb8790504354d9dd3ae (diff) | |
| download | Qt-58200ea1b99d8ac823c68b1e7cf603989a561a8c.zip Qt-58200ea1b99d8ac823c68b1e7cf603989a561a8c.tar.gz Qt-58200ea1b99d8ac823c68b1e7cf603989a561a8c.tar.bz2 | |
Updated WebKit to 6db5de6d18c3ab8b74809303e4d79abacfc570a8
Integrated changes:
|| <https://webkit.org/b/31403> || [Qt] Disable pthread_setname_np. ||
|| <https://webkit.org/b/38324> || [Qt] Fix compilation with QT_NO_FEATURE ||
|| <https://webkit.org/b/40221> || REGRESSION(r60169): [Qt] Selected text is not drawn with the correct color. ||
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/ChangeLog | 15 | ||||
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h | 4 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog index 016e0dd..d9b2987 100644 --- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog +++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog @@ -1,3 +1,18 @@ +2010-06-07 Benjamin Poulain <benjamin.poulain@nokia.com> + + Reviewed by Simon Hausmann. + + [Qt] Crash when compiling on Snow Leopard and running on Leopard + https://bugs.webkit.org/show_bug.cgi?id=31403 + + Disable the use of pthread_setname_np and other symbols + when targetting Leopard. + + Use the defines TARGETING_XX instead of BUILDING_ON_XX + for features that cannot be used before Snow Leopard. + + * wtf/Platform.h: + 2010-04-20 Csaba Osztrogonác <ossy@webkit.org> [Qt] Unreviewed speculative buildfix for WinCE after r57882 diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h index fac477e..876e60e 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h @@ -700,11 +700,11 @@ #define HAVE_SYS_TIME_H 1 #define HAVE_SYS_TIMEB_H 1 -#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) +#if !defined(TARGETING_TIGER) && !defined(TARGETING_LEOPARD) #define HAVE_DISPATCH_H 1 -#if !PLATFORM(IPHONE) && !PLATFORM(QT) +#if !PLATFORM(IPHONE) #define HAVE_MADV_FREE_REUSE 1 #define HAVE_MADV_FREE 1 #define HAVE_PTHREAD_SETNAME_NP 1 |