From c59f33fd5d2cda3e3c9eecbdb71b9b14ec96ec1f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 3 Jan 2017 13:27:02 +0100 Subject: Bump version Change-Id: I5e2fa92dd1b58443c3bce32ba08191d31e750dd0 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index d1e1c4c..13d7a60 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.8.0 +MODULE_VERSION = 5.8.1 -- cgit v1.2.1 From 5f5b5f58a976825c883a772d19beac21aaf4dd1d Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 20 Dec 2016 07:12:56 +0100 Subject: Paint the background if one has been set via a stylesheet for the widget If there is no stylesheet set then this is a no-op, it ensures that this much of the stylesheet is still utilized when one is set. Change-Id: I6f3c15b2ddf89d8e4471acf094a48141ff06d511 Reviewed-by: Eirik Aavitsland --- src/svg/qsvgwidget.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/svg/qsvgwidget.cpp b/src/svg/qsvgwidget.cpp index 3881484..4b86306 100644 --- a/src/svg/qsvgwidget.cpp +++ b/src/svg/qsvgwidget.cpp @@ -43,6 +43,7 @@ #include "qsvgrenderer.h" +#include "qstyleoption.h" #include "qpainter.h" #include "private/qwidget_p.h" @@ -145,7 +146,10 @@ QSize QSvgWidget::sizeHint() const void QSvgWidget::paintEvent(QPaintEvent *) { Q_D(QSvgWidget); + QStyleOption opt; + opt.init(this); QPainter p(this); + style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); d->renderer->render(&p); } -- cgit v1.2.1