diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-25 20:25:54 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-25 20:25:54 +0200 |
| commit | 791d521a3008695f834d5aa8c9bb61f9075b37a8 (patch) | |
| tree | 90845e881c96c58ac1e28a04113a90108745c1e9 /src/imports/controls/Dialog.qml | |
| parent | cb80c055e7d8a242c529c9f72c9a9b8d87a90f31 (diff) | |
| parent | 1acc393933650f824de427f6b0ca3e38a0a8bdb4 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
src/imports/controls/material/ComboBox.qml
Change-Id: I2a57070f96691cb6bbdaae460fbc60a85be435de
Diffstat (limited to 'src/imports/controls/Dialog.qml')
0 files changed, 0 insertions, 0 deletions