diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-12-03 15:21:58 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-03 23:08:41 +0000 |
| commit | 5d7468d56f9c9100e613d4c3516394b5983e6291 (patch) | |
| tree | f63dd6ac5d9aa269a007dbfd9fa7e538c916a43a /tests/auto/qml/qqmlecmascript/testtypes.h | |
| parent | bb50209308c3d82dd9c4c3f4c07f833f8c7638ff (diff) | |
QML engine: Fix binding setup
We set QProperty bindings up in the wrong way: Parent components would
overwrite their child component's binding. This patch reverses the
order, fixing the bug.
Task-number: QTBUG-87153
Change-Id: I3e90d1d14a41a7c5c337745f1453484d360a3979
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 96e321bc5cf3c1a6d52374a6f4070a438032b08d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto/qml/qqmlecmascript/testtypes.h')
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/testtypes.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h index 159038f851..7074ffaa10 100644 --- a/tests/auto/qml/qqmlecmascript/testtypes.h +++ b/tests/auto/qml/qqmlecmascript/testtypes.h @@ -1732,9 +1732,12 @@ struct ClassWithQProperty : public QObject { Q_OBJECT Q_PROPERTY(float value MEMBER value BINDABLE bindableValue) + Q_PROPERTY(float value2 MEMBER value2 BINDABLE bindableValue2) public: QProperty<float> value; + QProperty<float> value2; QBindable<float> bindableValue() { return QBindable<float>(&value); } + QBindable<float> bindableValue2() { return QBindable<float>(&value2); } }; class VariantConvertObject : public QObject |