diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-12 07:49:03 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-12 07:49:03 +0200 |
| commit | a9ac6da893ac10ce160c9eb80141508881cd71e2 (patch) | |
| tree | 0e74067407612d44ad07ff74cb7be6d444ee28c5 /src/v8/0015-Fix-source-compatibility-where-the-String-Equals-ove.patch | |
| parent | 8eb5ba3b9cb1e8e07f28a3153672a946b2d82fd9 (diff) | |
| parent | 687461627310e8b781da15d1a907c35bd8ffea6e (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/3rdparty/v8
src/gui/text/qfont_qpa.cpp
src/gui/widgets/qlinecontrol.cpp
src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp
tests/auto/gui.pro
tests/auto/network.pro
tests/auto/qstring/tst_qstring.cpp
Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe
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.patch | 25 |
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 |