Merge remote-tracking branch 'origin/8.0'

Change-Id: I37a1f78caf9ae258c6b052efa3be15b3dbcbe164

11 files changed, 14 insertions, 13 deletions

diff --git a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf
index c3ba9b4f1b..f9722725e8 100644
--- a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf
+++ b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf
@@ -41,6 +41,7 @@ excludedirs  += ../../qtcreator/examples/accelbubble \
                 ../../qtcreator/src/cmake \
                 ../../qtcreator/src/conan \
                 ../../qtcreator/src/debugger/creator-only \
+                ../../qtcreator/src/docker \
                 ../../qtcreator/src/editors/creator-only \
                 ../../qtcreator/src/howto/creator-only \
                 ../../qtcreator/src/incredibuild \
diff --git a/doc/qtdesignstudio/examples/doc/coffeemachine.qdoc b/doc/qtdesignstudio/examples/doc/coffeemachine.qdoc
index 1f9cfb8baf..38186fe45d 100644
--- a/doc/qtdesignstudio/examples/doc/coffeemachine.qdoc
+++ b/doc/qtdesignstudio/examples/doc/coffeemachine.qdoc
@@ -168,7 +168,7 @@
     \image coffee-machine-timeline-settings.png
 
     We set the start frame for the \c {"selection"} state to 400 and
-    the end frame to 200, because we are moving back on the timeline to display
+    the end frame to 200 because we are moving back on the timeline to display
     the selection sidebar.
 
     In the \uicontrol {Transition to state} field, we select the state to
diff --git a/doc/qtdesignstudio/examples/doc/washingMachineUI.qdoc b/doc/qtdesignstudio/examples/doc/washingMachineUI.qdoc
index 32cbc60ae3..2c35cf9bc8 100644
--- a/doc/qtdesignstudio/examples/doc/washingMachineUI.qdoc
+++ b/doc/qtdesignstudio/examples/doc/washingMachineUI.qdoc
@@ -90,7 +90,7 @@
     \l {basic-image}{Image}, \l Text, and \l {Mouse Area} components. For the
     screen background, we use the \l {basic-rectangle}{Rectangle} component.
 
-    The text might look different on the desktop and MCUs, because on the
+    The text might look different on the desktop and MCUs because on the
     desktop we use dynamic font loading, whereas on MCUs fonts are compiled
     into application sources. Therefore, the text will always be Maven Pro
     on MCUs, whereas on the desktop you'd need to have Maven Pro installed
@@ -227,7 +227,7 @@
     \skipto Item {
     \printuntil }
 
-    We have to do it this way, because we are developing for MCUs. We have to
+    We have to do it this way because we are developing for MCUs. We have to
     use either \c when conditions or set the state directly through code,
     which overrides \c when conditions. Otherwise, we could just select the
     action to change to the state that we want in the \uicontrol Action field.
diff --git a/doc/qtdesignstudio/src/components/qtquick-buttons.qdoc b/doc/qtdesignstudio/src/components/qtquick-buttons.qdoc
index 2a6b36695d..21adaeba50 100644
--- a/doc/qtdesignstudio/src/components/qtquick-buttons.qdoc
+++ b/doc/qtdesignstudio/src/components/qtquick-buttons.qdoc
@@ -198,7 +198,7 @@
                     \inlineimage icons/anchor-fill.png
                     (\uicontrol {Fill to Parent}) button to always make the
                     image the same size as its parent. This makes the button
-                    component scalable, because the image size is bound to the
+                    component scalable because the image size is bound to the
                     component size.
             \endlist
         \li Select the other border image to edit the values of its properties
diff --git a/doc/qtdesignstudio/src/components/qtquick-controls.qdoc b/doc/qtdesignstudio/src/components/qtquick-controls.qdoc
index 9faf9b85c9..1dba08cf28 100644
--- a/doc/qtdesignstudio/src/components/qtquick-controls.qdoc
+++ b/doc/qtdesignstudio/src/components/qtquick-controls.qdoc
@@ -70,7 +70,7 @@
     components, unless it has been explicitly set for them.
 
     \note Take care when enabling wheel events for controls within scrollable
-    components, such as \l Flickable, because the control will consume the
+    components, such as \l Flickable because the control will consume the
     events, and therefore interrupt scrolling of the flickable.
 
     \uicontrol Spacing is useful for controls that have multiple or repetitive
@@ -130,7 +130,7 @@
     The button text should be a verb describing the action, or a noun matching
     the title of the popup that will be opened.
 
-    Don't use a button to set state, because a \l Switch is more suitable for
+    Don't use a button to set state because a \l Switch is more suitable for
     that purpose.
 
     \section3 Highlighted Buttons
diff --git a/doc/qtdesignstudio/src/components/qtquick-images.qdoc b/doc/qtdesignstudio/src/components/qtquick-images.qdoc
index 256289fd92..1dabc0aae6 100644
--- a/doc/qtdesignstudio/src/components/qtquick-images.qdoc
+++ b/doc/qtdesignstudio/src/components/qtquick-images.qdoc
@@ -118,7 +118,7 @@
 
     If the source is an intrinsically scalable image (such as SVG), source size
     determines the size of the loaded image regardless of intrinsic size.
-    Avoid changing the source size property dynamically, because rendering an
+    Avoid changing the source size property dynamically because rendering an
     SVG is slow compared with rendering other image formats.
 
     If the source is a non-scalable image (such as JPEG), the loaded image will
diff --git a/doc/qtdesignstudio/src/overviews/qtquick-placeholder-data.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-placeholder-data.qdoc
index 237cfc67ef..bfdb708a24 100644
--- a/doc/qtdesignstudio/src/overviews/qtquick-placeholder-data.qdoc
+++ b/doc/qtdesignstudio/src/overviews/qtquick-placeholder-data.qdoc
@@ -98,7 +98,7 @@
     \endqml
 
     This works nicely for applications but \uicontrol {Form Editor} displays a
-    zero-sized component. A parent for the opened file does not exist, because
+    zero-sized component. A parent for the opened file does not exist because
     the context is missing. To get around the missing context, the idea of a
     \e {dummy context} is introduced. If you place a file with the same name as
     the application (here, example.qml) in the \c {dummydata/context} directory,
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc
index e171806340..25e52b7ac9 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc
@@ -54,7 +54,7 @@
     \list 1
         \li In the File Explorer, create a new folder for the mock data
             inside the \e imports folder in your project folder (for example, \e Data).
-            \note Make sure to capitalize the \e Data folder name, because you
+            \note Make sure to capitalize the \e Data folder name because you
             will need to import it as a component later, and component names must
             be capitalized.
             \note If you place this folder somewhere else in the project, you will
@@ -73,7 +73,7 @@
         \li Follow the instructions of the wizard to create the Qt Quick file
             in the data folder. In these instructions, the file is called
             \e Values.qml.
-            \note Make sure to capitalize the filename, because it will become
+            \note Make sure to capitalize the filename because it will become
             a custom component.
         \li Select \uicontrol File > \uicontrol {New File} >
             \uicontrol {JavaScript} >
diff --git a/doc/qtdesignstudio/src/qtquickdesigner-components/qtdesignstudio-visual-effects.qdoc b/doc/qtdesignstudio/src/qtquickdesigner-components/qtdesignstudio-visual-effects.qdoc
index 1b3e004d2d..599be37cc7 100644
--- a/doc/qtdesignstudio/src/qtquickdesigner-components/qtdesignstudio-visual-effects.qdoc
+++ b/doc/qtdesignstudio/src/qtquickdesigner-components/qtdesignstudio-visual-effects.qdoc
@@ -67,7 +67,7 @@
     The \uicontrol Cached property allows the effect output pixels to be cached
     in order to improve the rendering performance. Every time the source or
     effect properties are changed, the pixels in the cache must be updated.
-    Memory consumption is increased, because an extra buffer of memory is
+    Memory consumption is increased because an extra buffer of memory is
     required for storing the effect output. We recommend that you disable the
     cache when the source or the effect properties are animated.
 
diff --git a/doc/qtdesignstudio/src/views/qtquick-form-editor.qdoc b/doc/qtdesignstudio/src/views/qtquick-form-editor.qdoc
index 3d8b7afb2f..153f39fd02 100644
--- a/doc/qtdesignstudio/src/views/qtquick-form-editor.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-form-editor.qdoc
@@ -186,7 +186,7 @@
     \uicontrol {Sibling component spacing} field, specify the
     distance in pixels between siblings and the snapping lines.
 
-    \image qtquick-designer-options.png "Qt Quick Designer options"
+    \image qtquick-designer-options.png "Qt Quick Designer preferences"
 
     The following image shows the snapping lines (1) when
     \uicontrol {Parent component padding} is set to 5 pixels.
diff --git a/doc/qtdesignstudio/src/views/qtquick-properties.qdoc b/doc/qtdesignstudio/src/views/qtquick-properties.qdoc
index 3901be0985..6b0197ffb3 100644
--- a/doc/qtdesignstudio/src/views/qtquick-properties.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-properties.qdoc
@@ -439,7 +439,7 @@
     The value of the \uicontrol Format field specifies the internal OpenGL
     format of the texture. Depending on the OpenGL implementation, it might
     allow you to save some texture memory. However, use the \uicontrol RGB
-    and \uicontrol Alpha values with caution, because the underlying hardware
+    and \uicontrol Alpha values with caution because the underlying hardware
     and driver might not support them.
 
     In the \uicontrol {Texture mirroring} field, specify whether the generated