diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-24 01:00:26 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-24 01:00:27 +0200 |
| commit | 45023ae342ef5c9f0e3877c5a215c93e82c939fc (patch) | |
| tree | 40278bbb3cedf39070b63d3a9bceb2e980c1dd70 /src/qml/doc | |
| parent | f72db4de7f446c522db3f78b67c3b2bcc02b172a (diff) | |
| parent | d94dd247ecd6753150dc2a7ef6be4ccb482e9423 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I081bcb9cc238e6cff5f8a23b684c5d6f76dba047
Diffstat (limited to 'src/qml/doc')
| -rw-r--r-- | src/qml/doc/src/cppintegration/definetypes.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc index 41bc9fd140..2e8102bd65 100644 --- a/src/qml/doc/src/cppintegration/definetypes.qdoc +++ b/src/qml/doc/src/cppintegration/definetypes.qdoc @@ -471,7 +471,7 @@ will be accessible to the \e attachee: class MessageBoardAttachedType : public QObject { Q_OBJECT - Q_PROPERTY(bool expired READ expired WRITE expired NOTIFY expiredChanged) + Q_PROPERTY(bool expired READ expired WRITE setExpired NOTIFY expiredChanged) public: MessageBoardAttachedType(QObject *parent); bool expired() const; @@ -493,7 +493,7 @@ class MessageBoard : public QObject { Q_OBJECT public: - static MessageBoard *qmlAttachedProperties(QObject *object) + static MessageBoardAttachedType *qmlAttachedProperties(QObject *object) { return new MessageBoardAttachedType(object); } |