diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-15 11:41:19 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-15 11:41:19 +0200 |
| commit | b669a429d0b2d4c58d47a6b3513d12ca57cf8fb6 (patch) | |
| tree | 0316635d6ebebb2f0fe3667016828d291af0c419 /src/quickcontrols2 | |
| parent | a8dd4f7d5b8f61b52a5aea7b8418a6a3961cae1e (diff) | |
| parent | 513363e940e0978931083544374bfe092107b9fb (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/ButtonGroup.qml
tests/auto/controls/data/tst_container.qml
tests/auto/menu/tst_menu.cpp
Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
Diffstat (limited to 'src/quickcontrols2')
| -rw-r--r-- | src/quickcontrols2/qquicktumblerview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quickcontrols2/qquicktumblerview.cpp b/src/quickcontrols2/qquicktumblerview.cpp index 59f443d5..817ec370 100644 --- a/src/quickcontrols2/qquicktumblerview.cpp +++ b/src/quickcontrols2/qquicktumblerview.cpp @@ -170,7 +170,7 @@ void QQuickTumblerView::createView() } } -// Called whever the size or visibleItemCount changes. +// Called whenever the size or visibleItemCount changes. void QQuickTumblerView::updateView() { QQuickItem *theView = view(); |