Merge remote-tracking branch 'origin/4.11'

Change-Id: I7b4672813b1c0909bf82623a4caacd4a26166da0

3 files changed, 8 insertions, 0 deletions

diff --git a/doc/images/qmldesigner-transitions.png b/doc/images/qmldesigner-transitions.png
index f3599b7ca6..8d7309ddc8 100644
--- a/doc/images/qmldesigner-transitions.png
+++ b/doc/images/qmldesigner-transitions.png
diff --git a/doc/images/qtquick-states-binding-editor.png b/doc/images/qtquick-states-binding-editor.png
new file mode 100644
index 0000000000..57be12f0ec
--- /dev/null
+++ b/doc/images/qtquick-states-binding-editor.png
diff --git a/doc/src/qtquick/qtquick-states.qdoc b/doc/src/qtquick/qtquick-states.qdoc
index 58a02677f6..5a40828f76 100644
--- a/doc/src/qtquick/qtquick-states.qdoc
+++ b/doc/src/qtquick/qtquick-states.qdoc
@@ -79,6 +79,14 @@
     To determine when the state should be applied, select
     \uicontrol {Set when Condition} in the menu and specify a
     \l [QtQuick]{State::when}{when} property for the state.
+    Set the value of the property to an expression that
+    evaluates to \c true when you want the state to be applied.
+    In the binding editor, select the component and property to
+    create the expression. For example, to change the state when
+    a button is pressed, you could select a button component and
+    its pressed property.
+
+    \image qtquick-states-binding-editor.png "Binding editor in States pane"
 
     You can preview the states in the \uicontrol States pane and click them to
     switch between states on the canvas.