diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-22 20:59:07 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-22 20:59:07 +0200 |
| commit | a31a5ade38ad13b699039239343f154dc1504f50 (patch) | |
| tree | b36e6b8c6d79209ac0f165a4cb1e52edaf8ce7e1 /src/imports/controls/plugins.qmltypes | |
| parent | 6d9d5d41151e790f26ba59bd88d6515485326a57 (diff) | |
| parent | c11ef4ffa905ac9ba5e5af89ed03b1786b5187a8 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/quicktemplates2/qquickspinbox.cpp
tests/auto/controls/data/tst_scrollbar.qml
Change-Id: Ief9481cb648076a951db0aeffaeb11aeaf392677
Diffstat (limited to 'src/imports/controls/plugins.qmltypes')
0 files changed, 0 insertions, 0 deletions