qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove remaining vestiges of "Binding" properties 

We no longer support properties of type QQmlBinding, so we don't need
any flags for it, either.
Amends 85d258cc0d

Change-Id: I77c52baa3c0e2d7b5831216f1413bcc21eb5e321
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Fabian Kosmale 2023-01-16 18:09:13 +01:00
parent f59af767ae
commit 727ea16494
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qml/qml/qqmlpropertycache.cpp
View File

@ -60,8 +60,6 @@ QQmlPropertyData::flagsForProperty(const QMetaProperty &p)
flags.type = QQmlPropertyData::Flags::QVariantType;
} else if (propType < static_cast<int>(QMetaType::User)) {
// nothing to do
} else if (propType == qMetaTypeId<QQmlBinding *>()) {
flags.type = QQmlPropertyData::Flags::QmlBindingType;
} else if (propType == qMetaTypeId<QJSValue>()) {
flags.type = QQmlPropertyData::Flags::QJSValueType;
} else if (metaType.flags() & QMetaType::IsQmlList) {

4
src/qml/qml/qqmlpropertydata_p.h
View File

@ -42,7 +42,7 @@ public:
QObjectDerivedType = 2, // Property type is a QObject* derived type
EnumType = 3, // Property type is an enum
QListType = 4, // Property type is a QML list
QmlBindingType = 5, // Property type is a QQmlBinding*
/*QmlBindingType = 5; was: Property type is a QQmlBinding*; now unused */
QJSValueType = 6, // Property type is a QScriptValue
// Gap, used to be V4HandleType
VarPropertyType = 8, // Property type is a "var" property of VMEMO
@ -199,7 +199,6 @@ public:
bool isQObject() const { return m_flags.type == Flags::QObjectDerivedType; }
bool isEnum() const { return m_flags.type == Flags::EnumType; }
bool isQList() const { return m_flags.type == Flags::QListType; }
bool isQmlBinding() const { return m_flags.type == Flags::QmlBindingType; }
bool isQJSValue() const { return m_flags.type == Flags::QJSValueType; }
bool isVarProperty() const { return m_flags.type == Flags::VarPropertyType; }
bool isQVariant() const { return m_flags.type == Flags::QVariantType; }
@ -445,7 +444,6 @@ void QQmlPropertyData::Flags::copyPropertyTypeFlags(QQmlPropertyData::Flags from
case QObjectDerivedType:
case EnumType:
case QListType:
case QmlBindingType:
case QJSValueType:
case QVariantType:
type = from.type;