summaryrefslogtreecommitdiffstats
path: root/examples/quickcontrols/controls/filesystembrowser
Commit message (Collapse)AuthorAgeFilesLines
* Replace Q_NULLPTR with nullptrKevin Funk2017-09-261-1/+1
| | | | | Change-Id: I43296a94e6242a9e77039a0369e3a2292891fec7 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-221-2/+2
| | | | | Change-Id: I39eb6cd5c6be80b14597b666c6fee05978be26ce Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-102-6/+26
| | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
* fix example installsOswald Buddenhagen2016-04-284-0/+296
this includes renaming the first-level subdir of examples/. Change-Id: Idf14164533c247e5c0cc5acdb405ac97f7c33ac5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>