diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:07:30 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 11:38:22 +0200 |
commit | c4227f453c06d969d95da2affb971e8a1cae8170 (patch) | |
tree | b3823549c7c67a7ffc09d8d9fff9827a1a2f7a34 | |
parent | fe48c1884cd8e1c4194c3242b482a7b9eb509520 (diff) | |
parent | f9664053132affe48a069235eb6561a32d38b2a7 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I82a19a2f5dfb90945d5ce9ecc61c81c9a6fde3a3
-rw-r--r-- | src/effects/private/DropShadowBase.qml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/effects/private/DropShadowBase.qml b/src/effects/private/DropShadowBase.qml index 7e80e47..e9927ea 100644 --- a/src/effects/private/DropShadowBase.qml +++ b/src/effects/private/DropShadowBase.qml @@ -38,6 +38,7 @@ ****************************************************************************/ import QtQuick 2.12 +import QtQuick.Window 2.12 import QtGraphicalEffects.private 1.12 import QtGraphicalEffects 1.12 @@ -61,8 +62,8 @@ Item { x: Math.round(horizontalOffset) y: Math.round(verticalOffset) source: root.source - radius: root.radius - samples: root.samples + radius: root.radius * Screen.devicePixelRatio + samples: root.samples * Screen.devicePixelRatio _thickness: root.spread transparentBorder: root.transparentBorder |