| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/5.7' into 5.8 | J-P Nurmi | 2016-10-25 | 1 | -2/+3 |
| | | | | | | | | | | | 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 | ||||
| * | Doc: configuration file | J-P Nurmi | 2016-10-25 | 1 | -0/+94 |
| Change-Id: I3de16850673488a8c67afc6b45a79d5bb86f9013 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> | |||||
 |
index : qt/qtquickcontrols2.git | |
| Qt Quick Controls 2 |
| aboutsummaryrefslogtreecommitdiffstats |