forked from cms-sw/cmsdist
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathqt-4.6.3-fix-gcc47.patch
50 lines (45 loc) · 3.13 KB
/
qt-4.6.3-fix-gcc47.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
diff -arupN qt-everywhere-opensource-src-4.6.3.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h qt-everywhere-opensource-src-4.6.3/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
--- qt-everywhere-opensource-src-4.6.3.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-07 16:27:21.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.3/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-08 00:04:35.000000000 +0100
@@ -55,9 +55,7 @@ namespace JSC {
class JSGlobalObject : public JSVariableObject {
protected:
- using JSVariableObject::JSVariableObjectData;
-
- struct JSGlobalObjectData : public JSVariableObjectData {
+ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData {
JSGlobalObjectData()
: JSVariableObjectData(&symbolTable, 0)
, registerArraySize(0)
diff -arupN qt-everywhere-opensource-src-4.6.3.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h qt-everywhere-opensource-src-4.6.3/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
--- qt-everywhere-opensource-src-4.6.3.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-07 16:27:21.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.3/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-07 16:29:34.000000000 +0100
@@ -32,8 +32,7 @@ namespace JSC{
class JSStaticScopeObject : public JSVariableObject {
protected:
- using JSVariableObject::JSVariableObjectData;
- struct JSStaticScopeObjectData : public JSVariableObjectData {
+ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData {
JSStaticScopeObjectData()
: JSVariableObjectData(&symbolTable, ®isterStore + 1)
{
diff -arupN qt-everywhere-opensource-src-4.6.3.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/RefPtr.h qt-everywhere-opensource-src-4.6.3/src/3rdparty/javascriptcore/JavaScriptCore/wtf/RefPtr.h
--- qt-everywhere-opensource-src-4.6.3.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/RefPtr.h 2012-03-07 16:27:21.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.3/src/3rdparty/javascriptcore/JavaScriptCore/wtf/RefPtr.h 2012-03-08 09:31:17.000000000 +0100
@@ -24,6 +24,7 @@
#include <algorithm>
#include "AlwaysInline.h"
#include "FastAllocBase.h"
+#include "PassRefPtr.h"
namespace WTF {
diff -arupN qt-everywhere-opensource-src-4.6.3.orig/tools/porting/src/codemodel.h qt-everywhere-opensource-src-4.6.3/tools/porting/src/codemodel.h
--- qt-everywhere-opensource-src-4.6.3.orig/tools/porting/src/codemodel.h 2012-03-07 16:27:23.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.3/tools/porting/src/codemodel.h 2012-03-08 10:03:06.000000000 +0100
@@ -96,7 +96,7 @@ class Collection: public QMultiHash<QByt
{
public:
void add(CollectedType *collectedItem)
- { insert(collectedItem->name(), collectedItem); }
+ { this->insert(collectedItem->name(), collectedItem); }
};
typedef Collection<Scope> ScopeCollection;