← Back to branch summary

~neon/qt/qtgraphicaleffects

~neon/qt/qtgraphicaleffects

Viewing all changes in revision 170.

Committer: Frederik Gladhorn
Date: 2014-12-17 15:52:50 UTC
mfrom: (164.1.8)
Revision ID: git-v1:974f84c7f50d7fd1628137845c51df3d3a80b3fe

Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
.qmake.conf

Change-Id: Ie64aa3089d47063e82f8d1cb77929deee86c62ea

files modified:
src/effects/Blend.qml

src/effects/BrightnessContrast.qml

src/effects/ColorOverlay.qml

src/effects/Colorize.qml

src/effects/ConicalGradient.qml

src/effects/Desaturate.qml

src/effects/DirectionalBlur.qml

src/effects/Displace.qml

src/effects/DropShadow.qml

src/effects/FastBlur.qml

src/effects/GammaAdjust.qml

src/effects/GaussianBlur.qml

src/effects/Glow.qml

src/effects/HueSaturation.qml

src/effects/InnerShadow.qml

src/effects/LevelAdjust.qml

src/effects/LinearGradient.qml

src/effects/MaskedBlur.qml

src/effects/OpacityMask.qml

src/effects/RadialBlur.qml

src/effects/RadialGradient.qml

src/effects/RectangularGlow.qml

src/effects/RecursiveBlur.qml

src/effects/ThresholdMask.qml

src/effects/ZoomBlur.qml

Show diffs side-by-side

added added

removed removed

src/effects/Blend.qml

src/effects/BrightnessContrast.qml

src/effects/ColorOverlay.qml

src/effects/Colorize.qml

src/effects/ConicalGradient.qml

src/effects/Desaturate.qml

src/effects/DirectionalBlur.qml

src/effects/Displace.qml

src/effects/DropShadow.qml

src/effects/FastBlur.qml

src/effects/GammaAdjust.qml

src/effects/GaussianBlur.qml

src/effects/Glow.qml

src/effects/HueSaturation.qml

src/effects/InnerShadow.qml

src/effects/LevelAdjust.qml

src/effects/LinearGradient.qml

src/effects/MaskedBlur.qml

src/effects/OpacityMask.qml

src/effects/RadialBlur.qml

src/effects/RadialGradient.qml

src/effects/RectangularGlow.qml

src/effects/RecursiveBlur.qml

src/effects/ThresholdMask.qml

src/effects/ZoomBlur.qml

Older »