INTEGRITY: Fix build failures on 64-bit ARM

Change-Id: I44a90dec16dc1421a32a7770b353a4df14c057f9
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

4 files changed, 12 insertions, 12 deletions

diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index 2e4223de7d..8cdec2f6ee 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -764,11 +764,11 @@ struct QObjectWrapperOwnPropertyKeyIterator : ObjectOwnPropertyKeyIterator
 {
     int propertyIndex = 0;
     ~QObjectWrapperOwnPropertyKeyIterator() override = default;
-    PropertyKey next(const Object *o, Property *pd = nullptr, PropertyAttributes *attrs = nullptr) override;
+    PropertyKey next(const QV4::Object *o, Property *pd = nullptr, PropertyAttributes *attrs = nullptr) override;
 
 };
 
-PropertyKey QObjectWrapperOwnPropertyKeyIterator::next(const Object *o, Property *pd, PropertyAttributes *attrs)
+PropertyKey QObjectWrapperOwnPropertyKeyIterator::next(const QV4::Object *o, Property *pd, PropertyAttributes *attrs)
 {
     // Used to block access to QObject::destroyed() and QObject::deleteLater() from QML
     static const int destroyedIdx1 = QObject::staticMetaObject.indexOfSignal("destroyed(QObject*)");
diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp
index 634fbcbd97..4ef4fa2c9e 100644
--- a/src/qml/jsruntime/qv4regexpobject.cpp
+++ b/src/qml/jsruntime/qv4regexpobject.cpp
@@ -238,20 +238,20 @@ void Heap::RegExpCtor::clearLastMatch()
     lastMatchEnd = 0;
 }
 
-static bool isRegExp(ExecutionEngine *e, const Value *arg)
+static bool isRegExp(ExecutionEngine *e, const QV4::Value *arg)
 {
-    const Object *o = arg->objectValue();
+    const QV4::Object *o = arg->objectValue();
     if (!o)
         return false;
 
-    Value isRegExp = Value::fromReturnedValue(o->get(e->symbol_match()));
+    QV4::Value isRegExp = QV4::Value::fromReturnedValue(o->get(e->symbol_match()));
     if (!isRegExp.isUndefined())
         return isRegExp.toBoolean();
     const RegExpObject *re = o->as<RegExpObject>();
     return re ? true : false;
 }
 
-uint parseFlags(Scope &scope, const Value *f)
+uint parseFlags(Scope &scope, const QV4::Value *f)
 {
     uint flags = CompiledData::RegExp::RegExp_NoFlags;
     if (!f->isUndefined()) {
@@ -546,13 +546,13 @@ static int advanceStringIndex(int index, const QString &str, bool unicode)
     return index;
 }
 
-static void advanceLastIndexOnEmptyMatch(ExecutionEngine *e, bool unicode, Object *rx, const String *matchString, const QString &str)
+static void advanceLastIndexOnEmptyMatch(ExecutionEngine *e, bool unicode, QV4::Object *rx, const String *matchString, const QString &str)
 {
     Scope scope(e);
     if (matchString->d()->length() == 0) {
-        ScopedValue v(scope, rx->get(scope.engine->id_lastIndex()));
+        QV4::ScopedValue v(scope, rx->get(scope.engine->id_lastIndex()));
         int lastIndex = advanceStringIndex(v->toLength(), str, unicode);
-        if (!rx->put(scope.engine->id_lastIndex(), Value::fromInt32(lastIndex)))
+        if (!rx->put(scope.engine->id_lastIndex(), QV4::Value::fromInt32(lastIndex)))
             scope.engine->throwTypeError();
     }
 }
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp
index f6b9c5ba94..03f351b9e4 100644
--- a/src/qml/jsruntime/qv4stringobject.cpp
+++ b/src/qml/jsruntime/qv4stringobject.cpp
@@ -112,11 +112,11 @@ bool StringObject::virtualDeleteProperty(Managed *m, PropertyKey id)
 struct StringObjectOwnPropertyKeyIterator : ObjectOwnPropertyKeyIterator
 {
     ~StringObjectOwnPropertyKeyIterator() override = default;
-    PropertyKey next(const Object *o, Property *pd = nullptr, PropertyAttributes *attrs = nullptr) override;
+    PropertyKey next(const QV4::Object *o, Property *pd = nullptr, PropertyAttributes *attrs = nullptr) override;
 
 };
 
-PropertyKey StringObjectOwnPropertyKeyIterator::next(const Object *o, Property *pd, PropertyAttributes *attrs)
+PropertyKey StringObjectOwnPropertyKeyIterator::next(const QV4::Object *o, Property *pd, PropertyAttributes *attrs)
 {
     const StringObject *s = static_cast<const StringObject *>(o);
     uint slen = s->d()->string->toQString().length();
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp
index 29814246db..1cca50f6c1 100644
--- a/src/qml/jsruntime/qv4vme_moth.cpp
+++ b/src/qml/jsruntime/qv4vme_moth.cpp
@@ -377,7 +377,7 @@ static bool compareEqualInt(QV4::Value &accumulator, QV4::Value lhs, int rhs)
         if (lhs.m()->internalClass->vtable->isString)
             return RuntimeHelpers::stringToNumber(static_cast<String &>(lhs).toQString()) == rhs;
         accumulator = lhs;
-        lhs = Value::fromReturnedValue(RuntimeHelpers::objectDefaultValue(&static_cast<QV4::Object &>(accumulator), PREFERREDTYPE_HINT));
+        lhs = QV4::Value::fromReturnedValue(RuntimeHelpers::objectDefaultValue(&static_cast<QV4::Object &>(accumulator), PREFERREDTYPE_HINT));
         goto redo;
     case QV4::Value::QT_Empty:
         Q_UNREACHABLE();