diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 12:48:57 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 12:48:57 +0100 |
commit | 91ce1b76586e9114941bb1cbd6820132ee2f893e (patch) | |
tree | 52ac4652a9003113abd344d78ac62652bf7718c7 /src/svg/qsvggraphics.cpp | |
parent | 392359c5413e2a824699625ee9174bb1a6eb8a71 (diff) | |
parent | aaa06d6c82e02961f92690b10c84a0030dc0ebb7 (diff) | |
download | qtsvg-91ce1b76586e9114941bb1cbd6820132ee2f893e.tar.gz |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I1ed84131c65cb9f047a0f393ebd845282daad499
Diffstat (limited to 'src/svg/qsvggraphics.cpp')
-rw-r--r-- | src/svg/qsvggraphics.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/svg/qsvggraphics.cpp b/src/svg/qsvggraphics.cpp index 05ce744..712d770 100644 --- a/src/svg/qsvggraphics.cpp +++ b/src/svg/qsvggraphics.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE p->setOpacity(oldOpacity * states.fillOpacity); \ command; \ p->setPen(oldPen); \ - if (oldPen.widthF() != 0) { \ + if (oldPen != Qt::NoPen && oldPen.brush() != Qt::NoBrush && oldPen.widthF() != 0) { \ p->setOpacity(oldOpacity * states.strokeOpacity); \ p->setBrush(Qt::NoBrush); \ command; \ |