diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h index ff9f23b1eb..fd3a3ae299 100644 --- a/src/qml/compiler/qv4codegen_p.h +++ b/src/qml/compiler/qv4codegen_p.h @@ -757,7 +757,59 @@ public: m_globalNames = globalNames; } - static const char *s_globalNames[]; + inline static const char *Codegen::s_globalNames[] = {"isNaN", + "parseFloat", + "String", + "EvalError", + "URIError", + "Math", + "encodeURIComponent", + "RangeError", + "eval", + "isFinite", + "ReferenceError", + "Infinity", + "Function", + "RegExp", + "Number", + "parseInt", + "Object", + "decodeURI", + "TypeError", + "Boolean", + "encodeURI", + "NaN", + "Error", + "decodeURIComponent", + "Date", + "Array", + "Symbol", + "escape", + "unescape", + "SyntaxError", + "undefined", + "JSON", + "ArrayBuffer", + "SharedArrayBuffer", + "DataView", + "Int8Array", + "Uint8Array", + "Uint8ClampedArray", + "Int16Array", + "Uint16Array", + "Int32Array", + "Uint32Array", + "Float32Array", + "Float64Array", + "WeakSet", + "Set", + "WeakMap", + "Map", + "Reflect", + "Proxy", + "Atomics", + "Promise", + nullptr}; protected: friend class ScanFunctions; diff --git a/src/qmldom/standalone/private/qtqmlcompilerexports_p.h b/src/qmldom/standalone/private/qtqmlcompilerexports_p.h index 2408fcfc21..5a5ae9d4ac 100644 --- a/src/qmldom/standalone/private/qtqmlcompilerexports_p.h +++ b/src/qmldom/standalone/private/qtqmlcompilerexports_p.h @@ -1,2 +1,4 @@ #include "../qqmldom_global.h" -#define Q_QMLCOMPILER_PRIVATE_EXPORT QMLDOM_EXPORT +#ifndef Q_QMLCOMPILER_PRIVATE_EXPORT +#define Q_QMLCOMPILER_PRIVATE_EXPORT +#endif