From 5affaad97a8c2116fb53c6709ad09952a8989c89 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 1 Sep 2017 13:40:52 +0200 Subject: Add change file for Qt 5.6.3 Task-number: QTBUG-62719 Change-Id: I78a26008cdce90d44ba2d55bc707d5fffbc4a7b0 Reviewed-by: Andy Shaw --- dist/changes-5.6.3 | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 dist/changes-5.6.3 diff --git a/dist/changes-5.6.3 b/dist/changes-5.6.3 new file mode 100644 index 0000000..285d4a8 --- /dev/null +++ b/dist/changes-5.6.3 @@ -0,0 +1,12 @@ +Qt 5.6.3 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.6.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.6 series is binary compatible with the 5.5.x series. +Applications compiled for 5.5 will continue to run with 5.6. + +There were no changes in this module since previous release. -- cgit v1.2.3 From 1ecb50943b017f7dcf07ab51127a599eb152f368 Mon Sep 17 00:00:00 2001 From: Svenn-Arne Dragly Date: Tue, 19 Sep 2017 10:06:19 +0200 Subject: Ensure m_maxBlurSamples is initialized to 0 Valgrind reports a conditional jump that depends on this uninitialized value in gaussianBlur(). Change-Id: I19fc143e8adf5264df514b930af048ee6d810538 Reviewed-by: Lars Knoll --- src/effects/private/qgfxshaderbuilder_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/effects/private/qgfxshaderbuilder_p.h b/src/effects/private/qgfxshaderbuilder_p.h index 7061c7d..83d2222 100644 --- a/src/effects/private/qgfxshaderbuilder_p.h +++ b/src/effects/private/qgfxshaderbuilder_p.h @@ -57,7 +57,7 @@ public: Q_INVOKABLE QVariantMap gaussianBlur(const QJSValue ¶meters); private: - int m_maxBlurSamples; + int m_maxBlurSamples = 0; }; QT_END_NAMESPACE -- cgit v1.2.3 From 45ce39000d690cf7d2bc757d81977309b19c6bc7 Mon Sep 17 00:00:00 2001 From: Jesus Fernandez Date: Tue, 19 Sep 2017 14:55:34 +0200 Subject: Remove extra character in documentation Fixes the string: Note: This effect is available when running with OpenGL. s Change-Id: I82fb3f12f3d64832d7e201bc41c1f64c3ac6bc2a Reviewed-by: Venugopal Shivashankar --- src/effects/Colorize.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/effects/Colorize.qml b/src/effects/Colorize.qml index 77078ef..d115e93 100644 --- a/src/effects/Colorize.qml +++ b/src/effects/Colorize.qml @@ -68,7 +68,7 @@ import QtGraphicalEffects.private 1.0 \endtable \note This effect is available when running with OpenGL. - s + \section1 Example The following example shows how to apply the effect. -- cgit v1.2.3 From 0419cb2b74e6b953fc1d3b02e71a3f0def39177c Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Mon, 18 Sep 2017 15:47:37 +0200 Subject: Doc: "strenght" => "strength" Change-Id: Idbb66dc94eec5cfacf3a52c35059b7d54a424fe2 Reviewed-by: Venugopal Shivashankar --- src/effects/DropShadow.qml | 2 +- src/effects/Glow.qml | 4 ++-- src/effects/InnerShadow.qml | 2 +- src/effects/RectangularGlow.qml | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/effects/DropShadow.qml b/src/effects/DropShadow.qml index dc5b4fa..065a489 100644 --- a/src/effects/DropShadow.qml +++ b/src/effects/DropShadow.qml @@ -273,7 +273,7 @@ Item { property alias verticalOffset: dbs.verticalOffset /*! - This property defines how large part of the shadow color is strenghtened + This property defines how large part of the shadow color is strengthened near the source edges. The value ranges from 0.0 to 1.0. By default, the property is set to \c diff --git a/src/effects/Glow.qml b/src/effects/Glow.qml index 168fc44..73ea4cf 100644 --- a/src/effects/Glow.qml +++ b/src/effects/Glow.qml @@ -52,7 +52,7 @@ import QtGraphicalEffects.private 1.0 The Glow effect blurs the alpha channel of the source and colorizes it with \l {Glow::color}{color} and places it behind the source, resulting in a halo or glow around the object. The quality of the blurred edge can be controlled using - \l samples and \l radius and the strenght of the glow can be changed using + \l samples and \l radius and the strength of the glow can be changed using \l spread. \table @@ -171,7 +171,7 @@ Item { property alias samples: dps.samples /*! - This property defines how large part of the glow color is strenghtened + This property defines how large part of the glow color is strengthened near the source edges. The values range from 0.0 to 1.0. By default, the property is set to \c diff --git a/src/effects/InnerShadow.qml b/src/effects/InnerShadow.qml index acc47fb..f8f009f 100644 --- a/src/effects/InnerShadow.qml +++ b/src/effects/InnerShadow.qml @@ -155,7 +155,7 @@ Item { property int samples: 0 /*! - This property defines how large part of the shadow color is strenghtened + This property defines how large part of the shadow color is strengthened near the source edges. The value ranges from 0.0 to 1.0. By default, the property is set to \c diff --git a/src/effects/RectangularGlow.qml b/src/effects/RectangularGlow.qml index d8eb82c..2c2234d 100644 --- a/src/effects/RectangularGlow.qml +++ b/src/effects/RectangularGlow.qml @@ -109,11 +109,11 @@ Item { property real glowRadius: 0.0 /*! - This property defines how large part of the glow color is strenghtened + This property defines how large part of the glow color is strengthened near the source edges. - The value ranges from 0.0 (no strenght increase) to 1.0 (maximum - strenght increase). By default, the property is set to \c 0.0. + The value ranges from 0.0 (no strength increase) to 1.0 (maximum + strength increase). By default, the property is set to \c 0.0. \table \header -- cgit v1.2.3 From 8c4488a77d5fe4fed26b22dbc91b746a77cd0562 Mon Sep 17 00:00:00 2001 From: Marco Benelli Date: Thu, 21 Sep 2017 09:37:17 +0200 Subject: Add plugins.qmltypes Even if there are no public components defined in C++, adding the `plugins.qmltypes` will prevent QtCreator to try to dump the module. Task-number: QTCREATORBUG-18952 Change-Id: I632342a05579957e123bbaa8bcfb3bbaec29232e Reviewed-by: Thomas Hartmann --- src/effects/plugins.qmltypes | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/effects/plugins.qmltypes diff --git a/src/effects/plugins.qmltypes b/src/effects/plugins.qmltypes new file mode 100644 index 0000000..8cbeeb7 --- /dev/null +++ b/src/effects/plugins.qmltypes @@ -0,0 +1,11 @@ +import QtQuick.tooling 1.2 + +// This file describes the plugin-supplied types contained in the library. +// It is used for QML tooling purposes only. +// +// This file was auto-generated by: +// 'qmlplugindump -nonrelocatable QtGraphicalEffects 1.0' + +Module { + dependencies: ["QtQuick 2.0", "QtQuick.Window 2.1"] +} -- cgit v1.2.3 From 1f6658cbaa5ffecbf9ba845ea81683dd2215cd34 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Thu, 21 Sep 2017 13:50:01 +0300 Subject: Add changes file for Qt 5.9.2 Change-Id: I2f7862c5edabd400482a5fdbb82d85c30b08aae6 Reviewed-by: Andy Shaw --- dist/changes-5.9.2 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 dist/changes-5.9.2 diff --git a/dist/changes-5.9.2 b/dist/changes-5.9.2 new file mode 100644 index 0000000..1671a60 --- /dev/null +++ b/dist/changes-5.9.2 @@ -0,0 +1,25 @@ +Qt 5.9.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.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.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +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. + +**************************************************************************** +* Qt 5.9.2 Changes * +**************************************************************************** + +- [QTBUG-57205] Ensure correct detection of dependencies for GaussianBlur + in qmlimportscanner. -- cgit v1.2.3 From 7ab12ad1483607cf3f007c591e998f40f2ec9513 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 6 Oct 2017 18:00:41 +0200 Subject: Bump version Change-Id: I2594843ce024945744f53f9fb017e0ac1a6f684e --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 78a277a..2108ac6 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.9.2 +MODULE_VERSION = 5.9.3 -- cgit v1.2.3