diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-19 14:22:01 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-19 14:22:27 +0100 |
| commit | 7cad85c2f0930e4f8531a0508c28abdae0f3e0de (patch) | |
| tree | 9ffe1d390ff137aa11de472ba59947c0b96cdfbb /src/imports/controls/material/qquickmaterialtheme_p.h | |
| parent | ed30fdd7085ee8a007b990dc871afdeef0d7cbeb (diff) | |
| parent | d2a744f81272f9c0b6e987cc9f6c57f3931b67e7 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/controls/qquickstyle.cpp
Change-Id: I1c8273012b01726072e5cbfd4369453a780ff03e
Diffstat (limited to 'src/imports/controls/material/qquickmaterialtheme_p.h')
0 files changed, 0 insertions, 0 deletions