diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2020-11-19 22:59:25 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-20 13:05:58 +0000 |
| commit | 7ce922fa0f29055f1f60b6b52c34d78c7e82af53 (patch) | |
| tree | d11c31ffeba2973283525a08b49467e0cfe5cdad /src/quick/items | |
| parent | 861d93965e0dbc2c088e83f8a6093a639373a02c (diff) | |
Doc: Ensure QQuickWindow::transientParent property is documented
While the parent class (QWindow) has that property, QDoc does not
allow documenting properties from base classes. The documentation
for QQuickWindow::transientParent includes QML-specific information,
so use QDOC_PROPERTY macro in the header file to make the property
documentation visible.
Change-Id: Ib281c776717e09e6929420c6173a520613356d91
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit 29a32e17e1a11af8312be269c6b8085385524155)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/qquickwindow.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index 32e8d4b5a1..8700b5a141 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -75,6 +75,7 @@ class Q_QUICK_EXPORT QQuickWindow : public QWindow Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) Q_PROPERTY(QQuickItem* contentItem READ contentItem CONSTANT) Q_PROPERTY(QQuickItem* activeFocusItem READ activeFocusItem NOTIFY activeFocusItemChanged REVISION(2, 1)) + QDOC_PROPERTY(QWindow* transientParent READ transientParent WRITE setTransientParent NOTIFY transientParentChanged) Q_CLASSINFO("DefaultProperty", "data") Q_DECLARE_PRIVATE(QQuickWindow) |