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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (36 commits)
  Doc improvements
  Disable mouse-based selection in TextInput/TextEdit
  Rename qml executable to qmlviewer
  Don't crash if the target parent is destroyed.
  Introduce a threaded interpreter for QML binding bytecode
  Bug moved.
  doc
  doc
  Remove image example (covered in class docs)
  When changing Loader source, remove old item from scene immediately.
  Add missing .qmlproject files
  Fix folderlistmodel with qt namespace
  Renaming "Qml Launcher"  back to "QML Viewer"
  Rename some examples: proxyviewer -> networkaccessmanagerfactory,
  Regression fix for Loader anchors not working
  Make Qt.include() work for js files that have '.pragma library'
  doc fix
  Improve docs for Qt.quit()
  Prevent assignment of values (string, number, bool)  to signal handlers.
  Make sure strings are escaped when returned via asScript.
  ...

1 files changed, 1 insertions, 5 deletions

diff --git a/src/gui/painting/qdrawutil.cpp b/src/gui/painting/qdrawutil.cpp
index ef9b18c..3ce95ef 100644
--- a/src/gui/painting/qdrawutil.cpp
+++ b/src/gui/painting/qdrawutil.cpp
@@ -1138,12 +1138,10 @@ void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargin
     yTarget.resize(rows + 1);
 
     bool oldAA = painter->testRenderHint(QPainter::Antialiasing);
-    bool oldSmooth = painter->testRenderHint(QPainter::SmoothPixmapTransform);
     if (painter->paintEngine()->type() != QPaintEngine::OpenGL
         && painter->paintEngine()->type() != QPaintEngine::OpenGL2
-        && (oldSmooth || oldAA) && painter->combinedTransform().type() != QTransform::TxNone) {
+        && oldAA && painter->combinedTransform().type() != QTransform::TxNone) {
         painter->setRenderHint(QPainter::Antialiasing, false);
-        painter->setRenderHint(QPainter::SmoothPixmapTransform, false);
     }
 
     xTarget[0] = targetRect.left();
@@ -1354,8 +1352,6 @@ void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargin
 
     if (oldAA)
         painter->setRenderHint(QPainter::Antialiasing, true);
-    if (oldSmooth)
-        painter->setRenderHint(QPainter::SmoothPixmapTransform, true);
 }
 
 QT_END_NAMESPACE