diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-09-03 10:42:30 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-09-04 06:55:55 +0000 |
| commit | f942a777f5a6ca241e4a804db518b5f4eb73dcc3 (patch) | |
| tree | f94fc98d09cec550f3bc5e4a9748e20b543467a2 /src/qmltyperegistrar | |
| parent | e7899df08030030930a3e30f0c8947275328e4f0 (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 'src/qmltyperegistrar')
| -rw-r--r-- | src/qmltyperegistrar/qmltypescreator.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qmltyperegistrar/qmltypescreator.cpp b/src/qmltyperegistrar/qmltypescreator.cpp index 3d03a266eb..0c2a70c6d1 100644 --- a/src/qmltyperegistrar/qmltypescreator.cpp +++ b/src/qmltyperegistrar/qmltypescreator.cpp @@ -164,8 +164,9 @@ void QmlTypesCreator::writeProperties(const QJsonArray &properties, QSet<QString const auto it = obj.find(QLatin1String("revision")); if (it != obj.end()) m_qml.writeScriptBinding(QLatin1String("revision"), QString::number(it.value().toInt())); - const bool isQProperty = obj[QLatin1String("isQProperty")].toBool(); - m_qml.writeBooleanBinding(QLatin1String("isQProperty"), isQProperty); + const auto bindable = obj.constFind(QLatin1String("bindable")); + if (bindable != obj.constEnd()) + m_qml.writeScriptBinding(QLatin1String("bindable"), enquote(bindable->toString())); writeType(obj, QLatin1String("type"), !obj.contains(QLatin1String("write")), true); m_qml.writeEndObject(); |