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/qml/qml/qqmlpropertydata_p.h | |
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/qml/qml/qqmlpropertydata_p.h')
-rw-r--r-- | src/qml/qml/qqmlpropertydata_p.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/qml/qml/qqmlpropertydata_p.h b/src/qml/qml/qqmlpropertydata_p.h index 6f1e1b6e4e..3b0a49a6d4 100644 --- a/src/qml/qml/qqmlpropertydata_p.h +++ b/src/qml/qml/qqmlpropertydata_p.h @@ -111,7 +111,7 @@ public: unsigned isSignalHandler : 1; // Function is a signal handler unsigned isOverload : 1; // Function is an overload of another function unsigned isRequiredORisCloned : 1; // Has REQUIRED flag OR The function was marked as cloned - unsigned isConstructorORisQProperty : 1; // The function was marked is a constructor OR property is backed by QProperty<T> + unsigned isConstructorORisBindable : 1; // The function was marked is a constructor OR property is backed by QProperty<T> unsigned isDirect : 1; // Exists on a C++ QMetaObject unsigned isOverridden : 1; // Is overridden by a extension property public: @@ -156,8 +156,9 @@ public: isOverridden = b; } - void setIsQProperty(bool b) { - isConstructorORisQProperty = b; + void setIsBindable(bool b) { + Q_ASSERT(type != FunctionType); + isConstructorORisBindable = b; } void setIsDirect(bool b) { @@ -208,7 +209,7 @@ public: void setIsConstructor(bool b) { Q_ASSERT(type == FunctionType); - isConstructorORisQProperty = b; + isConstructorORisBindable = b; } }; @@ -253,8 +254,8 @@ public: bool isOverload() const { return m_flags.isOverload; } void setOverload(bool onoff) { m_flags.isOverload = onoff; } bool isCloned() const { return isFunction() && m_flags.isRequiredORisCloned; } - bool isConstructor() const { return m_flags.isConstructorORisQProperty; } - bool isQProperty() const { return m_flags.isConstructorORisQProperty; } + bool isConstructor() const { return isFunction() && m_flags.isConstructorORisBindable; } + bool isBindable() const { return !isFunction() && m_flags.isConstructorORisBindable; } bool hasOverride() const { return overrideIndex() >= 0; } bool hasRevision() const { return revision() != QTypeRevision::zero(); } @@ -446,7 +447,7 @@ QQmlPropertyData::Flags::Flags() , isSignalHandler(false) , isOverload(false) , isRequiredORisCloned(false) - , isConstructorORisQProperty(false) + , isConstructorORisBindable(false) , isDirect(false) , isOverridden(false) , type(OtherType) @@ -465,7 +466,7 @@ bool QQmlPropertyData::Flags::operator==(const QQmlPropertyData::Flags &other) c isSignalHandler == other.isSignalHandler && isRequiredORisCloned == other.isRequiredORisCloned && type == other.type && - isConstructorORisQProperty == other.isConstructorORisQProperty && + isConstructorORisBindable == other.isConstructorORisBindable && notFullyResolved == other.notFullyResolved && overrideIndexIsProperty == other.overrideIndexIsProperty; } |