diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-03-01 17:15:42 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-03-01 18:40:19 +0100 |
| commit | b6d847ac5bb0e32f928f616cee03d323aab33e55 (patch) | |
| tree | 40541ea1f8fff70cfd09ff2eecfdf783e8ea5257 /src/imports/controls/universal | |
| parent | d9ba3c909ec071f3be4f3e44d0c2d66b04811c7c (diff) | |
| parent | b4db69eee6dc2f381b24aa24586171dbaf8d116e (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/quickcontrols2/qquicktheme.cpp
Change-Id: I874011d32a379bf982f760c39c46d3a25e2452d6
Diffstat (limited to 'src/imports/controls/universal')
0 files changed, 0 insertions, 0 deletions