diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-09-07 10:51:39 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-07 04:50:45 +0200 |
commit | bc2eac1ef3e6902f8fed65f72b70b582f93bcb19 (patch) | |
tree | 6af22cb1316b194268981bee884d17ba40dbce3a /src/v8/0007-Fix-warnings.patch | |
parent | 846c5c9459331cde33ef92b665fab1457eaf1252 (diff) |
Update V8
This fixes a few bugs in QML mode name resolution and simplifies
our V8 patchset a little by folding some patches together.
Change-Id: Ia528a43ac8ccad95ac81bcdff5d05aaeab4b48b2
Reviewed-on: http://codereview.qt.nokia.com/4294
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/v8/0007-Fix-warnings.patch')
-rw-r--r-- | src/v8/0007-Fix-warnings.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/v8/0007-Fix-warnings.patch b/src/v8/0007-Fix-warnings.patch index fe6fa59517..cd27a7be63 100644 --- a/src/v8/0007-Fix-warnings.patch +++ b/src/v8/0007-Fix-warnings.patch @@ -1,17 +1,17 @@ -From dac5d9db84cf20564621c679937ca7b9c6a8e880 Mon Sep 17 00:00:00 2001 +From 2a5cf85d7fd7912e516138db03e4cda47cc2a1ab Mon Sep 17 00:00:00 2001 From: Aaron Kennedy <aaron.kennedy@nokia.com> Date: Fri, 27 May 2011 13:04:15 +1000 -Subject: [PATCH 07/16] Fix warnings +Subject: [PATCH 07/14] Fix warnings --- include/v8.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/v8.h b/include/v8.h -index 9aba4a8..8891dab 100644 +index 2bc0ed1..99f4b9a 100644 --- a/include/v8.h +++ b/include/v8.h -@@ -2415,7 +2415,7 @@ class V8EXPORT Extension { // NOLINT +@@ -2416,7 +2416,7 @@ class V8EXPORT Extension { // NOLINT const char** deps = 0); virtual ~Extension() { } virtual v8::Handle<v8::FunctionTemplate> @@ -19,11 +19,11 @@ index 9aba4a8..8891dab 100644 + GetNativeFunction(v8::Handle<v8::String>) { return v8::Handle<v8::FunctionTemplate>(); } - -@@ -3721,13 +3721,13 @@ class Internals { + +@@ -3722,13 +3722,13 @@ class Internals { return *reinterpret_cast<T*>(addr); } - + - static inline bool CanCastToHeapObject(void* o) { return false; } - static inline bool CanCastToHeapObject(Context* o) { return true; } - static inline bool CanCastToHeapObject(String* o) { return true; } @@ -39,8 +39,8 @@ index 9aba4a8..8891dab 100644 + static inline bool CanCastToHeapObject(StackTrace*) { return true; } + static inline bool CanCastToHeapObject(StackFrame*) { return true; } }; - + } // namespace internal --- -1.7.6 +-- +1.7.4.4 |