diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 03:02:35 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 03:02:35 +0200 |
| commit | 9001812730bccd4ee5153ad47aa130b230c27d78 (patch) | |
| tree | c4b3e07ddbfbe8dc09f95dc7cf7afc13698e9efb /src/quicktemplates2/qquickscrollbar.cpp | |
| parent | d9b0e2cde72824d19fb8ef6dfffd8cceb53957a3 (diff) | |
| parent | bb4b463c93623635154749e200304d8210b88bda (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2
Change-Id: I5b112e0e4021191c387da86bb5b0477fe0c4da30
Diffstat (limited to 'src/quicktemplates2/qquickscrollbar.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickscrollbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp index 9e6fe684..52daa27f 100644 --- a/src/quicktemplates2/qquickscrollbar.cpp +++ b/src/quicktemplates2/qquickscrollbar.cpp @@ -129,7 +129,7 @@ QT_BEGIN_NAMESPACE It is possible to create an instance of ScrollBar without using the attached property API. This is useful when the behavior of the attached - scoll bar is not sufficient or a \l Flickable is not in use. In the + scroll bar is not sufficient or a \l Flickable is not in use. In the following example, horizontal and vertical scroll bars are used to scroll over the text without using \l Flickable: |