diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-11 07:45:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-11 07:45:07 +0200 |
| commit | 84e83e27dfba7215cb7a8f7210dab84cc400bb07 (patch) | |
| tree | 2605b3e032982ed7048813612ec8d3816334cffa /src/imports/controls/controls.pri | |
| parent | e3dac16b8da272c14c169227a8befe07e7852126 (diff) | |
| parent | a3b706531b98c64137acaebf26756828cd43a2a0 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I6a3a103e702dfa25c8ac1702be92faf3bb2b01d7
Diffstat (limited to 'src/imports/controls/controls.pri')
0 files changed, 0 insertions, 0 deletions