diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-07-03 09:59:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-07-03 09:59:04 +0200 |
| commit | 82e647f6887aafb2ec1e9419bc6fefc0f09bac00 (patch) | |
| tree | 829a1f4aa96de9b633bbc53427b5f14aa542d57d /tests/auto/controls/data/tst_toolbar.qml | |
| parent | 746f0984ccdd0fc433c824b9ee2859dcd8f0a5e5 (diff) | |
| parent | dabf5d2ea0774564f29bb756b895fc9a9975b129 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/imports/controls/Menu.qml
src/imports/controls/fusion/Menu.qml
src/imports/controls/imagine/Menu.qml
src/imports/controls/material/Menu.qml
src/imports/controls/universal/Menu.qml
Change-Id: I017949e5ac617c1cdeece71204e5aa519776fb39
Diffstat (limited to 'tests/auto/controls/data/tst_toolbar.qml')
0 files changed, 0 insertions, 0 deletions