aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlecmascript/testtypes.h
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2020-09-03 10:42:30 +0200
committerFabian Kosmale <fabian.kosmale@qt.io>2020-09-04 06:55:55 +0000
commitf942a777f5a6ca241e4a804db518b5f4eb73dcc3 (patch)
treef94fc98d09cec550f3bc5e4a9748e20b543467a2 /tests/auto/qml/qqmlecmascript/testtypes.h
parente7899df08030030930a3e30f0c8947275328e4f0 (diff)
Adjust to qtbase changes
- isQProperty has been renamed to bindable - QNotifiedProperty is no more - Bindable properties have a function to obtain the QBindable; store that information in the qmltypes files. Task-number: QTBUG-86434 Task-number: QTBUG-86435 Change-Id: I2ba593af1e197d04d2c30cfb9e6904a3d2059e4b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlecmascript/testtypes.h')
-rw-r--r--tests/auto/qml/qqmlecmascript/testtypes.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h
index 3813cdbe24..2db44ad6cc 100644
--- a/tests/auto/qml/qqmlecmascript/testtypes.h
+++ b/tests/auto/qml/qqmlecmascript/testtypes.h
@@ -1730,9 +1730,10 @@ public:
struct ClassWithQProperty : public QObject
{
Q_OBJECT
- Q_PROPERTY(float value)
+ Q_PROPERTY(float value MEMBER value BINDABLE bindableValue)
public:
QProperty<float> value;
+ QBindable<float> bindableValue() { return QBindable<float>(&value); }
};
class VariantConvertObject : public QObject
@@ -1749,10 +1750,10 @@ public slots:
struct ClassWithQProperty2 : public QObject
{
Q_OBJECT
- Q_PROPERTY(float value)
+ // Q_PROPERTY(float value)
public:
void callback();
- QNotifiedProperty<float, &ClassWithQProperty2::callback> value;
+ // QNotifiedProperty<float, &ClassWithQProperty2::callback> value;
};
void registerTypes();