aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/v8/qv8engine.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2018-04-03 15:51:43 +0200
committerLars Knoll <lars.knoll@qt.io>2018-05-02 14:17:17 +0000
commit13cc936859518b5fa378c7b8242d56ebf49ebce9 (patch)
tree22d3bd9c771417707c35b8891f69b72b718fb84d /src/qml/qml/v8/qv8engine.cpp
parente9492e7b7b44c1f8cd5489d93463fc2b1f8b6d72 (diff)
Remove the QString member from Identifier
First step to turning identifier into a simple int. Change-Id: I4988587aa61f1f02ed80426ccbf00b685f38c829 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.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index 8a786e76cf..7106583e6d 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -85,6 +85,7 @@
#include <private/qv4script_p.h>
#include <private/qv4include_p.h>
#include <private/qv4jsonobject_p.h>
+#include <private/qv4identifiertable_p.h>
Q_DECLARE_METATYPE(QList<int>)
@@ -206,8 +207,10 @@ void QV8Engine::initializeGlobal()
{
for (uint i = 0; i < m_v4Engine->globalObject->internalClass()->size; ++i) {
- if (m_v4Engine->globalObject->internalClass()->nameMap.at(i))
- m_illegalNames.insert(m_v4Engine->globalObject->internalClass()->nameMap.at(i)->string);
+ if (m_v4Engine->globalObject->internalClass()->nameMap.at(i)) {
+ QV4::Identifier *id = m_v4Engine->globalObject->internalClass()->nameMap.at(i);
+ m_illegalNames.insert(m_v4Engine->identifierTable->stringFromIdentifier(id)->toQString());
+ }
}
}
}