diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-05 06:32:32 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-05 06:32:32 (GMT) |
| commit | 7697cc8f15bb492bebd652aa9b86e8f0b3337abd (patch) | |
| tree | 0e59d9d3e076d2a815c3fdbcd8b2c6929f3092c4 /src/gui | |
| parent | 06568ff89c48dee8aab278b8b0538c331aa84595 (diff) | |
| parent | 84b5bbc77045cdc267626ff86f309664283abed4 (diff) | |
| download | Qt-7697cc8f15bb492bebd652aa9b86e8f0b3337abd.zip Qt-7697cc8f15bb492bebd652aa9b86e8f0b3337abd.tar.gz Qt-7697cc8f15bb492bebd652aa9b86e8f0b3337abd.tar.bz2 | |
Merge branch 'master' into lighthouse-master
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 2 | ||||
| -rw-r--r-- | src/gui/painting/qpdf.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 059140e..3c5c458 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -4224,6 +4224,7 @@ void QWidgetPrivate::setWSGeometry(bool dontShow, const QRect &oldRect) } } +#ifndef QT_MAC_USE_COCOA const QRect validRange(-XCOORD_MAX,-XCOORD_MAX, 2*XCOORD_MAX, 2*XCOORD_MAX); if (!validRange.contains(xrect)) { // we are too big, and must clip @@ -4242,6 +4243,7 @@ void QWidgetPrivate::setWSGeometry(bool dontShow, const QRect &oldRect) wrect = xrect; wrect.translate(-data.crect.topLeft()); // translate wrect in my Qt coordinates } +#endif //QT_MAC_USE_COCOA } // unmap if we are outside the valid window system coord system diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index f5f7c3c..29e6a88 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -1156,6 +1156,8 @@ void QPdfBaseEngine::updateState(const QPaintEngineState &state) } if (flags & DirtyBrush) { d->brush = state.brush(); + if (d->brush.color().alpha() == 0 && d->brush.style() == Qt::SolidPattern) + d->brush.setStyle(Qt::NoBrush); d->hasBrush = d->brush.style() != Qt::NoBrush; } if (flags & DirtyBrushOrigin) { |