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

Take 5.

Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3

4 files changed, 8 insertions, 6 deletions

diff --git a/examples/widgets/painting/composition/main.cpp b/examples/widgets/painting/composition/main.cpp
index 2eaeaba2c5..1ffa29dddc 100644
--- a/examples/widgets/painting/composition/main.cpp
+++ b/examples/widgets/painting/composition/main.cpp
@@ -56,13 +56,13 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
+    QScopedPointer<QStyle> arthurStyle(new ArthurStyle());
     CompositionWidget compWidget(nullptr);
-    QStyle *arthurStyle = new ArthurStyle();
-    compWidget.setStyle(arthurStyle);
+    compWidget.setStyle(arthurStyle.data());
 
     const QList<QWidget *> widgets = compWidget.findChildren<QWidget *>();
     for (QWidget *w : widgets)
-        w->setStyle(arthurStyle);
+        w->setStyle(arthurStyle.data());
     compWidget.show();
 
     return app.exec();
diff --git a/examples/widgets/painting/gradients/gradients.cpp b/examples/widgets/painting/gradients/gradients.cpp
index 8df45be8d9..a4528ce06f 100644
--- a/examples/widgets/painting/gradients/gradients.cpp
+++ b/examples/widgets/painting/gradients/gradients.cpp
@@ -72,7 +72,7 @@ ShadeWidget::ShadeWidget(ShadeType type, QWidget *parent)
         setPalette(pal);
 
     } else {
-        setAttribute(Qt::WA_NoBackground);
+        setAttribute(Qt::WA_OpaquePaintEvent);
     }
 
     QPolygonF points;
diff --git a/examples/widgets/painting/pathstroke/pathstroke.cpp b/examples/widgets/painting/pathstroke/pathstroke.cpp
index 03e55bb2a2..e4009f0b1a 100644
--- a/examples/widgets/painting/pathstroke/pathstroke.cpp
+++ b/examples/widgets/painting/pathstroke/pathstroke.cpp
@@ -611,7 +611,8 @@ bool PathStrokeRenderer::event(QEvent *e)
             case Qt::TouchPointPressed:
             {
                 // find the point, move it
-                QSet<int> activePoints = QSet<int>::fromList(m_fingerPointMapping.values());
+                const auto mappedPoints = m_fingerPointMapping.values();
+                QSet<int> activePoints = QSet<int>(mappedPoints.begin(), mappedPoints.end());
                 int activePoint = -1;
                 qreal distance = -1;
                 const int pointsCount = m_points.size();
diff --git a/examples/widgets/painting/shared/hoverpoints.cpp b/examples/widgets/painting/shared/hoverpoints.cpp
index 74c78088ad..2032fb5a2c 100644
--- a/examples/widgets/painting/shared/hoverpoints.cpp
+++ b/examples/widgets/painting/shared/hoverpoints.cpp
@@ -180,7 +180,8 @@ bool HoverPoints::eventFilter(QObject *object, QEvent *event)
                     case Qt::TouchPointPressed:
                         {
                             // find the point, move it
-                            QSet<int> activePoints = QSet<int>::fromList(m_fingerPointMapping.values());
+                            const auto mappedPoints = m_fingerPointMapping.values();
+                            QSet<int> activePoints = QSet<int>(mappedPoints.begin(), mappedPoints.end());
                             int activePoint = -1;
                             qreal distance = -1;
                             const int pointsCount = m_points.size();