diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-08 09:36:00 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-09 13:02:01 +0100 |
| commit | 69708da26e72eb34c52277760f15abf0cf0974af (patch) | |
| tree | 194cf28c545e9b7a35f5edfcc2162c36c4f7c464 /src/qml/jsruntime/qv4functionobject.cpp | |
| parent | 6cca731f3e1304ce98f1ec18af42e3bd06001eea (diff) | |
QtQml: Disambiguate static variables and methods
They cause clashes in CMake Unity (Jumbo) builds.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I0408c01d3e6f0f4dc74904e12a3036a855cc3225
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4functionobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4functionobject.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index 84ba0cfcfb..3fd85ab44d 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -507,7 +507,8 @@ void ArrowFunction::virtualCallWithMetaTypes(const FunctionObject *fo, QObject * frame.pop(scope.engine); } -static ReturnedValue doCall(const FunctionObject *fo, const Value *thisObject, const Value *argv, int argc) +static ReturnedValue qfoDoCall(const QV4::FunctionObject *fo, const QV4::Value *thisObject, + const QV4::Value *argv, int argc) { ExecutionEngine *engine = fo->engine(); JSTypesStackFrame frame; @@ -531,7 +532,8 @@ static ReturnedValue doCall(const FunctionObject *fo, const Value *thisObject, c return result; } -ReturnedValue ArrowFunction::virtualCall(const FunctionObject *fo, const Value *thisObject, const Value *argv, int argc) +ReturnedValue ArrowFunction::virtualCall(const QV4::FunctionObject *fo, const Value *thisObject, + const QV4::Value *argv, int argc) { Function *function = fo->function(); switch (function->kind) { @@ -545,13 +547,13 @@ ReturnedValue ArrowFunction::virtualCall(const FunctionObject *fo, const Value * return QV4::coerceAndCall( fo->engine(), function->typedFunction, thisObject, argv, argc, [fo](const Value *thisObject, const Value *argv, int argc) { - return doCall(fo, thisObject, argv, argc); + return qfoDoCall(fo, thisObject, argv, argc); }); default: break; } - return doCall(fo, thisObject, argv, argc); + return qfoDoCall(fo, thisObject, argv, argc); } void Heap::ArrowFunction::init(QV4::ExecutionContext *scope, Function *function, QV4::String *n) |