diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:11:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:11:33 +0200 |
| commit | 74963930da7984f170da515fa5022db6a7fa5830 (patch) | |
| tree | 8561fa32c5cf62e4f59e4108f378f5e2fb6e6ac1 /tests/auto/qsensorgestures/qsensorgestures.pro | |
| parent | 7a396992b19b440c236e3a8f483698fd0abee5e4 (diff) | |
| parent | 09a5df3e9433138d54b0f44ba7ffcde8eb61e38b (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
Change-Id: I988cf7a720d4b17e875339e0ec75cad270fd6186
Diffstat (limited to 'tests/auto/qsensorgestures/qsensorgestures.pro')
0 files changed, 0 insertions, 0 deletions