diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-05-07 10:53:20 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-05-07 11:17:31 +0200 |
| commit | 150cd0570d28291d6727c6e42ab83b746ac2e578 (patch) | |
| tree | 9c6961676aa051fa46e4a85384da98b29a48300f /src/qml/qml/qqmlpropertydata_p.h | |
| parent | 8e93bb105fb98749a48325bf849ef5e0232003f5 (diff) | |
QQmlPropertyData: Fix isDirect flag handling
During the QQmlPropertyData::Flags refactoring, this accidentally broke.
Amends 9768792381d660e46db58c0c0e0fe9f2f6f9e836
Pick-to: 5.15
Coverity-Id: 265549
Change-Id: I433701e2a1926dbd7afc4a826d78ba28f6894e60
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlpropertydata_p.h')
| -rw-r--r-- | src/qml/qml/qqmlpropertydata_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlpropertydata_p.h b/src/qml/qml/qqmlpropertydata_p.h index 697c995706..517b865cbb 100644 --- a/src/qml/qml/qqmlpropertydata_p.h +++ b/src/qml/qml/qqmlpropertydata_p.h @@ -233,7 +233,7 @@ public: bool isAlias() const { return !isFunction() && m_flags.isAliasORisVMESignal; } bool isFinal() const { return !isFunction() && m_flags.isFinalORisV4Function; } bool isOverridden() const { return m_flags.isOverridden; } - bool isDirect() const { return m_flags.isOverload; } + bool isDirect() const { return m_flags.isDirect; } bool isRequired() const { return !isFunction() && m_flags.isRequiredORisCloned; } bool hasStaticMetaCallFunction() const { return staticMetaCallFunction() != nullptr; } bool isFunction() const { return m_flags.type == Flags::FunctionType; } @@ -447,6 +447,7 @@ QQmlPropertyData::Flags::Flags() , isOverload(false) , isRequiredORisCloned(false) , isConstructorORisQProperty(false) + , isDirect(false) , isOverridden(false) , type(OtherType) , notFullyResolved(false) |