diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-26 03:00:52 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-26 03:00:53 +0200 |
| commit | 6ab6f7a1be455d2f56c8f250c349b401056e5580 (patch) | |
| tree | 52f8c8c2e418b4bfe6c6d7fec843e387d175fdd4 | |
| parent | a2b9b53b8ec20199a440d574bac0ba7fb1c1042f (diff) | |
| parent | 4aec7d14d57b10f7fc503644d3cad44d9f166322 (diff) | |
| download | qtquickcontrols-6ab6f7a1be455d2f56c8f250c349b401056e5580.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie706f27a0c43ec1d1136310fba196d9b41a184ed
| -rw-r--r-- | src/controls/Styles/Base/StatusIndicatorStyle.qml | 2 | ||||
| -rw-r--r-- | tests/auto/extras/BLACKLIST | 13 |
2 files changed, 1 insertions, 14 deletions
diff --git a/src/controls/Styles/Base/StatusIndicatorStyle.qml b/src/controls/Styles/Base/StatusIndicatorStyle.qml index c12ab507..a334aa62 100644 --- a/src/controls/Styles/Base/StatusIndicatorStyle.qml +++ b/src/controls/Styles/Base/StatusIndicatorStyle.qml @@ -204,7 +204,7 @@ Style { gradient.addColorStop(1.0, "transparent"); } else { // Draw the radial shine. - gradient = ctx.createRadialGradient(width / 2, height / 2, width * 0.25, width / 2, height / 2, width * 0.25); + gradient = ctx.createRadialGradient(width / 2, height / 2, 0, width / 2, height / 2, width * 0.5 /* (same as height) */); gradient.addColorStop(0.0, Qt.lighter(baseColor, 1.4)); gradient.addColorStop(1.0, "transparent"); } diff --git a/tests/auto/extras/BLACKLIST b/tests/auto/extras/BLACKLIST deleted file mode 100644 index daa663dc..00000000 --- a/tests/auto/extras/BLACKLIST +++ /dev/null @@ -1,13 +0,0 @@ -[Tests_StatusIndicator::test_active] -* -[Tests_StatusIndicator::test_baseStyleHasOuterShadow] -* -[Tests_StatusIndicator::test_color] -* - -[Tests_Tumbler::test_focusPastLastColumn] -* -[Tests_Tumbler::test_itemsCorrectlyPositioned] -* -[Tests_Tumbler::test_keyboardNavigation] -* |