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

Change-Id: I129dd579f92cb2592a38ca043472b45cb926ae12

3 files changed, 8 insertions, 7 deletions

diff --git a/examples/widgets/itemviews/frozencolumn/main.cpp b/examples/widgets/itemviews/frozencolumn/main.cpp
index 6f2b4a8d71..2965617ba1 100644
--- a/examples/widgets/itemviews/frozencolumn/main.cpp
+++ b/examples/widgets/itemviews/frozencolumn/main.cpp
@@ -71,7 +71,7 @@ int main(int argc, char* argv[])
         model->setHorizontalHeaderLabels(list);
 
         int row = 0;
-        QStandardItem *newItem = 0;
+        QStandardItem *newItem = nullptr;
         while (!stream.atEnd()) {
             line = stream.readLine();
             if (!line.startsWith('#') && line.contains(',')) {
diff --git a/examples/widgets/itemviews/interview/model.cpp b/examples/widgets/itemviews/interview/model.cpp
index feaf8bb98c..519164999d 100644
--- a/examples/widgets/itemviews/interview/model.cpp
+++ b/examples/widgets/itemviews/interview/model.cpp
@@ -132,7 +132,7 @@ bool Model::hasChildren(const QModelIndex &parent) const
 Qt::ItemFlags Model::flags(const QModelIndex &index) const
 {
     if (!index.isValid())
-        return 0;
+        return {};
     return Qt::ItemIsDragEnabled|QAbstractItemModel::flags(index);
 }
 
@@ -146,7 +146,7 @@ Model::Node *Model::node(int row, Node *parent) const
 
 Model::Node *Model::parent(Node *child) const
 {
-    return child ? child->parent : 0;
+    return child ? child->parent : nullptr;
 }
 
 int Model::row(Node *node) const
diff --git a/examples/widgets/itemviews/stardelegate/main.cpp b/examples/widgets/itemviews/stardelegate/main.cpp
index 452976bba0..5ca85a6151 100644
--- a/examples/widgets/itemviews/stardelegate/main.cpp
+++ b/examples/widgets/itemviews/stardelegate/main.cpp
@@ -48,7 +48,8 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QApplication>
+#include <QTableWidget>
 
 #include "stardelegate.h"
 #include "stareditor.h"
@@ -57,7 +58,7 @@
 //! [0]
 void populateTableWidget(QTableWidget *tableWidget)
 {
-    static const struct {
+    static constexpr struct {
         const char *title;
         const char *genre;
         const char *artist;
@@ -70,12 +71,12 @@ void populateTableWidget(QTableWidget *tableWidget)
         { "Sex Bomb", "Pop", "Tom Jones", 3 },
         { "Barbie Girl", "Pop", "Aqua", 5 },
 //! [2]
-        { 0, 0, 0, 0 }
+        { nullptr, nullptr, nullptr, 0 }
 //! [2] //! [3]
     };
 //! [3] //! [4]
 
-    for (int row = 0; staticData[row].title != 0; ++row) {
+    for (int row = 0; staticData[row].title != nullptr; ++row) {
         QTableWidgetItem *item0 = new QTableWidgetItem(staticData[row].title);
         QTableWidgetItem *item1 = new QTableWidgetItem(staticData[row].genre);
         QTableWidgetItem *item2 = new QTableWidgetItem(staticData[row].artist);