summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-03-30 13:46:40 +0200
committerLiang Qi <liang.qi@qt.io>2017-03-30 13:46:40 +0200
commitc3cc73e3087db62a8427ff569abff1a8289dae83 (patch)
tree9839a823f220f57775a732658b8aab0fa4ba9be3 /.gitignore
parent2e0cded94716430658d4afe3e0fdd6fe4cf6362c (diff)
parentbc514fba81b67afb41ee91ea917352ad674630a5 (diff)
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts: src/imports/controls/RangeSlider.qml Change-Id: I0b930583135f044cb690217c026e6a120b73fcb7
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index f0b55ccf..6b88d21f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@
/examples/quickcontrols2/sidepanel/sidepanel
/examples/quickcontrols2/swipetoremove/swipetoremove
/examples/quickcontrols2/texteditor/texteditor
+/examples/quickcontrols2/wearable/wearable
/tests/auto/accessibility/tst_accessibility
/tests/auto/applicationwindow/tst_applicationwindow