diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-06-23 20:08:40 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-07-02 19:29:32 +0000 |
| commit | 56602df447c5f16257874f2e97b078dcf76f2467 (patch) | |
| tree | 901c76eb6262dad80e6ab94af810c645355cb6d5 /src/qml/qml/v8/qv8engine.cpp | |
| parent | db695c5b1d07275f208446dad178b1131b20bb0a (diff) | |
Cleanups in the Identifier API
Rename from/asHeapObject to from/asStringOrSymbol and fix
the signature.
Add a isStringOrSymbol() method and redefine isValid() to also
include array indices.
Change-Id: Ic8272bfbe84d15421e2ebe86ddda7fdaa8db4f3e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/v8/qv8engine.cpp')
| -rw-r--r-- | src/qml/qml/v8/qv8engine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index f99c4def45..6b6449c20e 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -207,7 +207,7 @@ void QV8Engine::initializeGlobal() { for (uint i = 0; i < m_v4Engine->globalObject->internalClass()->size; ++i) { - if (m_v4Engine->globalObject->internalClass()->nameMap.at(i).isValid()) { + if (m_v4Engine->globalObject->internalClass()->nameMap.at(i).isString()) { QV4::Identifier id = m_v4Engine->globalObject->internalClass()->nameMap.at(i); m_illegalNames.insert(id.toQString()); } @@ -241,7 +241,7 @@ static void freeze_recursive(QV4::ExecutionEngine *v4, QV4::Object *object) QV4::ScopedObject o(scope); for (uint i = 0; i < frozen->size; ++i) { - if (!frozen->nameMap.at(i).isValid()) + if (!frozen->nameMap.at(i).isStringOrSymbol()) continue; o = *object->propertyData(i); if (o) |