diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-23 16:10:32 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-23 16:10:32 +0100 |
| commit | 4236abbd68560aef74fb70ecc2b0bc34d17cda7c (patch) | |
| tree | 74c452a1ea60d44437e2432d9d647d30235a79da /src/imports/controls | |
| parent | 261e84c3e333574b300ea0b09f87fccc88c4a0ea (diff) | |
| parent | 9812a9cc1e71b0a3d8f25c0db2457f8673e53054 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/quicktemplates2/qquickswipedelegate_p.h
Change-Id: I5446503c1e4f21cb37f4fffeb3453d1c84b54b30
Diffstat (limited to 'src/imports/controls')
0 files changed, 0 insertions, 0 deletions