aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-03-19 16:46:49 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-19 17:07:08 +0100
commitf3bec84894a3e443fc4513539a99045737be3236 (patch)
tree440854b7d7b4a336df7325178cb953a3c916b3d1 /examples
parent37bd02abf10cdad2c069c08a9fe19913e8447de3 (diff)
Fix failed rebase
Change-Id: I5d6c6bb50baaa4c1ba986de779bad04ba45947fa Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/quick/accessibility/content/Checkbox.qml (renamed from examples/declarative/accessibility/widgets/Checkbox.qml)0
-rw-r--r--examples/quick/accessibility/content/Slider.qml (renamed from examples/declarative/accessibility/widgets/Slider.qml)0
2 files changed, 0 insertions, 0 deletions
diff --git a/examples/declarative/accessibility/widgets/Checkbox.qml b/examples/quick/accessibility/content/Checkbox.qml
index 17eb733197..17eb733197 100644
--- a/examples/declarative/accessibility/widgets/Checkbox.qml
+++ b/examples/quick/accessibility/content/Checkbox.qml
diff --git a/examples/declarative/accessibility/widgets/Slider.qml b/examples/quick/accessibility/content/Slider.qml
index 32aa6a3a41..32aa6a3a41 100644
--- a/examples/declarative/accessibility/widgets/Slider.qml
+++ b/examples/quick/accessibility/content/Slider.qml