Merge branch 'stable' into release

Change-Id: I13e80072db1e2c14a37b6a123276be81b085e87e

3 files changed, 16 insertions, 12 deletions

diff --git a/examples/quick/accessibility/content/Button.qml b/examples/quick/accessibility/content/Button.qml
index fa26177d32..4034f074a9 100644
--- a/examples/quick/accessibility/content/Button.qml
+++ b/examples/quick/accessibility/content/Button.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtQml module of the Qt Toolkit.
@@ -64,8 +64,7 @@ Rectangle {
         GradientStop { position: 1.0;
             color: button.focus ? "red" : "blue" }
     }
-   // border.width: 1
-    //border.color: "black";
+
     radius: 5
     antialiasing: true
 
@@ -84,5 +83,6 @@ Rectangle {
         anchors.fill: parent
         onClicked: parent.clicked()
     }
+
     Keys.onSpacePressed: clicked()
 }
diff --git a/examples/quick/accessibility/content/Checkbox.qml b/examples/quick/accessibility/content/Checkbox.qml
index f16f66ebb2..7c20f55e90 100644
--- a/examples/quick/accessibility/content/Checkbox.qml
+++ b/examples/quick/accessibility/content/Checkbox.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
@@ -39,10 +39,8 @@
 **
 ****************************************************************************/
 
-
 import QtQuick 2.0
 
-
 FocusScope {
     id: checkbox
 
@@ -56,24 +54,29 @@ FocusScope {
 
     Row {
         spacing: 2
+
         Rectangle {
             width: 12
             height: 12
             border.width: checkbox.focus ? 2 : 1
             border.color: "black"
+
             Text {
                 id: checkboxText
                 text: checkbox.checked ? "x" : ""
                 anchors.centerIn: parent
             }
         }
+
         Text {
             text: checkbox.text
         }
     }
+
     MouseArea {
         anchors.fill: parent
         onClicked: checkbox.checked = !checkbox.checked
     }
+
     Keys.onSpacePressed: checkbox.checked = !checkbox.checked
 }
diff --git a/examples/quick/accessibility/content/Slider.qml b/examples/quick/accessibility/content/Slider.qml
index a116308a14..c6eaca30a2 100644
--- a/examples/quick/accessibility/content/Slider.qml
+++ b/examples/quick/accessibility/content/Slider.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 import QtQuick 2.0
 
 // Minimal slider implementation
@@ -49,10 +48,10 @@ Rectangle {
     property alias text: buttonText.text
     Accessible.role: Accessible.Slider
 
-    property int value : 5         // required
-    property int minimumValue : 0  // optional (default INT_MIN)
-    property int maximumValue : 20 // optional (default INT_MAX)
-    property int stepSize : 1      // optional (default 1)
+    property int value: 5         // required
+    property int minimumValue: 0  // optional (default INT_MIN)
+    property int maximumValue: 20 // optional (default INT_MAX)
+    property int stepSize: 1      // optional (default 1)
 
     width: 100
     height: 30
@@ -77,6 +76,7 @@ Rectangle {
         anchors.centerIn: parent
         font.pixelSize: parent.height * .5
     }
+
     MouseArea {
         anchors.fill: parent
         onClicked: {
@@ -84,6 +84,7 @@ Rectangle {
             slider.value = pos
         }
     }
+
     Keys.onLeftPressed: value > minimumValue ? value = value - stepSize : minimumValue
     Keys.onRightPressed: value < maximumValue ? value = value + stepSize : maximumValue
 }