diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-12 07:31:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-12 08:33:08 +0200 |
| commit | 990969655c5fb4d03682e96df9b12101f5ee9815 (patch) | |
| tree | b8fb5c50285105c8bc5a938fb50f93ff9f24889d /src/gui/painting/qpdf.cpp | |
| parent | a213011a53f12f101d08a04afc8fdacd2d54a232 (diff) | |
| parent | e64b2234e829cc47872225debcf80d6c06db18f0 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
config_help.txt
configure
src/corelib/io/qprocess_wince.cpp
src/plugins/platforms/windows/qwindowstheme.cpp
src/plugins/platforms/xcb/qxcbbackingstore.cpp
tests/auto/corelib/tools/qtimezone/BLACKLIST
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Change-Id: I26644d1cb3b78412c8ff285e2a55bea1bd641c01
Diffstat (limited to 'src/gui/painting/qpdf.cpp')
| -rw-r--r-- | src/gui/painting/qpdf.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index 02f9be197f..b014305796 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -1201,7 +1201,7 @@ void QPdfEngine::setPen() switch(d->pen.joinStyle()) { case Qt::MiterJoin: case Qt::SvgMiterJoin: - *d->currentPage << d->pen.miterLimit() << "M "; + *d->currentPage << qMax(qreal(1.0), d->pen.miterLimit()) << "M "; pdfJoinStyle = 0; break; case Qt::BevelJoin: @@ -2214,8 +2214,10 @@ int QPdfEnginePrivate::generateGradientShader(const QGradient *gradient, const Q case QGradient::RadialGradient: return generateRadialGradientShader(static_cast<const QRadialGradient *>(gradient), matrix, alpha); case QGradient::ConicalGradient: - default: - qWarning("Implement me!"); + Q_UNIMPLEMENTED(); // ### Implement me! + break; + case QGradient::NoGradient: + break; } return 0; } |