aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-02-27 18:41:08 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-02-27 18:41:08 +0100
commitee9ac263dbad736baed16e34dd0b35426925695c (patch)
tree9a2d49d5d3e05f476613221b84ac56d88dc20dca
parent01fd5f84a2a126d99ff883b0941756adbda42f88 (diff)
parent3e28d47cea038ca64c2e14ff449cc183c51643ce (diff)
Merge remote-tracking branch 'origin/5.11' into dev
-rw-r--r--dist/changes-5.10.126
-rw-r--r--src/effects/DirectionalBlur.qml2
-rw-r--r--src/effects/DropShadow.qml2
-rw-r--r--src/effects/GaussianBlur.qml2
-rw-r--r--src/effects/Glow.qml2
5 files changed, 30 insertions, 4 deletions
diff --git a/dist/changes-5.10.1 b/dist/changes-5.10.1
new file mode 100644
index 0000000..695c4e3
--- /dev/null
+++ b/dist/changes-5.10.1
@@ -0,0 +1,26 @@
+Qt 5.10.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.10.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.10 series is binary compatible with the 5.9.x series.
+Applications compiled for 5.9 will continue to run with 5.10.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+This release contains all fixes included in the Qt 5.9.4 release.
+
+****************************************************************************
+* Qt 5.10.1 Changes *
+****************************************************************************
+
+ - This release contains only minor code improvements.
diff --git a/src/effects/DirectionalBlur.qml b/src/effects/DirectionalBlur.qml
index 6965a52..7525dbc 100644
--- a/src/effects/DirectionalBlur.qml
+++ b/src/effects/DirectionalBlur.qml
@@ -85,7 +85,7 @@ Item {
property variant source
/*!
- This property defines the percieved amount of movement for each pixel.
+ This property defines the perceived amount of movement for each pixel.
The movement is divided evenly to both sides of each pixel.
The quality of the blur depends on \l{DirectionalBlur::samples}{samples}
diff --git a/src/effects/DropShadow.qml b/src/effects/DropShadow.qml
index 065a489..0668a80 100644
--- a/src/effects/DropShadow.qml
+++ b/src/effects/DropShadow.qml
@@ -104,7 +104,7 @@ Item {
Radius defines the softness of the shadow. A larger radius causes the
edges of the shadow to appear more blurry.
- The ideal blur is acheived by selecting \c samples and \c radius such
+ The ideal blur is achieved by selecting \c samples and \c radius such
that \c {samples = 1 + radius * 2}, such as:
\table
diff --git a/src/effects/GaussianBlur.qml b/src/effects/GaussianBlur.qml
index a9999a8..579682a 100644
--- a/src/effects/GaussianBlur.qml
+++ b/src/effects/GaussianBlur.qml
@@ -92,7 +92,7 @@ Item {
affect the blurring of an individual pixel. A larger radius increases
the blur effect.
- The ideal blur is acheived by selecting \c samples and \c radius such
+ The ideal blur is achieved by selecting \c samples and \c radius such
that \c {samples = 1 + radius * 2}, such as:
\table
diff --git a/src/effects/Glow.qml b/src/effects/Glow.qml
index 73ea4cf..f8d7bc0 100644
--- a/src/effects/Glow.qml
+++ b/src/effects/Glow.qml
@@ -105,7 +105,7 @@ Item {
Depending on the radius value, value of the \l{Glow::samples}{samples}
should be set to sufficiently large to ensure the visual quality.
- The ideal blur is acheived by selecting \c samples and \c radius such
+ The ideal blur is achieved by selecting \c samples and \c radius such
that \c {samples = 1 + radius * 2}, such as:
\table