diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-11-15 16:32:31 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-11-15 16:32:31 +0100 |
| commit | 22bfd2b05a72e1e7d7babcc9c5d824dd87903b6f (patch) | |
| tree | bcfc42bd2c2b813b32e1ace72ea1182fae634209 /src/imports | |
| parent | 8da9881989ca55f7d5e9e74c91e3abc98ce8a1b5 (diff) | |
| parent | f86ca84e783c34e701f3742902161cb365e6e940 (diff) | |
| download | qt4-tools-22bfd2b05a72e1e7d7babcc9c5d824dd87903b6f.tar.gz | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/shaders/shadereffect.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/imports/shaders/shadereffect.cpp b/src/imports/shaders/shadereffect.cpp index f40d6b84a9..a5164e27d3 100644 --- a/src/imports/shaders/shadereffect.cpp +++ b/src/imports/shaders/shadereffect.cpp @@ -61,6 +61,7 @@ ShaderEffect::~ShaderEffect() void ShaderEffect::prepareBufferedDraw(QPainter *painter) { +#ifndef QT_NO_DYNAMIC_CAST // This workaround needed because QGraphicsEffect seems to always utilize default painters worldtransform // instead of the active painters worldtransform. const ShaderEffectBuffer *effectBuffer = dynamic_cast<ShaderEffectBuffer*> (painter->device()); @@ -70,6 +71,9 @@ void ShaderEffect::prepareBufferedDraw(QPainter *painter) } else { savedWorldTransform = painter->worldTransform(); } +#else + Q_UNUSED(painter); +#endif } void ShaderEffect::draw (QPainter *painter) |