From: Simon Hausmann <simon.hausmann@digia.com>
Date: Thu, 17 Jul 2014 14:22:44 +0000 (+0200)
Subject: MinGW build fix
X-Git-Tag: v5.3.99+beta1~253
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=661649edf1cd0448b4276fbf6e0a97fd5ec8c792;p=platform%2Fupstream%2Fqtdeclarative.git

MinGW build fix

It is necessary to export String::Data for simplifyString() when called
from qquickcontext2d.cpp and not inlined.

Similarly we need to export BuiltinFunction::Data for tst_qv4debugger

Change-Id: Ic6c0b5ac49c291bd548b46e585e0a2bcc4ba3664
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---

diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h
index 86e4354..907b660 100644
--- a/src/qml/jsruntime/qv4functionobject_p.h
+++ b/src/qml/jsruntime/qv4functionobject_p.h
@@ -190,7 +190,7 @@ struct FunctionPrototype: FunctionObject
 };
 
 struct Q_QML_EXPORT BuiltinFunction: FunctionObject {
-    struct Data : FunctionObject::Data {
+    struct Q_QML_EXPORT Data : FunctionObject::Data {
         Data(ExecutionContext *scope, String *name, ReturnedValue (*code)(CallContext *));
         ReturnedValue (*code)(CallContext *);
     };
diff --git a/src/qml/jsruntime/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h
index 56acd1f..f9d3cd1 100644
--- a/src/qml/jsruntime/qv4string_p.h
+++ b/src/qml/jsruntime/qv4string_p.h
@@ -53,7 +53,7 @@ struct Identifier;
 
 struct Q_QML_PRIVATE_EXPORT String : public Managed {
 #ifndef V4_BOOTSTRAP
-    struct Data : Managed::Data {
+    struct Q_QML_PRIVATE_EXPORT Data : Managed::Data {
         Data(ExecutionEngine *engine, const QString &text);
         Data(ExecutionEngine *engine, String *l, String *n);
         ~Data() {