diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-18 02:07:32 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-18 02:07:32 (GMT) |
| commit | 96d5029126707771a3b956e6db0391ae7d619853 (patch) | |
| tree | d0c02db9c61f3c62c85d6d7ed74c8556d1969dac /src | |
| parent | ee41cb13e986d28fb32040093d7797f2bcd6ca78 (diff) | |
| parent | 9e64e612eeddac2fcf023213df2fd3cccadbf342 (diff) | |
| download | Qt-96d5029126707771a3b956e6db0391ae7d619853.zip Qt-96d5029126707771a3b956e6db0391ae7d619853.tar.gz Qt-96d5029126707771a3b956e6db0391ae7d619853.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qdrawutil.cpp | 6 |
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 |