qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <lars.knoll@digia.com>
This commit is contained in:
Simon Hausmann 2014-07-17 13:43:07 +02:00
parent 3c53da0522
commit 659e06f3a0
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qml/jsruntime/qv4arraydata.cpp
View File

@ -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),

2
src/qml/jsruntime/qv4functionobject_p.h
View File

@ -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);

2
src/qml/jsruntime/qv4managed_p.h
View File

@ -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)