diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-03-01 17:15:42 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-03-01 18:40:19 +0100 |
| commit | b6d847ac5bb0e32f928f616cee03d323aab33e55 (patch) | |
| tree | 40541ea1f8fff70cfd09ff2eecfdf783e8ea5257 /src/imports/controls/doc/src/includes | |
| parent | d9ba3c909ec071f3be4f3e44d0c2d66b04811c7c (diff) | |
| parent | b4db69eee6dc2f381b24aa24586171dbaf8d116e (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/quickcontrols2/qquicktheme.cpp
Change-Id: I874011d32a379bf982f760c39c46d3a25e2452d6
Diffstat (limited to 'src/imports/controls/doc/src/includes')
| -rw-r--r-- | src/imports/controls/doc/src/includes/qquickstackview.qdocinc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/imports/controls/doc/src/includes/qquickstackview.qdocinc b/src/imports/controls/doc/src/includes/qquickstackview.qdocinc new file mode 100644 index 00000000..20c9bdc3 --- /dev/null +++ b/src/imports/controls/doc/src/includes/qquickstackview.qdocinc @@ -0,0 +1,5 @@ +//! [pop-ownership] +Only items that StackView created itself (from a \l Component or \l [QML] +url) will be destroyed when popped. See \l {Item Ownership} for more +information. +//! [pop-ownership] |