diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-10-10 13:59:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-10-10 13:59:00 +0200 |
| commit | aa057451b35953018c4f94d0a4bd5e813767cbc9 (patch) | |
| tree | 8fd40c6d230e7e6171bca10e58178744326d5a5d /src/imports | |
| parent | 3fde977a817498817e98ce350d493658b0ed4458 (diff) | |
| parent | b418c2fe6c97aa63e990ce5ee349aa33266b6579 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp
tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
Change-Id: I117c8d62b21800329d1035021d312d9924f83a1b
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/layouts/qquickstacklayout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/layouts/qquickstacklayout.cpp b/src/imports/layouts/qquickstacklayout.cpp index 116e162aa9..4c1d611409 100644 --- a/src/imports/layouts/qquickstacklayout.cpp +++ b/src/imports/layouts/qquickstacklayout.cpp @@ -94,7 +94,7 @@ \sa ColumnLayout \sa GridLayout \sa RowLayout - \sa StackView + \sa {QtQuick.Controls::StackView}{StackView} */ QT_BEGIN_NAMESPACE |