Merge remote-tracking branch 'origin/4.10'

Change-Id: Ida1659af5c9c72b67b01645c88aea4ea60e09b7f

5 files changed, 75 insertions, 9 deletions

diff --git a/doc/images/qtcreator-build-steps-cmake-ninja.png b/doc/images/qtcreator-build-steps-cmake-ninja.png
new file mode 100644
index 0000000000..0f1ba4fa74
--- /dev/null
+++ b/doc/images/qtcreator-build-steps-cmake-ninja.png
diff --git a/doc/images/studio-curve-editor.png b/doc/images/studio-curve-editor.png
new file mode 100644
index 0000000000..f1f82e0abe
--- /dev/null
+++ b/doc/images/studio-curve-editor.png
diff --git a/doc/src/cmake/creator-projects-cmake-building.qdocinc b/doc/src/cmake/creator-projects-cmake-building.qdocinc
index 8cc91516e8..bca11658e4 100644
--- a/doc/src/cmake/creator-projects-cmake-building.qdocinc
+++ b/doc/src/cmake/creator-projects-cmake-building.qdocinc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 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.
@@ -73,9 +73,42 @@
 
     \image qtcreator-cmake-build-steps.png
 
+    \note While the other CMake generators are installed together with Qt,
+    you usually need to install Ninja yourself. For more information, see
+    \l {Using Ninja as a CMake Generator}.
+
 //! [cmake build steps]
 
 
+//! [cmake ninja]
+
+    \section2 Using Ninja as a CMake Generator
+
+    To use \l {https://ninja-build.org/}{Ninja} with CMake, you must install it
+    and select it as the CMake generator in the build and run kit:
+
+    \list 1
+        \li Install Ninja.
+        \li Add the path to the Ninja executable to the value of the PATH system
+            variable.
+        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits, and
+            then select the build and run kit for the project.
+        \li Select \uicontrol Change next to the \uicontrol {CMake generator}
+            field to open the \uicontrol {CMake Generator} dialog.
+            \image qtcreator-build-steps-cmake-ninja.png
+        \li In the \uicontrol Generator field, select \uicontrol Ninja.
+        \li Select \uicontrol OK to return to the \uicontrol Kits tab.
+        \li Select \uicontrol OK or \uicontrol Apply to save your changes.
+    \endlist
+
+    \note To make sure that old build artifacts don't get in the way
+    the first time you build the project after the change, select
+    \uicontrol Build > \uicontrol {Rebuild Project}. This cleans up the
+    build directory and performs a new build.
+
+//! [cmake ninja]
+
+
 //! [cmake clean steps]
 
     \section2 CMake Clean Steps
diff --git a/doc/src/projects/creator-only/creator-projects-targets.qdoc b/doc/src/projects/creator-only/creator-projects-targets.qdoc
index 6438abc42b..dc23a5e834 100644
--- a/doc/src/projects/creator-only/creator-projects-targets.qdoc
+++ b/doc/src/projects/creator-only/creator-projects-targets.qdoc
@@ -194,6 +194,8 @@
     choose the kit to use. To set the selected kit as the default kit,
     select \uicontrol {Make Default}.
 
+    \include creator-projects-cmake-building.qdocinc cmake ninja
+
     \section1 Editing Qbs Profiles
 
     To view the Qbs profile associated with the kit, select \uicontrol Tools >
diff --git a/doc/src/qtquick/qtquick-timeline.qdoc b/doc/src/qtquick/qtquick-timeline.qdoc
index 3462330208..de012b94e5 100644
--- a/doc/src/qtquick/qtquick-timeline.qdoc
+++ b/doc/src/qtquick/qtquick-timeline.qdoc
@@ -245,8 +245,11 @@
     components can appear to pick up speed, slow down, or bounce back at the
     end of the animation. By default, the animations you specify on the
     timeline are \e linear, which means that they move from the beginning to
-    the end at a constant speed. You can use the curve picker to edit the
-    easing curve at a keyframe.
+    the end at a constant speed. You can use the \e {curve picker} to edit the
+    easing curve between two keyframes. You can also use the more advanced
+    \e {curve editor} to edit the curves for the whole animation.
+
+    \section2 Attaching Easing Curves to Keyframes
 
     \image studio-curve-picker.png
 
@@ -256,16 +259,16 @@
     custom curve. For more information about easing curve types, see the
     documentation for \l [QML] {PropertyAnimation}{easing curves}.
 
-    To zoom into and out of the easing curve editor, use the mouse roller. To
-    reset the zoom factor, right-click in the editor and select
+    To zoom into and out of the easing curve picker, use the mouse roller. To
+    reset the zoom factor, right-click in the picker and select
     \uicontrol {Reset Zoom}.
 
-    To select easing curves:
+    To attach easing curves to keyframes:
 
     \list 1
         \li Select a keyframe on the timeline.
         \li Select \uicontrol {Curve Picker (C)} on the toolbar, or press
-            \key C to open the \uicontrol {Easing Curve Editor} dialog.
+            \key C to open the curve picker.
         \li Select an easing curve in the \uicontrol Presets tab.
         \li In the \uicontrol {Duration (ms)} field, select the duration of the
             easing function in milliseconds.
@@ -279,11 +282,13 @@
     to \inlineimage keyframe_manualbezier_inactive.png
     .
 
+    \section2 Customizing Easing Curves
+
     To customize easing curves:
 
     \list 1
-        \li In the \uicontrol {Easing Curve Editor} dialog, select an easing
-            curve in the \uicontrol Presets tab.
+        \li In the curve picker, select an easing curve in the
+            \uicontrol Presets tab.
         \li Drag the curve handlers to modify the curve.
         \li Right-click in the editor, and select \uicontrol {Add Point} to add
             points to the curve.
@@ -299,6 +304,32 @@
     To paste easing curve definitions to the curve picker as text, select
     the \uicontrol Text tab.
 
+    \section1 Editing Animation Curves
+
+    In the curve editor, you can view and modify the whole animation curve. You
+    can insert keyframes to the curve and drag them and the point handlers to
+    modify the curve. You can modify the appearance of the curve in the style
+    editor.
+
+    You can also edit easing curves that you added with the curve picker.
+
+    \image studio-curve-editor.png
+
+    To edit animation curves:
+
+    \list 1
+        \li In the \uicontrol Timeline view, insert at least one keyframe.
+        \li Select \inlineimage curveGraphIcon.png
+            (\uicontrol {Curve Editor (C)} on the toolbar or press \key C
+            to open the curve editor.
+        \li Right-click in the curve editor, and select
+            \uicontrol {Insert Keyframe} to add a keyframe.
+        \li Select keyframes to display the easing curves attached to them.
+            To select multiple keyframes, press and hold \key Ctrl.
+    \endlist
+
+    Your changes are automatically saved when you close the editor.
+
     \section1 Rotating Items
 
     To animate components that rotate around a central point, you can use the