summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2012-03-23 15:29:57 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-04-12 21:17:00 (GMT)
commit7ac8d8597db1f58b11338f91fb27f6ad8696b34b (patch)
tree7091cfd3e5931233100475b8ae21eb7736deb724 /src/3rdparty
parented881474111d635bb90d3e08e9fb70c06d19d48b (diff)
downloadQt-7ac8d8597db1f58b11338f91fb27f6ad8696b34b.zip
Qt-7ac8d8597db1f58b11338f91fb27f6ad8696b34b.tar.gz
Qt-7ac8d8597db1f58b11338f91fb27f6ad8696b34b.tar.bz2
gcc 4.7.0 compatibility fix for javascript
taken from http://qt-project.org/forums/viewthread/15071 Change-Id: I701fb5a8d754afe9fcd6b327d779365673e07b5d Reviewed-by: Alexis Menard <alexis.menard@openbossa.org> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h2
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
index 7c20272..9eb86e7 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
@@ -59,7 +59,7 @@ namespace JSC {
protected:
using JSVariableObject::JSVariableObjectData;
- struct JSGlobalObjectData : public JSVariableObjectData {
+ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData {
// We use an explicit destructor function pointer instead of a
// virtual destructor because we want to avoid adding a vtable
// pointer to this struct. Adding a vtable pointer would force the
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
index 2542878..3cb66a0 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
@@ -33,7 +33,7 @@ namespace JSC{
class JSStaticScopeObject : public JSVariableObject {
protected:
using JSVariableObject::JSVariableObjectData;
- struct JSStaticScopeObjectData : public JSVariableObjectData {
+ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData {
JSStaticScopeObjectData()
: JSVariableObjectData(&symbolTable, &registerStore + 1)
{