From 0c1716e9f61631c67f34bb429611a34c287308ec Mon Sep 17 00:00:00 2001 From: Timo Aarnipuro Date: Tue, 15 Oct 2019 15:06:58 +0300 Subject: Use QV4 namespace for Value "Value" is a globally defined type on INTEGRITY platform, which causes the compiler to become confused about ambiguous use. Change-Id: Ic01ce9cf3a8a2c901b3fbe1aa68b419f2778b089 Reviewed-by: Kimmo Ollila Reviewed-by: Simon Hausmann Reviewed-by: Ulf Hermann --- src/qml/jsruntime/qv4qobjectwrapper.cpp | 4 ++-- src/qml/jsruntime/qv4vme_moth.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index c36da3815d..9d0b65cc0a 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -1622,7 +1622,7 @@ static QV4::ReturnedValue CallOverloaded(const QQmlObjectOrGadget &object, const int methodMatchScore = 0; for (int ii = 0; ii < methodArgumentCount; ++ii) { - methodMatchScore += MatchScore((v = Value::fromStaticValue(callArgs->args[ii])), + methodMatchScore += MatchScore((v = QV4::Value::fromStaticValue(callArgs->args[ii])), methodArgTypes[ii]); } @@ -2268,7 +2268,7 @@ ReturnedValue QMetaObjectWrapper::callOverloadedConstructor(QV4::ExecutionEngine int methodMatchScore = 0; for (int ii = 0; ii < methodArgumentCount; ++ii) { - methodMatchScore += MatchScore((v = Value::fromStaticValue(callArgs->args[ii])), + methodMatchScore += MatchScore((v = QV4::Value::fromStaticValue(callArgs->args[ii])), methodArgTypes[ii]); } diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp index 27d518f5c6..ad5a6ebc8c 100644 --- a/src/qml/jsruntime/qv4vme_moth.cpp +++ b/src/qml/jsruntime/qv4vme_moth.cpp @@ -364,7 +364,7 @@ static inline Heap::CallContext *getScope(QV4::Value *stack, int level) static inline const QV4::Value &constant(Function *function, int index) { - return function->compilationUnit->constants[index].asValue(); + return function->compilationUnit->constants[index].asValue(); } static bool compareEqualInt(QV4::Value &accumulator, QV4::Value lhs, int rhs) -- cgit v1.2.3