Merge remote-tracking branch 'origin/4.9'

 Conflicts:
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp

Change-Id: I473084232ab99c18e2316154656de0035af02628

10 files changed, 72 insertions, 53 deletions

diff --git a/doc/src/qtquick/qtquick-iso-icon-browser.qdoc b/doc/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc
index efc216a7f6..c84529b298 100644
--- a/doc/src/qtquick/qtquick-iso-icon-browser.qdoc
+++ b/doc/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -26,13 +26,8 @@
 /*!
     \contentspage index.html
     \page qtquick-iso-icon-browser.html
-    \if defined(qtdesignstudio)
     \previouspage qmldesigner-pathview-editor.html
     \nextpage creator-quick-ui-forms.html
-    \else
-    \previouspage quick-states.html
-    \nextpage quick-export-to-qml.html
-    \endif
 
     \title Browsing ISO 7000 Icons
 
diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc
index 36190f8106..4cee65201f 100644
--- a/doc/src/qtquick/qtquick-components.qdoc
+++ b/doc/src/qtquick/qtquick-components.qdoc
@@ -92,24 +92,24 @@
     You can use the following QML types to create components:
 
     \list
-        \li \l [QML]{AnimatedImage}{Animated Image} provides a way to play
+        \li \l [QtQuick]{AnimatedImage}{Animated Image} provides a way to play
             animations stored as images containing a series of frames, such
             as those stored in GIF files.
-        \li \l [QML]{BorderImage}{Border Image} uses an image as a border or
+        \li \l [QtQuick]{BorderImage}{Border Image} uses an image as a border or
             background.
-        \li \l [QML]{Image} adds a bitmap to the scene. You can stretch and
+        \li \l [QtQuick]{Image} adds a bitmap to the scene. You can stretch and
             tile images.
-        \li \l [QML]{Item} is the most basic of all visual types in QML. Even
+        \li \l [QtQuick]{Item} is the most basic of all visual types in QML. Even
             though it has no visual appearance, it defines all the properties
             that are common across visual types, such as the x and y position,
             width and height, anchoring, and key handling.
-        \li \l [QML]{Rectangle} adds a rectangle that is painted with a solid
+        \li \l [QtQuick] {Rectangle} adds a rectangle that is painted with a solid
             fill color and an optional border. You can use the radius property
             to create rounded rectangles.
-        \li \l [QML]{Text} adds formatted read-only text.
-        \li \l [QML]{TextEdit}{Text Edit} adds a single line of editable
+        \li \l [QtQuick]{Text} adds formatted read-only text.
+        \li \l [QtQuick]{TextEdit}{Text Edit} adds a single line of editable
             formatted text that can be validated.
-        \li \l [QML]{TextInput}{Text Input} adds a single line of editable
+        \li \l [QtQuick]{TextInput}{Text Input} adds a single line of editable
             plain text that can be validated.
     \endlist
 
@@ -267,12 +267,12 @@
     You can use the following positioners to arrange items in UIs:
 
     \list
-        \li \l[QML] {Column} arranges its child items vertically.
-        \li \l[QML] {Row} arranges its child items horizontally.
-        \li \l[QML] {Grid}
+        \li \l[QtQuick] {Column} arranges its child items vertically.
+        \li \l[QtQuick] {Row} arranges its child items horizontally.
+        \li \l[QtQuick] {Grid}
             arranges its child items so that they are aligned in a grid and
             are not overlapping.
-        \li \l[QML] {Flow}
+        \li \l[QtQuick] {Flow}
             arranges its child items side by side, wrapping as necessary.
     \endlist
 
@@ -365,7 +365,7 @@
         \li \l{FocusScope}{Focus Scope}
             assists in keyboard focus handling when building reusable QML
             components.
-        \li \l [QML]{MouseArea}{Mouse Area} enables simple mouse handling.
+        \li \l [QtQuick]{MouseArea}{Mouse Area} enables simple mouse handling.
     \endlist
 
     Since Qt 5.7, you can also use the following \l{Qt Quick Controls} types
diff --git a/doc/src/qtquick/qtquick-connection-editor-bindings.qdoc b/doc/src/qtquick/qtquick-connection-editor-bindings.qdoc
index 2f5c1ec54b..daee35732c 100644
--- a/doc/src/qtquick/qtquick-connection-editor-bindings.qdoc
+++ b/doc/src/qtquick/qtquick-connection-editor-bindings.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -56,14 +56,14 @@
         \li In the \uicontrol {Connections} view, select the
             \uicontrol {Bindings} tab.
         \li Select the \inlineimage plus.png
-            (\uicontrol Add) button to add a binding.
-        \li Select \uicontrol Item to select the target object whose property
-            you want to change dynamically.
-        \li Select \uicontrol Property to select the property to bind to a
-            source property.
-        \li Select \uicontrol {Source Item} to select the object whose property
-            you want to use to determine the behavior of the target object.
-        \li Select \uicontrol {Source Property} to select the property to bind
-            the target property to.
+            (\uicontrol Add) button to add a binding for the currently selected
+            item. The ID is displayed in the \uicontrol Item column.
+          \li Double-click the value in the \uicontrol Property column to select
+            the property to bind to a source property.
+        \li Double-click the value in the \uicontrol {Source Item} column to
+            select the object whose property you want to use to determine the
+            behavior of the target object.
+        \li Double-click the value in the \uicontrol {Source Property} column
+            to select the property to bind the target property to.
     \endlist
 */
diff --git a/doc/src/qtquick/qtquick-connection-editor-properties.qdoc b/doc/src/qtquick/qtquick-connection-editor-properties.qdoc
index 2288128327..7b6168dc78 100644
--- a/doc/src/qtquick/qtquick-connection-editor-properties.qdoc
+++ b/doc/src/qtquick/qtquick-connection-editor-properties.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -46,13 +46,16 @@
     \list 1
         \li In the \uicontrol {Connections} view, select the
             \uicontrol {Properties} tab.
-        \li Select \uicontrol Item to select the object to specify the property
-            for.
-        \li Select \uicontrol Property to give a name to the property.
-        \li Select \uicontrol {Property Type} to specify the type of the
-            property.
-        \li Select \uicontrol {Property Value} to specify the value of the
-            property.
+        \li Select the \inlineimage plus.png
+            (\uicontrol Add) button to add a dynamic property for the currently
+            selected item. The item ID is displayed in the \uicontrol Item
+            column.
+        \li Double-click the value in the \uicontrol Property column to give a
+            name to the property.
+        \li Double-click the value in the \uicontrol {Property Type} column to
+            specify the type of the property.
+        \li Double-click the value in the \uicontrol {Property Value} column
+            to specify the value of the property.
     \endlist
 
 */
diff --git a/doc/src/qtquick/qtquick-connection-editor-signals.qdoc b/doc/src/qtquick/qtquick-connection-editor-signals.qdoc
index 010ab17847..a9e221ce73 100644
--- a/doc/src/qtquick/qtquick-connection-editor-signals.qdoc
+++ b/doc/src/qtquick/qtquick-connection-editor-signals.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -61,11 +61,18 @@
             \uicontrol {Connections} tab.
         \li Select the \inlineimage plus.png
             (\uicontrol Add) button to add a connection.
-        \li Select \uicontrol Target to add the object to connect to a signal.
-        \li Select \uicontrol {Signal Handler} to select the signal that the
-            connection will listen to from a list of all signals available for
-            the object.
-        \li Select \uicontrol Actions to specify the action to perform when
-            the signal is emitted. You use JavaScript to specify the actions.
+        \li Double-click the value in the \uicontrol Target column to add the
+            object to connect to a signal.
+        \li Double-click the value in the \uicontrol {Signal Handler} column to
+            select the signal that the connection will listen to from a list of
+            all signals available for the object.
+        \li Double-click the value in the \uicontrol Actions column to specify
+            the action to perform when the signal is emitted. You use JavaScript
+            to specify the actions.
     \endlist
+
+    \if defined(qtdesignstudio)
+    For an example of connecting the \c clicked signal of a button to a
+    \l{Adding States}{state}, see \l {Log In UI - Part 3}.
+    \endif
 */
diff --git a/doc/src/qtquick/qtquick-connection-editor.qdoc b/doc/src/qtquick/qtquick-connection-editor.qdoc
index 5795350565..ad781ab5d4 100644
--- a/doc/src/qtquick/qtquick-connection-editor.qdoc
+++ b/doc/src/qtquick/qtquick-connection-editor.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -70,4 +70,7 @@
         \li \l{Managing C++ Backend Objects}
         \endif
     \endlist
+
+    For an example of using properties, bindings, and connections to create a
+    scalable push button, see \l{Creating Scalable Buttons and Borders}.
 */
diff --git a/doc/src/qtquick/qtquick-pathview-editor.qdoc b/doc/src/qtquick/qtquick-pathview-editor.qdoc
index bd4f4bd851..16cfad2e79 100644
--- a/doc/src/qtquick/qtquick-pathview-editor.qdoc
+++ b/doc/src/qtquick/qtquick-pathview-editor.qdoc
@@ -28,10 +28,12 @@
     \page qmldesigner-pathview-editor.html
     \if defined(qtdesignstudio)
     \previouspage studio-fonts.html
+    \nextpage creator-quick-ui-forms.html
     \else
     \previouspage quick-states.html
-    \endif
     \nextpage qtquick-iso-icon-browser.html
+    \endif
+
 
     \title Editing PathView Properties
 
@@ -64,4 +66,8 @@
     initiates mouse dragging and what is the rate at which a flick will
     decelerate.
 
+    \if defined(qtdesignstudio)
+    \note You can also use the \l SvgPath Qt Quick Studio Component to
+    specify an SVG path data string that draws a path.
+    \endif
 */
diff --git a/doc/src/qtquick/qtquick-states.qdoc b/doc/src/qtquick/qtquick-states.qdoc
index 2cf0244521..975e1f0959 100644
--- a/doc/src/qtquick/qtquick-states.qdoc
+++ b/doc/src/qtquick/qtquick-states.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -161,4 +161,8 @@
 
     You can use the \uicontrol {Text Editor} to specify transitions. For more
     information, see \l{Transition}.
+
+    Alternatively, you can use the \uicontrol Timeline view to animate the
+    properties of UI components and to bind the animations to states. For more
+    information, see \l {Binding Animations to States}.
 */
diff --git a/doc/src/qtquick/qtquick-timeline.qdoc b/doc/src/qtquick/qtquick-timeline.qdoc
index 0904fd908d..3462330208 100644
--- a/doc/src/qtquick/qtquick-timeline.qdoc
+++ b/doc/src/qtquick/qtquick-timeline.qdoc
@@ -312,11 +312,11 @@
     You can use the Studio components to animate the following shapes:
 
     \list
-        \li Arc
-        \li Border
-        \li Pie
-        \li Rectangle
-        \li Triangle
+        \li \l Arc
+        \li \l Border
+        \li \l Pie
+        \li \l Rectangle
+        \li \l Triangle
     \endlist
     \endif
 */
diff --git a/doc/src/qtquick/qtquick-ui-forms.qdoc b/doc/src/qtquick/qtquick-ui-forms.qdoc
index 16ce57a7e7..6ec6313ccf 100644
--- a/doc/src/qtquick/qtquick-ui-forms.qdoc
+++ b/doc/src/qtquick/qtquick-ui-forms.qdoc
@@ -33,10 +33,11 @@
 
     \contentspage index.html
     \page creator-quick-ui-forms.html
-    \previouspage qtquick-iso-icon-browser.html
     \if defined(qtdesignstudio)
+    \previouspage qmldesigner-pathview-editor.html
     \nextpage studio-live-preview.html
     \else
+    \previouspage qtquick-iso-icon-browser.html
     \nextpage quick-export-to-qml.html
     \endif