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/0014-Fix-build-error-suggest-parentheses-around-within.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/0014-Fix-build-error-suggest-parentheses-around-within.patch')
| -rw-r--r-- | src/v8/0014-Fix-build-error-suggest-parentheses-around-within.patch | 25 |
1 files changed, 0 insertions, 25 deletions
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 <kent.hansen@nokia.com> -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 |