diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 03:04:04 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 03:04:04 +0200 |
| commit | b0bbbfbe3a3e3dd769e1664ce7bb4b44bed3ec6a (patch) | |
| tree | 10c04d4e920a38c3828e9cb64084fd122052579a /src/core/aspects/qabstractaspect.h | |
| parent | 3c551b2e2f4f433894d5c70de6e260fddadbb12d (diff) | |
| parent | 683151c338046621d239ac0d9b597171c56e3991 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I21e9c38275d499f679b9521ef9f8e5c8fcb05eee
Diffstat (limited to 'src/core/aspects/qabstractaspect.h')
| -rw-r--r-- | src/core/aspects/qabstractaspect.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h index 8c191c1d8..8059421a6 100644 --- a/src/core/aspects/qabstractaspect.h +++ b/src/core/aspects/qabstractaspect.h @@ -81,6 +81,7 @@ protected: template<class Frontend, bool supportsSyncing> void registerBackendType(const QBackendNodeMapperPtr &functor); void registerBackendType(const QMetaObject &obj, const QBackendNodeMapperPtr &functor); + void registerBackendType(const QMetaObject &obj, const QBackendNodeMapperPtr &functor, bool supportsSyncing); template<class Frontend> void unregisterBackendType(); void unregisterBackendType(const QMetaObject &); @@ -88,7 +89,6 @@ protected: private: void syncDirtyFrontEndNodes(const QVector<QNode *> &nodes); void syncDirtyFrontEndSubNodes(const QVector<NodeRelationshipChange> &nodes); - void registerBackendType(const QMetaObject &obj, const QBackendNodeMapperPtr &functor, bool supportsSyncing); virtual QVariant executeCommand(const QStringList &args); |