De-inline the call, as __qmljs_convert_to_string wasn't exported by the linker anymore

For some weird reason the linker refused to export the symbol from
libQt5Qml for me.

Change-Id: Ic5ff0f6ac9665f3bd652c76503cb1d5201d2952b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/src/qml/qml/v4vm/qv4value.cpp b/src/qml/qml/v4vm/qv4value.cpp
index 996b999..6de197b 100644 (file)
--- a/src/qml/qml/v4vm/qv4value.cpp
+++ b/src/qml/qml/v4vm/qv4value.cpp
@@ -160,6 +160,13 @@ double Value::toInteger(double number)
     return std::signbit(number) ? -v : v;
 }
 
+String *Value::toString(ExecutionContext *ctx) const
+{
+    if (isString())
+        return stringValue();
+    return __qmljs_convert_to_string(ctx, *this);
+}
+
 Value Value::property(ExecutionContext *ctx, String *name) const
 {
     return isObject() ? objectValue()->get(ctx, name) : undefinedValue();

diff --git a/src/qml/qml/v4vm/qv4value_p.h b/src/qml/qml/v4vm/qv4value_p.h
index 02da8f2..28bac74 100644 (file)
--- a/src/qml/qml/v4vm/qv4value_p.h
+++ b/src/qml/qml/v4vm/qv4value_p.h
@@ -396,13 +396,6 @@ inline Bool Value::toBoolean() const
     }
 }
 
-inline String *Value::toString(ExecutionContext *ctx) const
-{
-    if (isString())
-        return stringValue();
-    return __qmljs_convert_to_string(ctx, *this);
-}
-
 inline Object *Value::toObject(ExecutionContext *ctx) const
 {
     if (isObject())