From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Fri, 8 Nov 2013 08:39:25 +0000 (+0200)
Subject: Move Primitive::emptyValue() to qv4value_def_p.h.
X-Git-Tag: upstream/5.2.1~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7f18b0ffad9964152b891c614aa96117584b7208;p=platform%2Fupstream%2Fqtdeclarative.git

Move Primitive::emptyValue() to qv4value_def_p.h.

Silence MinGW-warnings:  warning: 'static QV4::Primitive
QV4::Primitive::emptyValue()' redeclared without dllimport attribute
after being referenced with dll linkage

Task-number: QTBUG-34152

Change-Id: Id6971a20f1901022ab0d1c8f1834b135c71510ae
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---

diff --git a/src/qml/jsruntime/qv4value_def_p.h b/src/qml/jsruntime/qv4value_def_p.h
index 615f621..48b5095 100644
--- a/src/qml/jsruntime/qv4value_def_p.h
+++ b/src/qml/jsruntime/qv4value_def_p.h
@@ -382,6 +382,14 @@ inline Primitive Primitive::undefinedValue()
     return v;
 }
 
+inline Primitive Primitive::emptyValue()
+{
+    Primitive v;
+    v.tag = Value::Empty_Type;
+    v.uint_32 = 0;
+    return v;
+}
+
 inline Value Value::fromManaged(Managed *m)
 {
     if (!m)
diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
index ad9ca70..680c746 100644
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
@@ -105,15 +105,6 @@ inline Primitive Primitive::nullValue()
     return v;
 }
 
-inline Primitive Primitive::emptyValue()
-{
-    Primitive v;
-    v.tag = Value::Empty_Type;
-    v.uint_32 = 0;
-    return v;
-}
-
-
 inline Primitive Primitive::fromBoolean(bool b)
 {
     Primitive v;