Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"

9 files changed, 29 insertions, 24 deletions

diff --git a/examples/widgets/dialogs/standarddialogs/dialog.cpp b/examples/widgets/dialogs/standarddialogs/dialog.cpp
index 1830b21e8f..c91a594490 100644
--- a/examples/widgets/dialogs/standarddialogs/dialog.cpp
+++ b/examples/widgets/dialogs/standarddialogs/dialog.cpp
@@ -287,7 +287,6 @@ Dialog::Dialog(QWidget *parent)
     fileDialogOptionsWidget->addCheckBox(tr("Show directories only"), QFileDialog::ShowDirsOnly);
     fileDialogOptionsWidget->addCheckBox(tr("Do not resolve symlinks"), QFileDialog::DontResolveSymlinks);
     fileDialogOptionsWidget->addCheckBox(tr("Do not confirm overwrite"), QFileDialog::DontConfirmOverwrite);
-    fileDialogOptionsWidget->addCheckBox(tr("Do not use sheet"), QFileDialog::DontUseSheet);
     fileDialogOptionsWidget->addCheckBox(tr("Readonly"), QFileDialog::ReadOnly);
     fileDialogOptionsWidget->addCheckBox(tr("Hide name filter details"), QFileDialog::HideNameFilterDetails);
     fileDialogOptionsWidget->addCheckBox(tr("Do not use custom directory icons (Windows)"), QFileDialog::DontUseCustomDirectoryIcons);
diff --git a/examples/widgets/doc/src/icons.qdoc b/examples/widgets/doc/src/icons.qdoc
index 60cb9062c2..7aae0491d6 100644
--- a/examples/widgets/doc/src/icons.qdoc
+++ b/examples/widgets/doc/src/icons.qdoc
@@ -262,12 +262,7 @@
     provides arrays allowing to map from enumeration value to row/column
     (by using QVector::indexOf()) and back by using the array index and lists
     of the matching strings. Qt's containers can be easily populated by
-    using C++ 11 initializer lists. If the compiler does not provide that feature,
-    a pattern like
-
-    \snippet widgets/icons/iconpreviewarea.cpp 43
-
-    can be used.
+    using C++ 11 initializer lists.
 
     We need two public functions to set the current icon and the
     icon's size. In addition the class has three private functions: We
diff --git a/examples/widgets/painting/composition/composition.cpp b/examples/widgets/painting/composition/composition.cpp
index 9bd71735a0..a220fb42fa 100644
--- a/examples/widgets/painting/composition/composition.cpp
+++ b/examples/widgets/painting/composition/composition.cpp
@@ -224,6 +224,10 @@ CompositionWidget::CompositionWidget(QWidget *parent)
     setWindowTitle(tr("Composition Modes"));
 }
 
+CompositionWidget::~CompositionWidget()
+{
+}
+
 
 void CompositionWidget::nextMode()
 {
@@ -265,6 +269,10 @@ CompositionRenderer::CompositionRenderer(QWidget *parent)
 #endif
 }
 
+CompositionRenderer::~CompositionRenderer()
+{
+}
+
 QRectF rectangle_around(const QPointF &p, const QSizeF &size = QSize(250, 200))
 {
     QRectF rect(p, size);
@@ -371,7 +379,7 @@ void CompositionRenderer::paint(QPainter *painter)
 
         if (size() != m_previous_size) {
             m_previous_size = size();
-            QPainter p(m_fbo.data());
+            QPainter p(m_fbo.get());
             p.setCompositionMode(QPainter::CompositionMode_Source);
             p.fillRect(QRect(QPoint(0, 0), size()), Qt::transparent);
             p.setCompositionMode(QPainter::CompositionMode_SourceOver);
@@ -382,7 +390,7 @@ void CompositionRenderer::paint(QPainter *painter)
 
         painter->beginNativePainting();
         {
-            QPainter p(m_fbo.data());
+            QPainter p(m_fbo.get());
             p.beginNativePainting();
             m_blitter.bind();
             const QRect targetRect(QPoint(0, 0), m_fbo->size());
diff --git a/examples/widgets/painting/composition/composition.h b/examples/widgets/painting/composition/composition.h
index 19150e2024..52ca7919b0 100644
--- a/examples/widgets/painting/composition/composition.h
+++ b/examples/widgets/painting/composition/composition.h
@@ -61,6 +61,8 @@
 #include <QPainter>
 #include <QEvent>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 class QPushButton;
 class QRadioButton;
@@ -71,7 +73,8 @@ class CompositionWidget : public QWidget
     Q_OBJECT
 
 public:
-    CompositionWidget(QWidget *parent);
+    explicit CompositionWidget(QWidget *parent = nullptr);
+    ~CompositionWidget();
 
 public slots:
 void nextMode();
@@ -117,7 +120,8 @@ class CompositionRenderer : public ArthurFrame
     Q_PROPERTY(bool animation READ animationEnabled WRITE setAnimationEnabled)
 
 public:
-    CompositionRenderer(QWidget *parent);
+    explicit CompositionRenderer(QWidget *parent = nullptr);
+    ~CompositionRenderer();
 
     void paint(QPainter *) override;
 
@@ -188,7 +192,7 @@ private:
     int m_animationTimer;
 
 #if QT_CONFIG(opengl)
-    QScopedPointer<QFboPaintDevice> m_fbo;
+    std::unique_ptr<QFboPaintDevice> m_fbo;
     int m_pbuffer_size; // width==height==size of pbuffer
     uint m_base_tex;
     uint m_compositing_tex;
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/tools/i18n/languagechooser.cpp b/examples/widgets/tools/i18n/languagechooser.cpp
index f07d0ddee3..963165ff81 100644
--- a/examples/widgets/tools/i18n/languagechooser.cpp
+++ b/examples/widgets/tools/i18n/languagechooser.cpp
@@ -163,11 +163,8 @@ QStringList LanguageChooser::findQmFiles()
     QDir dir(":/translations");
     QStringList fileNames = dir.entryList(QStringList("*.qm"), QDir::Files,
                                           QDir::Name);
-    QMutableStringListIterator i(fileNames);
-    while (i.hasNext()) {
-        i.next();
-        i.setValue(dir.filePath(i.value()));
-    }
+    for (QString &fileName : fileNames)
+        fileName = dir.filePath(fileName);
     return fileNames;
 }
 
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));
 }
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();