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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixed compilation of the modelview tutorial on Windows.
  qdrawhelper:  micro optimisation in fetchTransformBilinear
  Fix QStaticText copy constructor to also copy text option property
  qdrawhelper: Remove blend_transformed_bilinear_argb

1 files changed, 1 insertions, 1 deletions

diff --git a/examples/tutorials/modelview/2_formatting/mymodel.cpp b/examples/tutorials/modelview/2_formatting/mymodel.cpp
index 3e13ff4..2d2556c 100755
--- a/examples/tutorials/modelview/2_formatting/mymodel.cpp
+++ b/examples/tutorials/modelview/2_formatting/mymodel.cpp
@@ -89,7 +89,7 @@ QVariant MyModel::data(const QModelIndex &index, int role) const
 
         if (row == 1 && col == 2)  //change background only for cell(1,2)
         {
-            QBrush redBackground(QColor(Qt::red));
+            QBrush redBackground(Qt::red);
             return redBackground;
         }
         break;