diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-09 01:16:30 (GMT) |
|---|---|---|
| committer | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-09 01:16:30 (GMT) |
| commit | c5be02430eda5a555114ef332a389b7621904b17 (patch) | |
| tree | a428a79a5618a95de48f22bb4b40a8dbdb8816ae /src/gui/styles/qstylesheetstyle.cpp | |
| parent | 693695e5677422625d555943586d41fbd9dbe971 (diff) | |
| parent | 03050f1495a9071a7123ed70caff83466df8c6e5 (diff) | |
| download | Qt-c5be02430eda5a555114ef332a389b7621904b17.zip Qt-c5be02430eda5a555114ef332a389b7621904b17.tar.gz Qt-c5be02430eda5a555114ef332a389b7621904b17.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/styles/qstylesheetstyle.cpp')
| -rw-r--r-- | src/gui/styles/qstylesheetstyle.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index 3d8dec6..b1fd415 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -1130,10 +1130,10 @@ void QRenderRule::drawBorderImage(QPainter *p, const QRect& rect) const QStyleSheetBorderImageData *borderImageData = border()->borderImage(); const int *targetBorders = border()->borders; const int *sourceBorders = borderImageData->cuts; - QMargins sourceMargins(sourceBorders[TopEdge], sourceBorders[LeftEdge], - sourceBorders[BottomEdge], sourceBorders[RightEdge]); - QMargins targetMargins(targetBorders[TopEdge], targetBorders[LeftEdge], - targetBorders[BottomEdge], targetBorders[RightEdge]); + QMargins sourceMargins(sourceBorders[LeftEdge], sourceBorders[TopEdge], + sourceBorders[RightEdge], sourceBorders[BottomEdge]); + QMargins targetMargins(targetBorders[LeftEdge], targetBorders[TopEdge], + targetBorders[RightEdge], targetBorders[BottomEdge]); bool wasSmoothPixmapTransform = p->renderHints() & QPainter::SmoothPixmapTransform; p->setRenderHint(QPainter::SmoothPixmapTransform); |