diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-20 20:30:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-20 20:30:52 (GMT) |
| commit | 660ec910ef60513b511e2292255e53701dbb239b (patch) | |
| tree | e3dc228a708a90116d0420933dafac05e7ac4445 /src/gui/painting | |
| parent | d5f606f111527516bfe038a4045c8ec92f0499f7 (diff) | |
| parent | bd34833eb6d6d1a4cd848b002e44e18986376218 (diff) | |
| download | Qt-660ec910ef60513b511e2292255e53701dbb239b.zip Qt-660ec910ef60513b511e2292255e53701dbb239b.tar.gz Qt-660ec910ef60513b511e2292255e53701dbb239b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed compile warning on Windows.
Fixed painter path drawing on FBO without stencil buffer.
Fixed color of cosmetic pens when printing under Windows.
Fixed infinite loop when loading jpeg without EOI from memory.
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qprintengine_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qprintengine_win.cpp b/src/gui/painting/qprintengine_win.cpp index dd4de99..afae0a5 100644 --- a/src/gui/painting/qprintengine_win.cpp +++ b/src/gui/painting/qprintengine_win.cpp @@ -851,7 +851,7 @@ void QWin32PrintEnginePrivate::strokePath_dev(const QPainterPath &path, const QC HPEN pen = ExtCreatePen(((penWidth == 0) ? PS_COSMETIC : PS_GEOMETRIC) | PS_SOLID | capStyle | joinStyle, - penWidth, &brush, 0, 0); + (penWidth == 0) ? 1 : penWidth, &brush, 0, 0); HGDIOBJ old_pen = SelectObject(hdc, pen); StrokePath(hdc); |