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

Change-Id: Ide5b3408bfefca410323cf26b810b44c06d3a227

1 files changed, 4 insertions, 2 deletions

diff --git a/examples/widgets/widgets/icons/mainwindow.cpp b/examples/widgets/widgets/icons/mainwindow.cpp
index 0cf11c978d..91e98ff896 100644
--- a/examples/widgets/widgets/icons/mainwindow.cpp
+++ b/examples/widgets/widgets/icons/mainwindow.cpp
@@ -55,6 +55,8 @@
 #include "imagedelegate.h"
 #include "mainwindow.h"
 
+#include <memory>
+
 //! [40]
 enum { OtherSize = QStyle::PM_CustomBase };
 //! [40]
@@ -514,8 +516,8 @@ void MainWindow::checkCurrentStyle()
     const QList<QAction *> actions = styleActionGroup->actions();
     for (QAction *action : actions) {
         const QString styleName = action->data().toString();
-        QScopedPointer<QStyle> candidate(QStyleFactory::create(styleName));
-        Q_ASSERT(!candidate.isNull());
+        const std::unique_ptr<QStyle> candidate{QStyleFactory::create(styleName)};
+        Q_ASSERT(candidate);
         if (candidate->metaObject()->className()
                 == QApplication::style()->metaObject()->className()) {
             action->trigger();