diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-06-14 21:42:20 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-06-14 21:42:20 +0200 |
| commit | bf82b95088f552a5f62d333662c7a9202d293359 (patch) | |
| tree | cd25b2d91c3d98733920f7a8561d41c89731975b /src/imports/controls/controls.pri | |
| parent | 221c3ce846e5a6167aa0b2d356c23d5b9c7e32cb (diff) | |
| parent | 73e722a85fbf0675938023b0207d7daac93b085a (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/quicktemplates2/qquickslider.cpp
Change-Id: Idefd7b77b1937d423ee2db5064ff09c36b240ef0
Diffstat (limited to 'src/imports/controls/controls.pri')
0 files changed, 0 insertions, 0 deletions