From bc2eac1ef3e6902f8fed65f72b70b582f93bcb19 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Wed, 7 Sep 2011 10:51:39 +1000 Subject: 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 --- ...d-error-suggest-parentheses-around-within.patch | 25 ---------------------- 1 file changed, 25 deletions(-) delete mode 100644 src/v8/0014-Fix-build-error-suggest-parentheses-around-within.patch (limited to 'src/v8/0014-Fix-build-error-suggest-parentheses-around-within.patch') diff --git a/src/v8/0014-Fix-build-error-suggest-parentheses-around-within.patch b/src/v8/0014-Fix-build-error-suggest-parentheses-around-within.patch deleted file mode 100644 index bb26b1493f..0000000000 --- a/src/v8/0014-Fix-build-error-suggest-parentheses-around-within.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d7e876decc00c611d327185bf890a7efecb2cf7e Mon Sep 17 00:00:00 2001 -From: Kent Hansen -Date: Mon, 29 Aug 2011 13:26:13 +0200 -Subject: [PATCH 14/16] Fix build error: "suggest parentheses around '&&' - within '||'" - ---- - src/mark-compact.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/mark-compact.cc b/src/mark-compact.cc -index 1b1e361..775f787 100644 ---- a/src/mark-compact.cc -+++ b/src/mark-compact.cc -@@ -1020,7 +1020,7 @@ class SymbolTableCleaner : public ObjectVisitor { - // Since no objects have yet been moved we can safely access the map of - // the object. - if ((*p)->IsExternalString() || -- (*p)->IsHeapObject() && HeapObject::cast(*p)->map()->has_external_resource()) { -+ ((*p)->IsHeapObject() && HeapObject::cast(*p)->map()->has_external_resource())) { - heap_->FinalizeExternalString(HeapObject::cast(*p)); - } - // Set the entry to null_value (as deleted). --- -1.7.6 -- cgit v1.2.3