diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 03:06:17 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 03:06:17 +0100 |
| commit | 63f28431dacf31744714bdb7a13ffd3bedc35828 (patch) | |
| tree | b92dcc7b21dbd19f293ce956358b235ecf5ee976 | |
| parent | 9a19990ddb07c0c91390747d83f3647b07da3c79 (diff) | |
| parent | ec61d1469d0cbfc9c8edb60fe3c78d6702aa79a8 (diff) | |
| download | qtgraphicaleffects-63f28431dacf31744714bdb7a13ffd3bedc35828.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: If155dc1c43a85bbf19428e9eb2a6c045e26e0519
| -rw-r--r-- | src/effects/BrightnessContrast.qml | 3 | ||||
| -rw-r--r-- | src/effects/ColorOverlay.qml | 3 | ||||
| -rw-r--r-- | src/effects/Colorize.qml | 3 | ||||
| -rw-r--r-- | src/effects/Desaturate.qml | 3 | ||||
| -rw-r--r-- | src/effects/GammaAdjust.qml | 3 | ||||
| -rw-r--r-- | src/effects/HueSaturation.qml | 3 | ||||
| -rw-r--r-- | src/effects/LevelAdjust.qml | 3 | ||||
| -rw-r--r-- | src/effects/plugins.qmltypes | 2 |
8 files changed, 8 insertions, 15 deletions
diff --git a/src/effects/BrightnessContrast.qml b/src/effects/BrightnessContrast.qml index a95872c..85b38bb 100644 --- a/src/effects/BrightnessContrast.qml +++ b/src/effects/BrightnessContrast.qml @@ -167,8 +167,7 @@ Item { SourceProxy { id: sourceProxy input: rootItem.source - interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth) - ? SourceProxy.NearestInterpolation : SourceProxy.LinearInterpolation + interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation } ShaderEffectSource { diff --git a/src/effects/ColorOverlay.qml b/src/effects/ColorOverlay.qml index b2cdaa0..f348541 100644 --- a/src/effects/ColorOverlay.qml +++ b/src/effects/ColorOverlay.qml @@ -123,8 +123,7 @@ Item { SourceProxy { id: sourceProxy input: rootItem.source - interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth) - ? SourceProxy.NearestInterpolation : SourceProxy.LinearInterpolation + interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation } ShaderEffectSource { diff --git a/src/effects/Colorize.qml b/src/effects/Colorize.qml index 501111f..42f1796 100644 --- a/src/effects/Colorize.qml +++ b/src/effects/Colorize.qml @@ -210,8 +210,7 @@ Item { SourceProxy { id: sourceProxy input: rootItem.source - interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth) - ? SourceProxy.NearestInterpolation : SourceProxy.LinearInterpolation + interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation } ShaderEffectSource { diff --git a/src/effects/Desaturate.qml b/src/effects/Desaturate.qml index 3347e2f..e56de55 100644 --- a/src/effects/Desaturate.qml +++ b/src/effects/Desaturate.qml @@ -122,8 +122,7 @@ Item { SourceProxy { id: sourceProxy input: rootItem.source - interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth) - ? SourceProxy.NearestInterpolation : SourceProxy.LinearInterpolation + interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation } ShaderEffectSource { diff --git a/src/effects/GammaAdjust.qml b/src/effects/GammaAdjust.qml index e4e39e5..2c3edbb 100644 --- a/src/effects/GammaAdjust.qml +++ b/src/effects/GammaAdjust.qml @@ -159,8 +159,7 @@ luminance = pow(original_luminance, 1.0 / gamma); // The luminance is assumed to SourceProxy { id: sourceProxy input: rootItem.source - interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth) - ? SourceProxy.NearestInterpolation : SourceProxy.LinearInterpolation + interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation } ShaderEffectSource { diff --git a/src/effects/HueSaturation.qml b/src/effects/HueSaturation.qml index 526f474..eb13dcb 100644 --- a/src/effects/HueSaturation.qml +++ b/src/effects/HueSaturation.qml @@ -199,8 +199,7 @@ Item { SourceProxy { id: sourceProxy input: rootItem.source - interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth) - ? SourceProxy.NearestInterpolation : SourceProxy.LinearInterpolation + interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation } ShaderEffectSource { diff --git a/src/effects/LevelAdjust.qml b/src/effects/LevelAdjust.qml index 004c798..b98faca 100644 --- a/src/effects/LevelAdjust.qml +++ b/src/effects/LevelAdjust.qml @@ -408,8 +408,7 @@ Item { SourceProxy { id: sourceProxy input: rootItem.source - interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth) - ? SourceProxy.NearestInterpolation : SourceProxy.LinearInterpolation + interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation } ShaderEffectSource { diff --git a/src/effects/plugins.qmltypes b/src/effects/plugins.qmltypes index 7c2924c..4efab89 100644 --- a/src/effects/plugins.qmltypes +++ b/src/effects/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtGraphicalEffects 1.13' +// 'qmlplugindump -nonrelocatable QtGraphicalEffects 1.14' Module { dependencies: ["QtQuick 2.12", "QtQuick.Window 2.12"] |