From 1bfa31849d3a23bfdc3b60aec7f645de2e1f81d5 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Thu, 18 Jul 2019 08:41:34 +0200 Subject: Doc: Fix typos in code snippets Fixes: QTBUG-77094 Change-Id: Ia974c4d8abeab48a206fb868ee5532d4aeae7319 Reviewed-by: Mitch Curtis --- src/qml/doc/src/cppintegration/definetypes.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/doc') diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc index 41bc9fd140..b7199393f7 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 setExpired WRITE expired 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); } -- cgit v1.2.3 From f72db4de7f446c522db3f78b67c3b2bcc02b172a Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Thu, 18 Jul 2019 15:15:23 +0200 Subject: Doc: Add comment on evaluation order bindings Task-number: QTBUG-73742 Change-Id: I42821823ee0315aa96da30798e35809cf0498f67 Reviewed-by: Mitch Curtis Reviewed-by: Paul Wicking --- src/qml/doc/src/qmllanguageref/syntax/propertybinding.qdoc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/qml/doc') diff --git a/src/qml/doc/src/qmllanguageref/syntax/propertybinding.qdoc b/src/qml/doc/src/qmllanguageref/syntax/propertybinding.qdoc index a5ad6af4a2..e607666886 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/propertybinding.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/propertybinding.qdoc @@ -128,6 +128,9 @@ loops - it could indicate that the binding is being used for more than describin property relationships. Complex bindings can reduce code performance, readability, and maintainability. It may be a good idea to redesign components that have complex bindings, or at least factor the binding out into a separate function. +As a general rule, users should not rely on the evaluation order of bindings. + +\sa {Positioning with Anchors} \target qml-javascript-assignment -- cgit v1.2.3 From a95f3795ae94616fb7b3d72ac71b0b38c6bba341 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Fri, 19 Jul 2019 06:53:12 +0200 Subject: Doc: fix code snippet Task-number: QTBUG-77094 Change-Id: I9058bf7b65e8d390327af0624df611de4965f1e4 Reviewed-by: Mitch Curtis --- src/qml/doc/src/cppintegration/definetypes.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/doc') diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc index b7199393f7..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 setExpired WRITE expired NOTIFY expiredChanged) + Q_PROPERTY(bool expired READ expired WRITE setExpired NOTIFY expiredChanged) public: MessageBoardAttachedType(QObject *parent); bool expired() const; -- cgit v1.2.3