diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/compiler/qv4codegen.cpp | 15 | ||||
| -rw-r--r-- | src/qmlcompiler/qqmljsimportvisitor.cpp | 15 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp index aaaa4aebf6..de08c4fd08 100644 --- a/src/qml/compiler/qv4codegen.cpp +++ b/src/qml/compiler/qv4codegen.cpp @@ -113,6 +113,7 @@ const char *Codegen::s_globalNames[] = { "ArrayBuffer", "Atomics", "Boolean", + "DOMException", "DataView", "Date", "Error", @@ -132,10 +133,15 @@ const char *Codegen::s_globalNames[] = { "Object", "Promise", "Proxy", + "QT_TRANSLATE_NOOP", + "QT_TRID_NOOP", + "QT_TR_NOOP", + "Qt", "RangeError", "ReferenceError", "Reflect", "RegExp", + "SQLException", "Set", "SharedArrayBuffer", "String", @@ -143,22 +149,31 @@ const char *Codegen::s_globalNames[] = { "SyntaxError", "TypeError", "URIError", + "URL", + "URLSearchParams", "Uint16Array", "Uint32Array", "Uint8Array", "Uint8ClampedArray", "WeakMap", "WeakSet", + "XMLHttpRequest", + "console", "decodeURI", "decodeURIComponent", "encodeURI", "encodeURIComponent", "escape", "eval", + "gc", "isFinite", "isNaN", "parseFloat", "parseInt", + "print", + "qsTr", + "qsTrId", + "qsTranslate", "undefined", "unescape", nullptr diff --git a/src/qmlcompiler/qqmljsimportvisitor.cpp b/src/qmlcompiler/qqmljsimportvisitor.cpp index b1a67c1dce..a87f4193ec 100644 --- a/src/qmlcompiler/qqmljsimportvisitor.cpp +++ b/src/qmlcompiler/qqmljsimportvisitor.cpp @@ -143,19 +143,6 @@ QQmlJSImportVisitor::QQmlJSImportVisitor( m_currentScope->setInternalName(u"global"_s); - QLatin1String jsGlobVars[] = { /* Not listed on the MDN page; browser and QML extensions: */ - // console/debug api - QLatin1String("console"), QLatin1String("print"), - // garbage collector - QLatin1String("gc"), - // i18n - QLatin1String("qsTr"), QLatin1String("qsTrId"), - QLatin1String("QT_TR_NOOP"), QLatin1String("QT_TRANSLATE_NOOP"), - QLatin1String("QT_TRID_NOOP"), - // XMLHttpRequest - QLatin1String("XMLHttpRequest") - }; - QQmlJSScope::JavaScriptIdentifier globalJavaScript = { QQmlJSScope::JavaScriptIdentifier::LexicalScoped, QQmlJS::SourceLocation(), std::nullopt, true @@ -164,8 +151,6 @@ QQmlJSImportVisitor::QQmlJSImportVisitor( ++globalName) { m_currentScope->insertJSIdentifier(QString::fromLatin1(*globalName), globalJavaScript); } - for (const auto &jsGlobVar : jsGlobVars) - m_currentScope->insertJSIdentifier(jsGlobVar, globalJavaScript); } QQmlJSImportVisitor::~QQmlJSImportVisitor() = default; |
