Merge remote-tracking branch 'origin/dev' into wip/cmake

Take 5.

Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3

2 files changed, 4 insertions, 4 deletions

diff --git a/examples/widgets/tools/plugandpaint/app/interfaces.h b/examples/widgets/tools/plugandpaint/app/interfaces.h
index a1e91e13ff..705e578809 100644
--- a/examples/widgets/tools/plugandpaint/app/interfaces.h
+++ b/examples/widgets/tools/plugandpaint/app/interfaces.h
@@ -68,7 +68,7 @@ QT_END_NAMESPACE
 class BrushInterface
 {
 public:
-    virtual ~BrushInterface() {}
+    virtual ~BrushInterface() = default;
 
     virtual QStringList brushes() const = 0;
     virtual QRect mousePress(const QString &brush, QPainter &painter,
@@ -84,7 +84,7 @@ public:
 class ShapeInterface
 {
 public:
-    virtual ~ShapeInterface() {}
+    virtual ~ShapeInterface() = default;
 
     virtual QStringList shapes() const = 0;
     virtual QPainterPath generateShape(const QString &shape,
@@ -96,7 +96,7 @@ public:
 class FilterInterface
 {
 public:
-    virtual ~FilterInterface() {}
+    virtual ~FilterInterface() = default;
 
     virtual QStringList filters() const = 0;
     virtual QImage filterImage(const QString &filter, const QImage &image,
diff --git a/examples/widgets/tools/plugandpaint/app/paintarea.cpp b/examples/widgets/tools/plugandpaint/app/paintarea.cpp
index 4295e04cc0..e225d78398 100644
--- a/examples/widgets/tools/plugandpaint/app/paintarea.cpp
+++ b/examples/widgets/tools/plugandpaint/app/paintarea.cpp
@@ -59,7 +59,7 @@ PaintArea::PaintArea(QWidget *parent) :
     QWidget(parent)
 {
     setAttribute(Qt::WA_StaticContents);
-    setAttribute(Qt::WA_NoBackground);
+    setAttribute(Qt::WA_OpaquePaintEvent);
 
     theImage.fill(qRgb(255, 255, 255));
 }