diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:23:04 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:23:04 +0200 |
commit | d85fd81f338f9c6f2e95b92b2cb9ccd4f9889c6b (patch) | |
tree | 7557867d9fa040793880c715d6f81d1a50ea56c6 | |
parent | f086de0f3a67698b8066576a423298aadf566e13 (diff) | |
parent | 6523d7c4843e1d4176035c46e1514c39bdcfc3bf (diff) | |
download | qtgraphicaleffects-d85fd81f338f9c6f2e95b92b2cb9ccd4f9889c6b.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: Iafd3a05a5a2a47252f5ee0724ec0362f8b841124
35 files changed, 2 insertions, 0 deletions
diff --git a/src/effects/doc/images/Blend_bug_and_butterfly.png b/src/effects/doc/images/Blend_bug_and_butterfly.png Binary files differindex 1e3f09f..e7c6f79 100644 --- a/src/effects/doc/images/Blend_bug_and_butterfly.png +++ b/src/effects/doc/images/Blend_bug_and_butterfly.png diff --git a/src/effects/doc/images/BrightnessContrast_contrast_graph.png b/src/effects/doc/images/BrightnessContrast_contrast_graph.png Binary files differindex 67b3d7b..ee3b767 100644 --- a/src/effects/doc/images/BrightnessContrast_contrast_graph.png +++ b/src/effects/doc/images/BrightnessContrast_contrast_graph.png diff --git a/src/effects/doc/images/Colorize_hue_scale.png b/src/effects/doc/images/Colorize_hue_scale.png Binary files differindex 2eb9bc4..1e8ccd4 100644 --- a/src/effects/doc/images/Colorize_hue_scale.png +++ b/src/effects/doc/images/Colorize_hue_scale.png diff --git a/src/effects/doc/images/Desaturate_bug.png b/src/effects/doc/images/Desaturate_bug.png Binary files differindex 1f684df..30c840b 100644 --- a/src/effects/doc/images/Desaturate_bug.png +++ b/src/effects/doc/images/Desaturate_bug.png diff --git a/src/effects/doc/images/DropShadow_butterfly.png b/src/effects/doc/images/DropShadow_butterfly.png Binary files differindex 67f18d1..8fa2c09 100644 --- a/src/effects/doc/images/DropShadow_butterfly.png +++ b/src/effects/doc/images/DropShadow_butterfly.png diff --git a/src/effects/doc/images/GammaAdjust_gamma1_graph.png b/src/effects/doc/images/GammaAdjust_gamma1_graph.png Binary files differindex bdb854c..12916d4 100644 --- a/src/effects/doc/images/GammaAdjust_gamma1_graph.png +++ b/src/effects/doc/images/GammaAdjust_gamma1_graph.png diff --git a/src/effects/doc/images/GammaAdjust_gamma2_graph.png b/src/effects/doc/images/GammaAdjust_gamma2_graph.png Binary files differindex 9b9c859..15064cb 100644 --- a/src/effects/doc/images/GammaAdjust_gamma2_graph.png +++ b/src/effects/doc/images/GammaAdjust_gamma2_graph.png diff --git a/src/effects/doc/images/GammaAdjust_gamma3_graph.png b/src/effects/doc/images/GammaAdjust_gamma3_graph.png Binary files differindex 4e16dae..8201612 100644 --- a/src/effects/doc/images/GammaAdjust_gamma3_graph.png +++ b/src/effects/doc/images/GammaAdjust_gamma3_graph.png diff --git a/src/effects/doc/images/GaussianBlur_bug.png b/src/effects/doc/images/GaussianBlur_bug.png Binary files differindex 262ef0e..a9db381 100644 --- a/src/effects/doc/images/GaussianBlur_bug.png +++ b/src/effects/doc/images/GaussianBlur_bug.png diff --git a/src/effects/doc/images/GaussianBlur_deviation_graph.png b/src/effects/doc/images/GaussianBlur_deviation_graph.png Binary files differindex d4a09a5..2c22008 100644 --- a/src/effects/doc/images/GaussianBlur_deviation_graph.png +++ b/src/effects/doc/images/GaussianBlur_deviation_graph.png diff --git a/src/effects/doc/images/Glow_butterfly.png b/src/effects/doc/images/Glow_butterfly.png Binary files differindex f6eb9e3..57c26f8 100644 --- a/src/effects/doc/images/Glow_butterfly.png +++ b/src/effects/doc/images/Glow_butterfly.png diff --git a/src/effects/doc/images/HueSaturation_bug.png b/src/effects/doc/images/HueSaturation_bug.png Binary files differindex bbdcdc5..96c150d 100644 --- a/src/effects/doc/images/HueSaturation_bug.png +++ b/src/effects/doc/images/HueSaturation_bug.png diff --git a/src/effects/doc/images/LevelAdjust_default_curve.png b/src/effects/doc/images/LevelAdjust_default_curve.png Binary files differindex 4e98cc4..d689e0b 100644 --- a/src/effects/doc/images/LevelAdjust_default_curve.png +++ b/src/effects/doc/images/LevelAdjust_default_curve.png diff --git a/src/effects/doc/images/LevelAdjust_gamma1_curve.png b/src/effects/doc/images/LevelAdjust_gamma1_curve.png Binary files differindex a8434d9..d689e0b 100644 --- a/src/effects/doc/images/LevelAdjust_gamma1_curve.png +++ b/src/effects/doc/images/LevelAdjust_gamma1_curve.png diff --git a/src/effects/doc/images/LevelAdjust_gamma2_curve.png b/src/effects/doc/images/LevelAdjust_gamma2_curve.png Binary files differindex 3fd61b5..2533ca3 100644 --- a/src/effects/doc/images/LevelAdjust_gamma2_curve.png +++ b/src/effects/doc/images/LevelAdjust_gamma2_curve.png diff --git a/src/effects/doc/images/LevelAdjust_gamma3_curve.png b/src/effects/doc/images/LevelAdjust_gamma3_curve.png Binary files differindex 90d3e92..ac3a7ca 100644 --- a/src/effects/doc/images/LevelAdjust_gamma3_curve.png +++ b/src/effects/doc/images/LevelAdjust_gamma3_curve.png diff --git a/src/effects/doc/images/LevelAdjust_maximumInput2_curve.png b/src/effects/doc/images/LevelAdjust_maximumInput2_curve.png Binary files differindex 669dcd8..8cfcae9 100644 --- a/src/effects/doc/images/LevelAdjust_maximumInput2_curve.png +++ b/src/effects/doc/images/LevelAdjust_maximumInput2_curve.png diff --git a/src/effects/doc/images/LevelAdjust_maximumInput3_curve.png b/src/effects/doc/images/LevelAdjust_maximumInput3_curve.png Binary files differindex 7cc4316..76ee303 100644 --- a/src/effects/doc/images/LevelAdjust_maximumInput3_curve.png +++ b/src/effects/doc/images/LevelAdjust_maximumInput3_curve.png diff --git a/src/effects/doc/images/LevelAdjust_maximumOutput2_curve.png b/src/effects/doc/images/LevelAdjust_maximumOutput2_curve.png Binary files differindex 467ff1f..6c98980 100644 --- a/src/effects/doc/images/LevelAdjust_maximumOutput2_curve.png +++ b/src/effects/doc/images/LevelAdjust_maximumOutput2_curve.png diff --git a/src/effects/doc/images/LevelAdjust_maximumOutput3_curve.png b/src/effects/doc/images/LevelAdjust_maximumOutput3_curve.png Binary files differindex c94123b..3e464ef 100644 --- a/src/effects/doc/images/LevelAdjust_maximumOutput3_curve.png +++ b/src/effects/doc/images/LevelAdjust_maximumOutput3_curve.png diff --git a/src/effects/doc/images/LevelAdjust_minimumInput2_curve.png b/src/effects/doc/images/LevelAdjust_minimumInput2_curve.png Binary files differindex bea83c2..056f828 100644 --- a/src/effects/doc/images/LevelAdjust_minimumInput2_curve.png +++ b/src/effects/doc/images/LevelAdjust_minimumInput2_curve.png diff --git a/src/effects/doc/images/LevelAdjust_minimumInput3_curve.png b/src/effects/doc/images/LevelAdjust_minimumInput3_curve.png Binary files differindex 5663a81..ed4c5e5 100644 --- a/src/effects/doc/images/LevelAdjust_minimumInput3_curve.png +++ b/src/effects/doc/images/LevelAdjust_minimumInput3_curve.png diff --git a/src/effects/doc/images/LevelAdjust_minimumOutput2_curve.png b/src/effects/doc/images/LevelAdjust_minimumOutput2_curve.png Binary files differindex f0e6b09..2b4d3b1 100644 --- a/src/effects/doc/images/LevelAdjust_minimumOutput2_curve.png +++ b/src/effects/doc/images/LevelAdjust_minimumOutput2_curve.png diff --git a/src/effects/doc/images/LevelAdjust_minimumOutput3_curve.png b/src/effects/doc/images/LevelAdjust_minimumOutput3_curve.png Binary files differindex 26c9211..7ebc8a9 100644 --- a/src/effects/doc/images/LevelAdjust_minimumOutput3_curve.png +++ b/src/effects/doc/images/LevelAdjust_minimumOutput3_curve.png diff --git a/src/effects/doc/images/Original_bug.png b/src/effects/doc/images/Original_bug.png Binary files differindex 9445834..a93bcde 100644 --- a/src/effects/doc/images/Original_bug.png +++ b/src/effects/doc/images/Original_bug.png diff --git a/src/effects/doc/images/Original_butterfly.png b/src/effects/doc/images/Original_butterfly.png Binary files differindex ca6a3cf..a81dc7b 100644 --- a/src/effects/doc/images/Original_butterfly.png +++ b/src/effects/doc/images/Original_butterfly.png diff --git a/src/effects/doc/images/Original_butterfly_black.png b/src/effects/doc/images/Original_butterfly_black.png Binary files differindex e8247b4..1f9f010 100644 --- a/src/effects/doc/images/Original_butterfly_black.png +++ b/src/effects/doc/images/Original_butterfly_black.png diff --git a/src/effects/doc/images/RecursiveBlur_bug.png b/src/effects/doc/images/RecursiveBlur_bug.png Binary files differindex 6caf48e..470eebb 100644 --- a/src/effects/doc/images/RecursiveBlur_bug.png +++ b/src/effects/doc/images/RecursiveBlur_bug.png diff --git a/src/effects/doc/images/ThresholdMask_bug.png b/src/effects/doc/images/ThresholdMask_bug.png Binary files differindex 1839e03..d16429a 100644 --- a/src/effects/doc/images/ThresholdMask_bug.png +++ b/src/effects/doc/images/ThresholdMask_bug.png diff --git a/src/effects/doc/images/fog.png b/src/effects/doc/images/fog.png Binary files differindex f462222..1a51c01 100644 --- a/src/effects/doc/images/fog.png +++ b/src/effects/doc/images/fog.png diff --git a/src/effects/private/qgfxsourceproxy.cpp b/src/effects/private/qgfxsourceproxy.cpp index f917865..386cff8 100644 --- a/src/effects/private/qgfxsourceproxy.cpp +++ b/src/effects/private/qgfxsourceproxy.cpp @@ -108,6 +108,8 @@ void QGfxSourceProxy::useProxy() QObject *QGfxSourceProxy::findLayer(QQuickItem *item) { + if (!item) + return 0; QQuickItemPrivate *d = QQuickItemPrivate::get(item); if (d->extra.isAllocated() && d->extra->layer) { QObject *layer = qvariant_cast<QObject *>(item->property("layer")); diff --git a/tests/manual/testbed/images/background.png b/tests/manual/testbed/images/background.png Binary files differindex 458d33d..72cb9f0 100644 --- a/tests/manual/testbed/images/background.png +++ b/tests/manual/testbed/images/background.png diff --git a/tests/manual/testbed/images/fog.png b/tests/manual/testbed/images/fog.png Binary files differindex f462222..1a51c01 100644 --- a/tests/manual/testbed/images/fog.png +++ b/tests/manual/testbed/images/fog.png diff --git a/tests/manual/testbed/images/slider_handle_b.png b/tests/manual/testbed/images/slider_handle_b.png Binary files differindex c7d2540..4c2dd3c 100644 --- a/tests/manual/testbed/images/slider_handle_b.png +++ b/tests/manual/testbed/images/slider_handle_b.png diff --git a/tests/manual/testbed/images/workarea_right.png b/tests/manual/testbed/images/workarea_right.png Binary files differindex 4954781..2d82242 100644 --- a/tests/manual/testbed/images/workarea_right.png +++ b/tests/manual/testbed/images/workarea_right.png |