summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit/0004-gcc5-qtbug-44829.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtwebkit/0004-gcc5-qtbug-44829.patch')
-rw-r--r--recipes-qt/qt5/qtwebkit/0004-gcc5-qtbug-44829.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0004-gcc5-qtbug-44829.patch b/recipes-qt/qt5/qtwebkit/0004-gcc5-qtbug-44829.patch
new file mode 100644
index 00000000..81295d1c
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit/0004-gcc5-qtbug-44829.patch
@@ -0,0 +1,36 @@
1From 650c6ee8e76bb574d3a1bea09e2494992d8f070e Mon Sep 17 00:00:00 2001
2From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
3Date: Fri, 6 Mar 2015 11:20:13 +0100
4Subject: Fix g++ 5.0 build
5
6A non-inline template needs to be explicitly instantiated if used
7outside the object where it is declared.
8
9Patch suggested by Khem Raj.
10
11Task-number: QTBUG-44829
12Change-Id: Ib0adbd9273bd1cef01e5863bc8aaa9c373022792
13Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
14---
15 Source/JavaScriptCore/runtime/JSObject.cpp | 5 +++++
16 1 file changed, 5 insertions(+)
17
18diff --git a/Source/JavaScriptCore/runtime/JSObject.cpp b/Source/JavaScriptCore/runtime/JSObject.cpp
19index 5637e20..bd55919 100644
20--- a/Source/JavaScriptCore/runtime/JSObject.cpp
21+++ b/Source/JavaScriptCore/runtime/JSObject.cpp
22@@ -1909,6 +1909,11 @@ void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, un
23 }
24 }
25
26+// Used in JSArray.cpp so we must instantiate explicit
27+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
28+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
29+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
30+
31 void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
32 {
33 VM& vm = exec->vm();
34--
35cgit v0.11.0
36