diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-27 01:00:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-27 01:00:06 +0200 |
| commit | 1c06ff9cac74964f60615d040f013d8eb852e17d (patch) | |
| tree | 50a00da08df6f1f6fd781313828514e47bdeeafe /src/quick/items | |
| parent | 1da49d8493de7180a9db38d4614ba6fbbe898276 (diff) | |
| parent | a0ad2cbdf27d0d23727b09609e127ac17e414a22 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I73d9e896c05f7d944f3092b51a3a95c7e6e284b8
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquicktableview.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 4827f1ddd9..796ab6cdd7 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -8490,7 +8490,7 @@ void QQuickItemLayer::setMipmap(bool mipmap) \note ShaderEffectSource.RGB and ShaderEffectSource.Alpha should be used with caution, as support for these formats in the underlying - hardare and driver is often not present. + hardware and driver is often not present. \sa {Item Layers} */ diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp index db579c74bc..95fac30808 100644 --- a/src/quick/items/qquicktableview.cpp +++ b/src/quick/items/qquicktableview.cpp @@ -54,6 +54,7 @@ /*! \qmltype TableView \inqmlmodule QtQuick + \since 5.12 \ingroup qtquick-views \inherits Flickable \brief Provides a table view of items to display data from a model. |