Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I7f11733bda960196a96c6452bdabeb7072a8430d

3 files changed, 14 insertions, 25 deletions

diff --git a/examples/widgets/widgets/icons/imagedelegate.cpp b/examples/widgets/widgets/icons/imagedelegate.cpp
index 39c2e43134..4fd251aa1b 100644
--- a/examples/widgets/widgets/icons/imagedelegate.cpp
+++ b/examples/widgets/widgets/icons/imagedelegate.cpp
@@ -55,9 +55,8 @@
 
 //! [0]
 ImageDelegate::ImageDelegate(QObject *parent)
-    : QItemDelegate(parent)
-{
-}
+    : QStyledItemDelegate(parent)
+{}
 //! [0]
 
 //! [1]
diff --git a/examples/widgets/widgets/icons/imagedelegate.h b/examples/widgets/widgets/icons/imagedelegate.h
index 3b76b78339..9d65304e2c 100644
--- a/examples/widgets/widgets/icons/imagedelegate.h
+++ b/examples/widgets/widgets/icons/imagedelegate.h
@@ -51,10 +51,10 @@
 #ifndef IMAGEDELEGATE_H
 #define IMAGEDELEGATE_H
 
-#include <QItemDelegate>
+#include <QStyledItemDelegate>
 
 //! [0]
-class ImageDelegate : public QItemDelegate
+class ImageDelegate : public QStyledItemDelegate
 {
     Q_OBJECT
 
@@ -72,7 +72,7 @@ public:
 //! [1] //! [2]
 private slots:
     void emitCommitData();
-};
 //! [2]
+};
 
 #endif
diff --git a/examples/widgets/widgets/icons/mainwindow.cpp b/examples/widgets/widgets/icons/mainwindow.cpp
index f342c18c4c..8e61260041 100644
--- a/examples/widgets/widgets/icons/mainwindow.cpp
+++ b/examples/widgets/widgets/icons/mainwindow.cpp
@@ -216,16 +216,13 @@ void MainWindow::changeIcon()
             QImage image(fileName);
             if (!image.isNull())
                 icon.addPixmap(QPixmap::fromImage(image), mode, state);
-//! [8] //! [9]
+//! [8]
         }
-//! [9] //! [10]
     }
-//! [10]
-
 //! [11]
     previewArea->setIcon(icon);
-}
 //! [11]
+}
 
 void MainWindow::addSampleImages()
 {
@@ -280,17 +277,15 @@ void MainWindow::loadImages(const QStringList &fileNames)
                .arg(QDir::toNativeSeparators(fileInfo.absolutePath()), fileInfo.fileName())
                .arg(fileInfo2x.exists() ? fileInfo2x.fileName() : tr("<None>"))
                .arg(image.width()).arg(image.height());
-//! [13] //! [14]
         QTableWidgetItem *fileItem = new QTableWidgetItem(imageName);
         fileItem->setData(Qt::UserRole, fileName);
         fileItem->setIcon(QPixmap::fromImage(image));
         fileItem->setFlags((fileItem->flags() | Qt::ItemIsUserCheckable) & ~Qt::ItemIsEditable);
         fileItem->setToolTip(toolTip);
-//! [14]
+//! [13]
 
 //! [15]
         QIcon::Mode mode = QIcon::Normal;
-//! [15] //! [16]
         QIcon::State state = QIcon::Off;
         if (guessModeStateAct->isChecked()) {
             if (imageName.contains(QLatin1String("_act"), Qt::CaseInsensitive))
@@ -302,13 +297,11 @@ void MainWindow::loadImages(const QStringList &fileNames)
 
             if (imageName.contains(QLatin1String("_on"), Qt::CaseInsensitive))
                 state = QIcon::On;
-//! [16] //! [17]
+//! [15]
         }
-//! [17]
 
 //! [18]
         imagesTable->setItem(row, 0, fileItem);
-//! [18] //! [19]
         QTableWidgetItem *modeItem =
             new QTableWidgetItem(IconPreviewArea::iconModeNames().at(IconPreviewArea::iconModes().indexOf(mode)));
         modeItem->setToolTip(toolTip);
@@ -321,9 +314,9 @@ void MainWindow::loadImages(const QStringList &fileNames)
         imagesTable->openPersistentEditor(stateItem);
 
         fileItem->setCheckState(Qt::Checked);
+//! [18]
     }
 }
-//! [19]
 
 void MainWindow::useHighDpiPixmapsChanged(int checkState)
 {
@@ -350,9 +343,7 @@ QWidget *MainWindow::createImagesGroupBox()
 //! [21]
 
 //! [22]
-    QStringList labels;
-//! [22] //! [23]
-    labels << tr("Image") << tr("Mode") << tr("State");
+    const QStringList labels({tr("Image"), tr("Mode"), tr("State")});
 
     imagesTable->horizontalHeader()->setDefaultSectionSize(90);
     imagesTable->setColumnCount(3);
@@ -361,18 +352,17 @@ QWidget *MainWindow::createImagesGroupBox()
     imagesTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);
     imagesTable->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);
     imagesTable->verticalHeader()->hide();
-//! [23]
+//! [22]
 
 //! [24]
     connect(imagesTable, &QTableWidget::itemChanged,
-//! [24] //! [25]
             this, &MainWindow::changeIcon);
 
     QVBoxLayout *layout = new QVBoxLayout(imagesGroupBox);
     layout->addWidget(imagesTable);
     return imagesGroupBox;
-}
 //! [25]
+}
 
 //! [26]
 QWidget *MainWindow::createIconSizeGroupBox()
@@ -428,8 +418,8 @@ QWidget *MainWindow::createIconSizeGroupBox()
     layout->addLayout(otherSizeLayout, 3, 0, 1, 2);
     layout->setRowStretch(4, 1);
     return iconSizeGroupBox;
-}
 //! [27]
+}
 
 void MainWindow::screenChanged()
 {