aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler/qv4codegen_p.h
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2019-01-08 08:18:11 +0200
committerKari Oikarinen <kari.oikarinen@qt.io>2019-01-08 08:18:11 +0200
commitc2c012f79438d207cc95237c90b692121acc4876 (patch)
tree39064e5a58161a7edb4e0c63f2d43e386d1f4059 /src/qml/compiler/qv4codegen_p.h
parent5208b2a671010b11b78312f9c4fe3c3098d253b4 (diff)
parent5ed082ea4ce3580134a9a0c83e6fdb81a6231c8e (diff)
Merge 5.12 into 5.12.1
Diffstat (limited to 'src/qml/compiler/qv4codegen_p.h')
-rw-r--r--src/qml/compiler/qv4codegen_p.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h
index 289728f505..3f96afc7c2 100644
--- a/src/qml/compiler/qv4codegen_p.h
+++ b/src/qml/compiler/qv4codegen_p.h
@@ -708,6 +708,11 @@ public:
return *_returnLabel;
}
+ void setGlobalNames(const QSet<QString>& globalNames) {
+ m_globalNames = globalNames;
+ }
+
+
protected:
friend class ScanFunctions;
friend struct ControlFlow;
@@ -730,6 +735,7 @@ protected:
bool inFormalParameterList = false;
bool functionEndsWithReturn = false;
bool _tailCallsAreAllowed = true;
+ QSet<QString> m_globalNames;
ControlFlow *controlFlow = nullptr;