diff options
| author | Pulse Build System <qt-info@nokia.com> | 2010-01-25 13:44:33 (GMT) |
|---|---|---|
| committer | Pulse Build System <qt-info@nokia.com> | 2010-01-25 13:44:33 (GMT) |
| commit | 5bd05fbe1210a0d806f70a7570ae884c98ee1493 (patch) | |
| tree | a4836f6edfd9ecdfc4d563f730234da31d6d1f91 /src/gui/styles | |
| parent | ede20ecdb0ddef7ef239900eb3bfa92ca859e010 (diff) | |
| parent | 4afcd2d490d35d78708f1a3e5e0b9691ac788a8b (diff) | |
| download | Qt-5bd05fbe1210a0d806f70a7570ae884c98ee1493.zip Qt-5bd05fbe1210a0d806f70a7570ae884c98ee1493.tar.gz Qt-5bd05fbe1210a0d806f70a7570ae884c98ee1493.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:
Fixed compile for wincewm60standard-msvc2008 (attempt 2)
Fixed compile for wincewm60standard-msvc2008.
Fixed compile.
Fixed compile for wincewm60standard-msvc2008.
Fixed compile when Qt is configured with -no-webkit
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]); } |