diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:14:30 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:15:03 +0100 |
| commit | afd0574bd252e2d7a7e9d47b3b3bd12e87314406 (patch) | |
| tree | 54f897dd664b975abd03352fafd60292135cca8e | |
| parent | 8175793c5edb2ba758a0271036b4f376d3c3c319 (diff) | |
| parent | db4289240d1f031a218871bb78a2da59e58f7244 (diff) | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I7a2f8e638aadd9b3f8b65cb600b26136f1839842
| -rw-r--r-- | src/effects/DropShadow.qml | 1 | ||||
| -rw-r--r-- | src/effects/Glow.qml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/effects/DropShadow.qml b/src/effects/DropShadow.qml index 538faf6..52cb409 100644 --- a/src/effects/DropShadow.qml +++ b/src/effects/DropShadow.qml @@ -391,6 +391,7 @@ Item { SourceProxy { id: sourceProxy input: rootItem.source + sourceRect: rootItem.transparentBorder ? Qt.rect(-1, -1, parent.width + 2.0, parent.height + 2.0) : Qt.rect(0, 0, 0, 0) } ShaderEffect { anchors.fill: parent diff --git a/src/effects/Glow.qml b/src/effects/Glow.qml index c95c846..024915b 100644 --- a/src/effects/Glow.qml +++ b/src/effects/Glow.qml @@ -295,6 +295,7 @@ Item { SourceProxy { id: sourceProxy input: rootItem.source + sourceRect: rootItem.transparentBorder ? Qt.rect(-1, -1, parent.width + 2.0, parent.height + 2.0) : Qt.rect(0, 0, 0, 0) } ShaderEffect { anchors.fill: parent |