diff options
author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2018-10-19 11:54:15 +0300 |
---|---|---|
committer | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2018-10-22 12:42:30 +0000 |
commit | f8ee8e4e8b3051ffd63533017f6b647fef6056ff (patch) | |
tree | 1fe8118f562f2a57b4bad9537b0efd5dca1bfe96 /src/qml/jsruntime/qv4regexpobject.cpp | |
parent | 6734ee9a6ddb6a3870556514a70d904836258559 (diff) |
INTEGRITY: Fix build failures on 64-bit ARM
Change-Id: I44a90dec16dc1421a32a7770b353a4df14c057f9
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4regexpobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4regexpobject.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
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(); } } |