diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2021-05-12 12:03:30 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-05-18 16:24:26 +0200 |
commit | 85d090e84b5892256de818f3cb0a2274f1fea8a5 (patch) | |
tree | 0022110c23853e1c21151a69d8beba70bb11e179 /src/qml/jsruntime | |
parent | 95579c412d0960f2ffbeca97a627d3bc01a0cc2c (diff) |
Rename a parameter to avoid shadowing a member
Change-Id: I189e6fd49e5c5dec8240d2b36043240d1c059f81
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/jsruntime')
-rw-r--r-- | src/qml/jsruntime/qv4dateobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp index a4d3c8ca30..9ab0bb5628 100644 --- a/src/qml/jsruntime/qv4dateobject.cpp +++ b/src/qml/jsruntime/qv4dateobject.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -742,10 +742,10 @@ static double getLocalTZA() DEFINE_OBJECT_VTABLE(DateObject); -void Heap::DateObject::init(const QDateTime &date) +void Heap::DateObject::init(const QDateTime &when) { Object::init(); - this->date = date.isValid() ? TimeClip(date.toMSecsSinceEpoch()) : qt_qnan(); + date = when.isValid() ? TimeClip(when.toMSecsSinceEpoch()) : qt_qnan(); } void Heap::DateObject::init(QTime time) |