diff options
| author | Pulse Build System <qt-info@nokia.com> | 2010-01-22 00:53:04 (GMT) |
|---|---|---|
| committer | Pulse Build System <qt-info@nokia.com> | 2010-01-22 00:53:04 (GMT) |
| commit | 0e12da85f8f8ee8b5ddb32e518a25ef168cea9e7 (patch) | |
| tree | cdc404155a92000c1a0b6ebe1fbda74b22457ec0 /src/gui/styles | |
| parent | 8e65adce9ced8f3b1d42b938e4d65e1af4768c33 (diff) | |
| parent | 5c8c51284b1119f90520b6dbad0ac23fe0487bcf (diff) | |
| download | Qt-0e12da85f8f8ee8b5ddb32e518a25ef168cea9e7.zip Qt-0e12da85f8f8ee8b5ddb32e518a25ef168cea9e7.tar.gz Qt-0e12da85f8f8ee8b5ddb32e518a25ef168cea9e7.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2:
build fix for mingw
Build fix for MSVC2005 and older SDK
QStyleSheetStyle: Fixed some text croped when having padding with native border.
Remove obsolete code for unsupported platforms
Character spacing when drawing a QPicture to a high DPI device.
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qstylesheetstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index dab93a2..9002172 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -1065,7 +1065,7 @@ QRect QRenderRule::boxRect(const QRect& cr, int flags) const r.adjust(-p[LeftEdge], -p[TopEdge], p[RightEdge], p[BottomEdge]); } } - if (!hasNativeBorder() && (flags & Border)) { + if (hasBorder() && (flags & Border)) { const int *b = border()->borders; r.adjust(-b[LeftEdge], -b[TopEdge], b[RightEdge], b[BottomEdge]); } |