summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Aarnipuro <timo.aarnipuro@qt.io>2019-10-15 15:06:58 +0300
committerTimo Aarnipuro <timo.aarnipuro@qt.io>2019-10-17 09:17:21 +0300
commit0c1716e9f61631c67f34bb429611a34c287308ec (patch)
tree596e4185f5464e3ace9f7677917f27fff9f5173b
parente2b6135b25c06cd93a0275d40d1ef736a50a169d (diff)
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 <kimmo.ollila@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r--src/qml/jsruntime/qv4qobjectwrapper.cpp4
-rw-r--r--src/qml/jsruntime/qv4vme_moth.cpp2
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<Value>();
+ return function->compilationUnit->constants[index].asValue<QV4::Value>();
}
static bool compareEqualInt(QV4::Value &accumulator, QV4::Value lhs, int rhs)