From 659e06f3a0c5a72154306c16abfeb177b2572e43 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 17 Jul 2014 13:43:07 +0200 Subject: Fix build on Windows * Add missing exports * Define otherwise unused ArrayData vtbl - somehow the linker wants to see the symbols despite them being unused. Change-Id: I83a7ad4dea89bffc16018093a3cd4f4feecbfa3c Reviewed-by: Lars Knoll --- src/qml/jsruntime/qv4arraydata.cpp | 16 ++++++++++++++++ src/qml/jsruntime/qv4functionobject_p.h | 2 +- src/qml/jsruntime/qv4managed_p.h | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/qml/jsruntime/qv4arraydata.cpp b/src/qml/jsruntime/qv4arraydata.cpp index cbfb0d9f00..cd0925092e 100644 --- a/src/qml/jsruntime/qv4arraydata.cpp +++ b/src/qml/jsruntime/qv4arraydata.cpp @@ -45,6 +45,22 @@ using namespace QV4; +const QV4::ManagedVTable QV4::ArrayData::static_vtbl = { + 0, + QV4::ArrayData::IsExecutionContext, + QV4::ArrayData::IsString, + QV4::ArrayData::IsObject, + QV4::ArrayData::IsFunctionObject, + QV4::ArrayData::IsErrorObject, + QV4::ArrayData::IsArrayData, + 0, + QV4::ArrayData::MyType, + "ArrayData", + Q_VTABLE_FUNCTION(QV4::ArrayData, destroy), + 0, + isEqualTo +}; + const ArrayVTable SimpleArrayData::static_vtbl = { DEFINE_MANAGED_VTABLE_INT(SimpleArrayData, 0), diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h index ce8c6e7b79..b7995e948e 100644 --- a/src/qml/jsruntime/qv4functionobject_p.h +++ b/src/qml/jsruntime/qv4functionobject_p.h @@ -95,7 +95,7 @@ struct InternalClass; struct Lookup; struct Q_QML_EXPORT FunctionObject: Object { - struct Data : Object::Data { + struct Q_QML_PRIVATE_EXPORT Data : Object::Data { Data(ExecutionContext *scope, String *name, bool createProto = false); Data(ExecutionContext *scope, const QString &name = QString(), bool createProto = false); Data(ExecutionContext *scope, const ReturnedValue name); diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index 1faed6286a..3fd0676e62 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -187,7 +187,7 @@ const QV4::ObjectVTable classname::static_vtbl = \ struct Q_QML_PRIVATE_EXPORT Managed { - struct Data : HeapObject { + struct Q_QML_PRIVATE_EXPORT Data : HeapObject { Data() {} Data(InternalClass *internal) : internalClass(internal) -- cgit v1.2.3