| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/5.6' into 5.7 | Liang Qi | 2016-05-10 | 1 | -3/+13 |
| | | | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc | ||||
| * | fix example installs | Oswald Buddenhagen | 2016-04-28 | 1 | -0/+98 |
| this includes renaming the first-level subdir of examples/. Change-Id: Idf14164533c247e5c0cc5acdb405ac97f7c33ac5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> | |||||
 |
index : qt/qtquickcontrols.git | |
| Qt Quick Controls |
| summaryrefslogtreecommitdiffstats |