aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-16 03:01:56 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-16 03:01:56 +0200
commit71d16bf933fb567edc43177f98a78e1cf5c6c055 (patch)
treeace593fc59a19bd6d31fc5ebcf7fc2e693f3e4b0
parentebfd01db495a2547038f71351ef9cf18f18f057d (diff)
parent3b3b3f85ddd472bdae168f210e62dc2868997aae (diff)
Merge remote-tracking branch 'origin/5.13' into dev
-rw-r--r--src/effects/doc/qtgraphicaleffects.qdocconf1
-rw-r--r--src/effects/private/DropShadowBase.qml5
2 files changed, 4 insertions, 2 deletions
diff --git a/src/effects/doc/qtgraphicaleffects.qdocconf b/src/effects/doc/qtgraphicaleffects.qdocconf
index 837929e..27d8917 100644
--- a/src/effects/doc/qtgraphicaleffects.qdocconf
+++ b/src/effects/doc/qtgraphicaleffects.qdocconf
@@ -1,4 +1,5 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtgraphicaleffects.qdocconf)
project = QtGraphicalEffects
description = Qt Graphical Effects Reference Documentation
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