diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-11-08 10:39:25 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-09 07:01:28 +0100 |
| commit | 7f18b0ffad9964152b891c614aa96117584b7208 (patch) | |
| tree | ece272a8f905b0dd8d4aeaab11a99cd73441c479 /src/qml/jsruntime | |
| parent | cc291c308f3623d6baab3f0f9ed5273b98f49ad0 (diff) | |
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>
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4value_def_p.h | 8 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4value_p.h | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/qml/jsruntime/qv4value_def_p.h b/src/qml/jsruntime/qv4value_def_p.h index 615f6218e4..48b50951f9 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 ad9ca708c1..680c7465ca 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; |