diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 13:00:36 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 13:00:36 +0100 |
| commit | 2eb26c170920d28213b71e549d5dac4663febb14 (patch) | |
| tree | 8df5223ac114d758c2112a8fc787992175556418 /src/gui/painting | |
| parent | 49ddae28e0dcd1c59dd5d742cffedd5290d1224a (diff) | |
| parent | 81998b4e8e440076bd22a9164f0a93481c0e597a (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/gui/text/qfontdatabase.cpp
Change-Id: I6ac1f55faa22b8e7b591386fb67f0333d0ea443d
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qpdf.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index 23412c4633..30421ea2fa 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -1347,6 +1347,8 @@ void QPdfEngine::setPen() int pdfJoinStyle = 0; switch(d->pen.joinStyle()) { case Qt::MiterJoin: + case Qt::SvgMiterJoin: + *d->currentPage << d->pen.miterLimit() << "M "; pdfJoinStyle = 0; break; case Qt::BevelJoin: @@ -2081,8 +2083,10 @@ int QPdfEnginePrivate::writeImage(const QByteArray &data, int width, int height, } if (maskObject > 0) xprintf("/Mask %d 0 R\n", maskObject); - if (softMaskObject > 0) + if (softMaskObject > 0) { xprintf("/SMask %d 0 R\n", softMaskObject); + xprintf("/Decode [1 0 1 0 1 0]\n"); + } int lenobj = requestObject(); xprintf("/Length %d 0 R\n", lenobj); |