summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2011-11-04 18:35:41 +0100
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-11-07 16:07:33 +0100
commit2c072ae53ea4f90a32cfb8260f1bd0251ebab4f9 (patch)
tree2105aa56c8f4f4b1fe693ac51303bd47f2c1a77c
parent34af6fd31e29334e9ffe5d390d5a8b40c5a4a9c6 (diff)
downloadqt4-tools-2c072ae53ea4f90a32cfb8260f1bd0251ebab4f9.tar.gz
Compile when -no-rtti is specified as a configure option
After discussing with Marko who did the original backport of the ShaderEffect to Qt 4.7 it was agreed that this is the correct thing to do in this case. Merge-request: 2713 Task-number: QTBUG-22419 Reviewed-by: Marko Niemelä
-rw-r--r--src/imports/shaders/shadereffect.cpp4
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)