diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-12-01 13:01:59 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-12-01 13:01:59 +0100 |
| commit | d8c5dea96fb8861089e2166ae574a85d2b69c09e (patch) | |
| tree | d3f01035541b10d98acbcde1321bc43de16096f6 /src/quicktemplates2/qquickoverlay.cpp | |
| parent | 5efd4b6a61498f0668d7367d620275367894140e (diff) | |
| parent | 838fd79152957f457a47cd30970961a27f086848 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
tests/auto/controls/data/tst_swipedelegate.qml
Change-Id: I15bd0366f1ad0ce35f1dce6d790da6dd5f0221f9
Diffstat (limited to 'src/quicktemplates2/qquickoverlay.cpp')
0 files changed, 0 insertions, 0 deletions