diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-11 20:21:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-11 20:21:33 +0200 |
| commit | 41d9718bc4ac005b82d64db8a4312e7fef7548d9 (patch) | |
| tree | 80083387e08fa6396bab85908fd9ff896e7413f8 /tests/benchmarks/objectcount/tst_objectcount.cpp | |
| parent | 1acb34a40ea0fbc0c0730cdc81dcfd46bdeb4ef7 (diff) | |
| parent | 87cbcbf9972321f26fa47ded04005f30bb2a279d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/imports/controls/ScrollBar.qml
src/imports/controls/material/ScrollBar.qml
src/imports/controls/universal/ScrollBar.qml
src/templates/qquickscrollbar.cpp
tests/auto/controls/data/tst_scrollbar.qml
Change-Id: I646882e0563f72df682bac49f96875a08b1b0de9
Diffstat (limited to 'tests/benchmarks/objectcount/tst_objectcount.cpp')
0 files changed, 0 insertions, 0 deletions