summaryrefslogtreecommitdiff
path: root/examples/quickcontrols/controls/basiclayouts
Commit message (Collapse)AuthorAgeFilesLines
* Fix outdated FDL license headerKai Koehne2017-10-181-3/+13
| | | | | Change-Id: I03c222a72490959d55b3077a6282553a4bfcf7d2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-101-3/+13
| | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
* fix example installsOswald Buddenhagen2016-04-286-0/+224
this includes renaming the first-level subdir of examples/. Change-Id: Idf14164533c247e5c0cc5acdb405ac97f7c33ac5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>