diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-25 11:02:27 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-25 11:02:27 +0200 |
commit | 9526d2a937bfc06ab8f943c2e9edf449adbf8eef (patch) | |
tree | a345ae69ae78e1aee1fe73bb9e8fd57c2e5cced4 /src/sensors/doc/src/qtsensorgestures-plugins.qdoc | |
parent | 02900d9840d923e5885e8872fdbff3cec6d6baa4 (diff) | |
parent | 0808e5a984821f73c21a048af9e7c6de12d95408 (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
Change-Id: I2c688e3d3736d6e4f085a22c4a1464fd952fc780
Diffstat (limited to 'src/sensors/doc/src/qtsensorgestures-plugins.qdoc')
0 files changed, 0 insertions, 0 deletions