summaryrefslogtreecommitdiff
path: root/src/controls/Private/qquickwheelarea.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-11-17 03:01:27 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-11-17 03:01:27 +0100
commit854d94008c519fd7eb1c0d47796640a95287b17c (patch)
treea59db1d75a9065ed96f1bc474d0a0bd44af4a3fe /src/controls/Private/qquickwheelarea.cpp
parent4342de8c20484035a5a2710752d75437a55f853d (diff)
parent042f9a77aeff492c838326404e2f23f070c8cbd1 (diff)
downloadqtquickcontrols-854d94008c519fd7eb1c0d47796640a95287b17c.tar.gz
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I468c68a1a8a1ce3eaef88bf26ec8deed05a65d39
Diffstat (limited to 'src/controls/Private/qquickwheelarea.cpp')
0 files changed, 0 insertions, 0 deletions