Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Compile when -no-rtti is specified as a configure option
  Ensure that the RC_FILE is correctly handled in a single configuration

2 files changed, 5 insertions, 0 deletions

diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index c70d966afb..130f273cc1 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -2896,6 +2896,7 @@ XmlOutput &operator<<(XmlOutput &xml, const VCXProjectSingleConfig &tool)
         tempProj.outputFilter(xml, xmlFilter, tempProj.ExtraCompilers.at(x));
     }
 
+    tempProj.outputFilter(xml, xmlFilter, "Root Files");
     xml << import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.targets");
 
     xml << tag("ImportGroup")
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)