diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-08 09:36:00 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-09 15:52:57 +0000 |
| commit | 6332eabe2a3539b42637a5106656b3e0e772cfd1 (patch) | |
| tree | d2223fff4254f515438452995db2d9ad6145a087 /src/qml/jsruntime/qv4function.cpp | |
| parent | 37b37a399b10dcb422c37b3c370049bf9b2e6380 (diff) | |
QtQml: Disambiguate static variables and methods
They cause clashes in CMake Unity (Jumbo) builds.
Task-number: QTBUG-109394
Change-Id: I0408c01d3e6f0f4dc74904e12a3036a855cc3225
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 69708da26e72eb34c52277760f15abf0cf0974af)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/qml/jsruntime/qv4function.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4function.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp index 29e3d8d7ef..1017ef9cd9 100644 --- a/src/qml/jsruntime/qv4function.cpp +++ b/src/qml/jsruntime/qv4function.cpp @@ -41,8 +41,8 @@ bool Function::call(QObject *thisObject, void **a, const QMetaType *types, int a } static ReturnedValue doCall( - Function *self, const Value *thisObject, const Value *argv, int argc, - ExecutionContext *context) + QV4::Function *self, const QV4::Value *thisObject, const QV4::Value *argv, int argc, + QV4::ExecutionContext *context) { ExecutionEngine *engine = context->engine(); JSTypesStackFrame frame; |