summaryrefslogtreecommitdiff
path: root/examples/quickcontrols/dialogs
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Add missing dots (qtquickcontrols)Paul Wicking2018-06-191-1/+1
| | | | | | Task-number: QTBUG-68933 Change-Id: I3731b82ecae0a43878b694e681300bef7c36ea62 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-108-26/+96
| | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
* fix example installsOswald Buddenhagen2016-04-2812-0/+1364
this includes renaming the first-level subdir of examples/. Change-Id: Idf14164533c247e5c0cc5acdb405ac97f7c33ac5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>