summaryrefslogtreecommitdiffstats
path: root/src/v8/0015-Fix-source-compatibility-where-the-String-Equals-ove.patch
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2011-09-07 10:51:39 +1000
committerQt by Nokia <qt-info@nokia.com>2011-09-07 04:50:45 +0200
commitbc2eac1ef3e6902f8fed65f72b70b582f93bcb19 (patch)
tree6af22cb1316b194268981bee884d17ba40dbce3a /src/v8/0015-Fix-source-compatibility-where-the-String-Equals-ove.patch
parent846c5c9459331cde33ef92b665fab1457eaf1252 (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/0015-Fix-source-compatibility-where-the-String-Equals-ove.patch')
-rw-r--r--src/v8/0015-Fix-source-compatibility-where-the-String-Equals-ove.patch25
1 files changed, 0 insertions, 25 deletions
diff --git a/src/v8/0015-Fix-source-compatibility-where-the-String-Equals-ove.patch b/src/v8/0015-Fix-source-compatibility-where-the-String-Equals-ove.patch
deleted file mode 100644
index 003c430f56..0000000000
--- a/src/v8/0015-Fix-source-compatibility-where-the-String-Equals-ove.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0af1e15a3d6b28923c262a02a5ace35812c8f5d6 Mon Sep 17 00:00:00 2001
-From: Simon Hausmann <simon.hausmann@nokia.com>
-Date: Thu, 4 Aug 2011 21:28:38 +0200
-Subject: [PATCH 15/16] Fix source compatibility where the String::Equals
- overloads would shadow the Value::Equals function,
- breaking the build.
-
----
- include/v8.h | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/include/v8.h b/include/v8.h
-index 4194d4a..5e1ce50 100644
---- a/include/v8.h
-+++ b/include/v8.h
-@@ -1048,6 +1048,7 @@ class String : public Primitive {
- */
- V8EXPORT bool Equals(uint16_t *string, int length);
- V8EXPORT bool Equals(char *string, int length);
-+ inline bool Equals(Handle<Value> that) const { return v8::Value::Equals(that); }
-
- /**
- * Write the contents of the string to an external buffer.
---
-1.7.6