diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-22 01:00:07 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-23 09:53:31 +0200 |
| commit | 0cf8e2fb974370fd6d370f92fa22fa2245bcebb0 (patch) | |
| tree | f7b471bd8abb111e32a220bca24bd508b7871cca /src/qml/qml/qqmlmetatypedata_p.h | |
| parent | c00283bb3bb966bf60c307ec8283bd98c12318bf (diff) | |
| parent | 53bd6b8111eb0d7f23b3b0ca95bef4735f7a952c (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/qml/qqmlmetatype.cpp
Change-Id: Ieff61c076e46eb50a059c8b0210f7f4d7ce0cbcf
Diffstat (limited to 'src/qml/qml/qqmlmetatypedata_p.h')
| -rw-r--r-- | src/qml/qml/qqmlmetatypedata_p.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/qml/qml/qqmlmetatypedata_p.h b/src/qml/qml/qqmlmetatypedata_p.h index c45bc16280..5239b635ce 100644 --- a/src/qml/qml/qqmlmetatypedata_p.h +++ b/src/qml/qml/qqmlmetatypedata_p.h @@ -134,27 +134,8 @@ struct QQmlMetaTypeData qWarning("%s", message.toUtf8().constData()); } - int attachedPropertyId(const QMetaObject *metaObject, int ownIndex) - { - auto iter = attachedPropertyIds.find(metaObject); - return (iter == attachedPropertyIds.end()) - ? *attachedPropertyIds.insert(metaObject, ownIndex) - : *iter; - } - - bool removeAttachedPropertyId(const QMetaObject *metaObject, int ownIndex) - { - auto iter = attachedPropertyIds.find(metaObject); - if (iter != attachedPropertyIds.end() && *iter == ownIndex) { - attachedPropertyIds.erase(iter); - return true; - } - return false; - } - private: QStringList *m_typeRegistrationFailures = nullptr; - QHash<const QMetaObject *, int> attachedPropertyIds; }; inline uint qHash(const QQmlMetaTypeData::VersionedUri &v) |