diff options
| author | Pulse Build System <qt-info@nokia.com> | 2010-01-22 12:03:07 (GMT) |
|---|---|---|
| committer | Pulse Build System <qt-info@nokia.com> | 2010-01-22 12:03:07 (GMT) |
| commit | d9532fb7185951ad34e2b11f008cc3ad0a62d5a4 (patch) | |
| tree | 8f8a9e8facbb95ff299d2f28cc649757a14e10d8 /src/gui/styles/qstylesheetstyle.cpp | |
| parent | 178f722835ec0995fe211046579c50893659cc8e (diff) | |
| parent | 1a13a3c48ddbe3998edda778df53f4b1e838536f (diff) | |
| download | Qt-d9532fb7185951ad34e2b11f008cc3ad0a62d5a4.zip Qt-d9532fb7185951ad34e2b11f008cc3ad0a62d5a4.tar.gz Qt-d9532fb7185951ad34e2b11f008cc3ad0a62d5a4.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/qstylesheetstyle.cpp')
| -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]); } |