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

 Conflicts:
	src/plugins/platforms/windows/qwindowsmousehandler.cpp
	src/plugins/platforms/xcb/qxcbimage.cpp
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/manual/qtabletevent/regular_widgets/main.cpp

Done-with: Friedemann Kleint<Friedemann.Kleint@qt.io>
Done-with: Mårten Nordheim<marten.nordheim@qt.io>
Change-Id: I5b2499513a92c590ed0756f7d2e93c35a64b7f30

24 files changed, 211 insertions, 183 deletions

diff --git a/examples/widgets/doc/src/addressbook.qdoc b/examples/widgets/doc/src/addressbook.qdoc
index b9bcae21aa..1fa0bfa9d4 100644
--- a/examples/widgets/doc/src/addressbook.qdoc
+++ b/examples/widgets/doc/src/addressbook.qdoc
@@ -60,8 +60,8 @@
     the address book.
 
     \c TableModel is a subclass of QAbstractTableModel that provides
-    the standard model/view API to access data. It also holds a
-    QList of \l{QPair}s corresponding to the contacts added.
+    the standard model/view API to access data. It holds a list of
+    added contacts.
     However, this data is not all visible in a single tab. Instead,
     QTableView is used to provide 9 different views of the same
     data, according to the alphabet groups.
@@ -80,7 +80,7 @@
     \section1 TableModel Class Definition
 
     The \c TableModel class provides standard API to access data in
-    its QList of \l{QPair}s by subclassing QAbstractTableModel. The
+    its list of contacts by subclassing QAbstractTableModel. The
     basic functions that must be implemented in order to do so are:
     \c rowCount(), \c columnCount(), \c data(), \c headerData().
     For TableModel to be editable, it has to provide implementations
@@ -90,15 +90,14 @@
     \snippet itemviews/addressbook/tablemodel.h 0
 
     Two constructors are used, a default constructor which uses
-    \c TableModel's own \c {QList<QPair<QString, QString>>} and one
-    that takes \c {QList<QPair<QString, QString>} as an argument,
-    for convenience.
+    \c TableModel's own \c {QList<Contact>} and one that takes
+    \c {QList<Contact>} as an argument, for convenience.
 
 
     \section1 TableModel Class Implementation
 
     We implement the two constructors as defined in the header file.
-    The second constructor initializes the list of pairs in the
+    The second constructor initializes the list of contacts in the
     model, with the parameter value.
 
     \snippet itemviews/addressbook/tablemodel.cpp 0
@@ -117,7 +116,7 @@
     The \c data() function returns either a \b Name or
     \b {Address}, based on the contents of the model index
     supplied. The row number stored in the model index is used to
-    reference an item in the list of pairs. Selection is handled
+    reference an item in the list of contacts. Selection is handled
     by the QItemSelectionModel, which will be explained with
     \c AddressWidget.
 
@@ -164,12 +163,11 @@
     use the editing features of the QTableView object, we enable
     them here so that we can reuse the model in other programs.
 
-    The last function in \c {TableModel}, \c getList() returns the
-    QList<QPair<QString, QString>> object that holds all the
-    contacts in the address book. We use this function later to
-    obtain the list of contacts to check for existing entries, write
-    the contacts to a file and read them back. Further explanation is
-    given with \c AddressWidget.
+    The last function in \c {TableModel}, \c getContacts() returns the
+    QList<Contact> object that holds all the contacts in the address
+    book. We use this function later to obtain the list of contacts to
+    check for existing entries, write the contacts to a file and read
+    them back. Further explanation is given with \c AddressWidget.
 
     \snippet itemviews/addressbook/tablemodel.cpp 8
 
@@ -222,11 +220,12 @@
     The QItemSelectionModel class provides a
     \l{QItemSelectionModel::selectionChanged()}{selectionChanged}
     signal that is connected to \c{AddressWidget}'s
-    \c selectionChanged() signal. This signal to signal connection
-    is necessary to enable the \uicontrol{Edit Entry...} and
-    \uicontrol{Remove Entry} actions in \c MainWindow's Tools menu. This
-    connection is further explained in \c MainWindow's
-    implementation.
+    \c selectionChanged() signal. We also connect
+    QTabWidget::currentChanged() signal to the lambda expression which
+    emits \c{AddressWidget}'s \c selectionChanged() as well. These
+    connections are necessary to enable the \uicontrol{Edit Entry...} and
+    \uicontrol{Remove Entry} actions in \c MainWindow's Tools menu.
+    It is further explained in \c MainWindow's implementation.
 
     Each table view in the address book is added as a tab to the
     QTabWidget with the relevant label, obtained from the QStringList
@@ -250,7 +249,7 @@
     Basic validation is done in the second \c addEntry() function to
     prevent duplicate entries in the address book. As mentioned with
     \c TableModel, this is part of the reason why we require the
-    getter method \c getList().
+    getter method \c getContacts().
 
     \snippet itemviews/addressbook/addresswidget.cpp 3
 
@@ -292,7 +291,7 @@
 
     The \c writeToFile() function is used to save a file containing
     all the contacts in the address book. The file is saved in a
-    custom \c{.dat} format. The contents of the QList of \l{QPair}s
+    custom \c{.dat} format. The contents of the list of contacts
     are written to \c file using QDataStream. If the file cannot be
     opened, a QMessageBox is displayed with the related error message.
 
@@ -301,7 +300,7 @@
     The \c readFromFile() function loads a file containing all the
     contacts in the address book, previously saved using
     \c writeToFile(). QDataStream is used to read the contents of a
-    \c{.dat} file into a list of pairs and each of these is added
+    \c{.dat} file into a list of contacts and each of these is added
     using \c addEntry().
 
     \snippet itemviews/addressbook/addresswidget.cpp 7
diff --git a/examples/widgets/draganddrop/draggableicons/dragwidget.h b/examples/widgets/draganddrop/draggableicons/dragwidget.h
index 18be074b61..98e623a5e3 100644
--- a/examples/widgets/draganddrop/draggableicons/dragwidget.h
+++ b/examples/widgets/draganddrop/draggableicons/dragwidget.h
@@ -62,7 +62,7 @@ QT_END_NAMESPACE
 class DragWidget : public QFrame
 {
 public:
-    DragWidget(QWidget *parent = 0);
+    explicit DragWidget(QWidget *parent = nullptr);
 
 protected:
     void dragEnterEvent(QDragEnterEvent *event) override;
diff --git a/examples/widgets/draganddrop/draggabletext/dragwidget.cpp b/examples/widgets/draganddrop/draggabletext/dragwidget.cpp
index fb169b953b..2135ba2ef9 100644
--- a/examples/widgets/draganddrop/draggabletext/dragwidget.cpp
+++ b/examples/widgets/draganddrop/draggabletext/dragwidget.cpp
@@ -123,7 +123,7 @@ void DragWidget::dropEvent(QDropEvent *event)
             hotSpot.setY(hotSpotPos.last().toInt());
         }
 
-        foreach (const QString &piece, pieces) {
+        for (const QString &piece : pieces) {
             QLabel *newLabel = createDragLabel(piece, this);
             newLabel->move(position - hotSpot);
             newLabel->show();
@@ -141,7 +141,7 @@ void DragWidget::dropEvent(QDropEvent *event)
     } else {
         event->ignore();
     }
-    foreach (QWidget *widget, findChildren<QWidget *>()) {
+    for (QWidget *widget : findChildren<QWidget *>()) {
         if (!widget->isVisible())
             widget->deleteLater();
     }
diff --git a/examples/widgets/draganddrop/draggabletext/dragwidget.h b/examples/widgets/draganddrop/draggabletext/dragwidget.h
index 24d1f6f5c7..38abb0ceb8 100644
--- a/examples/widgets/draganddrop/draggabletext/dragwidget.h
+++ b/examples/widgets/draganddrop/draggabletext/dragwidget.h
@@ -61,7 +61,7 @@ QT_END_NAMESPACE
 class DragWidget : public QWidget
 {
 public:
-    DragWidget(QWidget *parent = 0);
+    explicit DragWidget(QWidget *parent = nullptr);
 
 protected:
     void dragEnterEvent(QDragEnterEvent *event) override;
diff --git a/examples/widgets/draganddrop/dropsite/droparea.h b/examples/widgets/draganddrop/dropsite/droparea.h
index 5b6e209dfa..ab1de8ea44 100644
--- a/examples/widgets/draganddrop/dropsite/droparea.h
+++ b/examples/widgets/draganddrop/dropsite/droparea.h
@@ -63,13 +63,13 @@ class DropArea : public QLabel
     Q_OBJECT
 
 public:
-    DropArea(QWidget *parent = 0);
+    explicit DropArea(QWidget *parent = nullptr);
 
 public slots:
     void clear();
 
 signals:
-    void changed(const QMimeData *mimeData = 0);
+    void changed(const QMimeData *mimeData = nullptr);
 //! [DropArea header part1]
 
 //! [DropArea header part2]
diff --git a/examples/widgets/draganddrop/dropsite/dropsitewindow.cpp b/examples/widgets/draganddrop/dropsite/dropsitewindow.cpp
index dc865ac171..28a42ee614 100644
--- a/examples/widgets/draganddrop/dropsite/dropsitewindow.cpp
+++ b/examples/widgets/draganddrop/dropsite/dropsitewindow.cpp
@@ -88,8 +88,8 @@ DropSiteWindow::DropSiteWindow()
     buttonBox->addButton(clearButton, QDialogButtonBox::ActionRole);
     buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole);
 
-    connect(quitButton, &QAbstractButton::pressed, this, &QWidget::close);
-    connect(clearButton, &QAbstractButton::pressed, dropArea, &DropArea::clear);
+    connect(quitButton, &QAbstractButton::clicked, this, &QWidget::close);
+    connect(clearButton, &QAbstractButton::clicked, dropArea, &DropArea::clear);
 //! [constructor part4]
 
 //! [constructor part5]
@@ -113,7 +113,7 @@ void DropSiteWindow::updateFormatsTable(const QMimeData *mimeData)
 //! [updateFormatsTable() part1]
 
 //! [updateFormatsTable() part2]
-    foreach (QString format, mimeData->formats()) {
+    for (const QString &format : mimeData->formats()) {
         QTableWidgetItem *formatItem = new QTableWidgetItem(format);
         formatItem->setFlags(Qt::ItemIsEnabled);
         formatItem->setTextAlignment(Qt::AlignTop | Qt::AlignLeft);
diff --git a/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp b/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp
index b185b2900d..451b53f623 100644
--- a/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp
+++ b/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp
@@ -167,7 +167,7 @@ void DragWidget::dropEvent(QDropEvent *event)
                              QString::SkipEmptyParts);
         QPoint position = event->pos();
 
-        foreach (const QString &piece, pieces) {
+        for (const QString &piece : pieces) {
             DragLabel *newLabel = new DragLabel(piece, this);
             newLabel->move(position);
             newLabel->show();
diff --git a/examples/widgets/draganddrop/fridgemagnets/dragwidget.h b/examples/widgets/draganddrop/fridgemagnets/dragwidget.h
index 104e500134..ff513a33d8 100644
--- a/examples/widgets/draganddrop/fridgemagnets/dragwidget.h
+++ b/examples/widgets/draganddrop/fridgemagnets/dragwidget.h
@@ -62,7 +62,7 @@ QT_END_NAMESPACE
 class DragWidget : public QWidget
 {
 public:
-    DragWidget(QWidget *parent = 0);
+    explicit DragWidget(QWidget *parent = nullptr);
 
 protected:
     void dragEnterEvent(QDragEnterEvent *event) override;
diff --git a/examples/widgets/draganddrop/puzzle/main.cpp b/examples/widgets/draganddrop/puzzle/main.cpp
index 0bf65a89c5..d013bf078d 100644
--- a/examples/widgets/draganddrop/puzzle/main.cpp
+++ b/examples/widgets/draganddrop/puzzle/main.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
-
 #include "mainwindow.h"
 
+#include <QApplication>
+
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(puzzle);
diff --git a/examples/widgets/draganddrop/puzzle/mainwindow.cpp b/examples/widgets/draganddrop/puzzle/mainwindow.cpp
index 806133583a..1914519c68 100644
--- a/examples/widgets/draganddrop/puzzle/mainwindow.cpp
+++ b/examples/widgets/draganddrop/puzzle/mainwindow.cpp
@@ -67,12 +67,19 @@ MainWindow::MainWindow(QWidget *parent)
 
 void MainWindow::openImage()
 {
-    const QString fileName =
-        QFileDialog::getOpenFileName(this, tr("Open Image"), QString(),
-                                     tr("Image Files (*.png *.jpg *.bmp)"));
-
-    if (!fileName.isEmpty())
-        loadImage(fileName);
+    const QString directory =
+        QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).value(0, QDir::homePath());
+    QFileDialog dialog(this, tr("Open Image"), directory);
+    dialog.setAcceptMode(QFileDialog::AcceptOpen);
+    dialog.setFileMode(QFileDialog::ExistingFile);
+    QStringList mimeTypeFilters;
+    for (const QByteArray &mimeTypeName : QImageReader::supportedMimeTypes())
+        mimeTypeFilters.append(mimeTypeName);
+    mimeTypeFilters.sort();
+    dialog.setMimeTypeFilters(mimeTypeFilters);
+    dialog.selectMimeTypeFilter("image/jpeg");
+    if (dialog.exec() == QDialog::Accepted)
+        loadImage(dialog.selectedFiles().constFirst());
 }
 
 void MainWindow::loadImage(const QString &fileName)
@@ -101,8 +108,8 @@ void MainWindow::setCompleted()
 void MainWindow::setupPuzzle()
 {
     int size = qMin(puzzleImage.width(), puzzleImage.height());
-    puzzleImage = puzzleImage.copy((puzzleImage.width() - size)/2,
-        (puzzleImage.height() - size)/2, size, size).scaled(puzzleWidget->width(),
+    puzzleImage = puzzleImage.copy((puzzleImage.width() - size) / 2,
+        (puzzleImage.height() - size) / 2, size, size).scaled(puzzleWidget->width(),
             puzzleWidget->height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 
     piecesList->clear();
diff --git a/examples/widgets/draganddrop/puzzle/mainwindow.h b/examples/widgets/draganddrop/puzzle/mainwindow.h
index e43f52cab8..626612ebe8 100644
--- a/examples/widgets/draganddrop/puzzle/mainwindow.h
+++ b/examples/widgets/draganddrop/puzzle/mainwindow.h
@@ -51,8 +51,8 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QPixmap>
 #include <QMainWindow>
+#include <QPixmap>
 
 class PiecesList;
 class PuzzleWidget;
@@ -65,7 +65,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    MainWindow(QWidget *parent = 0);
+    explicit MainWindow(QWidget *parent = nullptr);
     void loadImage(const QString &path);
 
 public slots:
diff --git a/examples/widgets/draganddrop/puzzle/pieceslist.cpp b/examples/widgets/draganddrop/puzzle/pieceslist.cpp
index 30890ecf9b..7846d37ed2 100644
--- a/examples/widgets/draganddrop/puzzle/pieceslist.cpp
+++ b/examples/widgets/draganddrop/puzzle/pieceslist.cpp
@@ -101,7 +101,7 @@ void PiecesList::dropEvent(QDropEvent *event)
     }
 }
 
-void PiecesList::addPiece(QPixmap pixmap, QPoint location)
+void PiecesList::addPiece(const QPixmap &pixmap, const QPoint &location)
 {
     QListWidgetItem *pieceItem = new QListWidgetItem(this);
     pieceItem->setIcon(QIcon(pixmap));
diff --git a/examples/widgets/draganddrop/puzzle/pieceslist.h b/examples/widgets/draganddrop/puzzle/pieceslist.h
index b67d2bdaf7..a508d17d72 100644
--- a/examples/widgets/draganddrop/puzzle/pieceslist.h
+++ b/examples/widgets/draganddrop/puzzle/pieceslist.h
@@ -58,8 +58,8 @@ class PiecesList : public QListWidget
     Q_OBJECT
 
 public:
-    explicit PiecesList(int pieceSize, QWidget *parent = 0);
-    void addPiece(QPixmap pixmap, QPoint location);
+    explicit PiecesList(int pieceSize, QWidget *parent = nullptr);
+    void addPiece(const QPixmap &pixmap, const QPoint &location);
 
     static QString puzzleMimeType() { return QStringLiteral("image/x-puzzle-piece"); }
 
diff --git a/examples/widgets/draganddrop/puzzle/puzzlewidget.cpp b/examples/widgets/draganddrop/puzzle/puzzlewidget.cpp
index 2093d7820c..72f2662bce 100644
--- a/examples/widgets/draganddrop/puzzle/puzzlewidget.cpp
+++ b/examples/widgets/draganddrop/puzzle/puzzlewidget.cpp
@@ -66,9 +66,7 @@ PuzzleWidget::PuzzleWidget(int imageSize, QWidget *parent)
 
 void PuzzleWidget::clear()
 {
-    pieceLocations.clear();
-    piecePixmaps.clear();
-    pieceRects.clear();
+    pieces.clear();
     highlightedRect = QRect();
     inPlace = 0;
     update();
@@ -95,7 +93,7 @@ void PuzzleWidget::dragMoveEvent(QDragMoveEvent *event)
     QRect updateRect = highlightedRect.united(targetSquare(event->pos()));
 
     if (event->mimeData()->hasFormat(PiecesList::puzzleMimeType())
-        && pieceRects.indexOf(targetSquare(event->pos())) == -1) {
+        && findPiece(targetSquare(event->pos())) == -1) {
 
         highlightedRect = targetSquare(event->pos());
         event->setDropAction(Qt::MoveAction);
@@ -111,26 +109,23 @@ void PuzzleWidget::dragMoveEvent(QDragMoveEvent *event)
 void PuzzleWidget::dropEvent(QDropEvent *event)
 {
     if (event->mimeData()->hasFormat(PiecesList::puzzleMimeType())
-        && pieceRects.indexOf(targetSquare(event->pos())) == -1) {
+        && findPiece(targetSquare(event->pos())) == -1) {
 
         QByteArray pieceData = event->mimeData()->data(PiecesList::puzzleMimeType());
         QDataStream dataStream(&pieceData, QIODevice::ReadOnly);
-        QRect square = targetSquare(event->pos());
-        QPixmap pixmap;
-        QPoint location;
-        dataStream >> pixmap >> location;
+        Piece piece;
+        piece.rect = targetSquare(event->pos());
+        dataStream >> piece.pixmap >> piece.location;
 
-        pieceLocations.append(location);
-        piecePixmaps.append(pixmap);
-        pieceRects.append(square);
+        pieces.append(piece);
 
         highlightedRect = QRect();
-        update(square);
+        update(piece.rect);
 
         event->setDropAction(Qt::MoveAction);
         event->accept();
 
-        if (location == QPoint(square.x()/pieceSize(), square.y()/pieceSize())) {
+        if (piece.location == piece.rect.topLeft() / pieceSize()) {
             inPlace++;
             if (inPlace == 25)
                 emit puzzleCompleted();
@@ -141,21 +136,26 @@ void PuzzleWidget::dropEvent(QDropEvent *event)
     }
 }
 
+int PuzzleWidget::findPiece(const QRect &pieceRect) const
+{
+    for (int i = 0, size = pieces.size(); i < size; ++i) {
+        if (pieces.at(i).rect == pieceRect)
+            return i;
+    }
+    return -1;
+}
+
 void PuzzleWidget::mousePressEvent(QMouseEvent *event)
 {
     QRect square = targetSquare(event->pos());
-    int found = pieceRects.indexOf(square);
+    const int found = findPiece(square);
 
     if (found == -1)
         return;
 
-    QPoint location = pieceLocations[found];
-    QPixmap pixmap = piecePixmaps[found];
-    pieceLocations.removeAt(found);
-    piecePixmaps.removeAt(found);
-    pieceRects.removeAt(found);
+    Piece piece = pieces.takeAt(found);
 
-    if (location == QPoint(square.x()/pieceSize(), square.y()/pieceSize()))
+    if (piece.location == square.topLeft() / pieceSize())
         inPlace--;
 
     update(square);
@@ -163,7 +163,7 @@ void PuzzleWidget::mousePressEvent(QMouseEvent *event)
     QByteArray itemData;
     QDataStream dataStream(&itemData, QIODevice::WriteOnly);
 
-    dataStream << pixmap << location;
+    dataStream << piece.pixmap << piece.location;
 
     QMimeData *mimeData = new QMimeData;
     mimeData->setData(PiecesList::puzzleMimeType(), itemData);
@@ -171,23 +171,20 @@ void PuzzleWidget::mousePressEvent(QMouseEvent *event)
     QDrag *drag = new QDrag(this);
     drag->setMimeData(mimeData);
     drag->setHotSpot(event->pos() - square.topLeft());
-    drag->setPixmap(pixmap);
+    drag->setPixmap(piece.pixmap);
 
-    if (!(drag->exec(Qt::MoveAction) == Qt::MoveAction)) {
-        pieceLocations.insert(found, location);
-        piecePixmaps.insert(found, pixmap);
-        pieceRects.insert(found, square);
+    if (drag->exec(Qt::MoveAction) != Qt::MoveAction) {
+        pieces.insert(found, piece);
         update(targetSquare(event->pos()));
 
-        if (location == QPoint(square.x()/pieceSize(), square.y()/pieceSize()))
+        if (piece.location == square.topLeft() / pieceSize())
             inPlace++;
     }
 }
 
 void PuzzleWidget::paintEvent(QPaintEvent *event)
 {
-    QPainter painter;
-    painter.begin(this);
+    QPainter painter(this);
     painter.fillRect(event->rect(), Qt::white);
 
     if (highlightedRect.isValid()) {
@@ -196,14 +193,14 @@ void PuzzleWidget::paintEvent(QPaintEvent *event)
         painter.drawRect(highlightedRect.adjusted(0, 0, -1, -1));
     }
 
-    for (int i = 0; i < pieceRects.size(); ++i)
-        painter.drawPixmap(pieceRects[i], piecePixmaps[i]);
-    painter.end();
+    for (const Piece &piece : pieces)
+        painter.drawPixmap(piece.rect, piece.pixmap);
 }
 
 const QRect PuzzleWidget::targetSquare(const QPoint &position) const
 {
-    return QRect(position.x()/pieceSize() * pieceSize(), position.y()/pieceSize() * pieceSize(), pieceSize(), pieceSize());
+    return QRect(position / pieceSize() * pieceSize(),
+                 QSize(pieceSize(), pieceSize()));
 }
 
 int PuzzleWidget::pieceSize() const
diff --git a/examples/widgets/draganddrop/puzzle/puzzlewidget.h b/examples/widgets/draganddrop/puzzle/puzzlewidget.h
index 7dcb7dd497..40dd654af6 100644
--- a/examples/widgets/draganddrop/puzzle/puzzlewidget.h
+++ b/examples/widgets/draganddrop/puzzle/puzzlewidget.h
@@ -51,9 +51,9 @@
 #ifndef PUZZLEWIDGET_H
 #define PUZZLEWIDGET_H
 
-#include <QList>
 #include <QPoint>
 #include <QPixmap>
+#include <QVector>
 #include <QWidget>
 
 QT_BEGIN_NAMESPACE
@@ -67,7 +67,7 @@ class PuzzleWidget : public QWidget
     Q_OBJECT
 
 public:
-    explicit PuzzleWidget(int imageSize, QWidget *parent = 0);
+    explicit PuzzleWidget(int imageSize, QWidget *parent = nullptr);
     void clear();
 
     int pieceSize() const;
@@ -85,11 +85,16 @@ protected:
     void paintEvent(QPaintEvent *event) override;
 
 private:
+    struct Piece {
+        QPixmap pixmap;
+        QRect rect;
+        QPoint location;
+    };
+
+    int findPiece(const QRect &pieceRect) const;
     const QRect targetSquare(const QPoint &position) const;
 
-    QList<QPixmap> piecePixmaps;
-    QList<QRect> pieceRects;
-    QList<QPoint> pieceLocations;
+    QVector<Piece> pieces;
     QRect highlightedRect;
     int inPlace;
     int m_ImageSize;
diff --git a/examples/widgets/itemviews/addressbook/addresswidget.cpp b/examples/widgets/itemviews/addressbook/addresswidget.cpp
index cff35ad78f..143f6266dd 100644
--- a/examples/widgets/itemviews/addressbook/addresswidget.cpp
+++ b/examples/widgets/itemviews/addressbook/addresswidget.cpp
@@ -85,10 +85,7 @@ void AddressWidget::showAddEntryDialog()
 //! [3]
 void AddressWidget::addEntry(QString name, QString address)
 {
-    QList<QPair<QString, QString> >list = table->getList();
-    QPair<QString, QString> pair(name, address);
-
-    if (!list.contains(pair)) {
+    if (!table->getContacts().contains({ name, address })) {
         table->insertRows(0, 1, QModelIndex());
 
         QModelIndex index = table->index(0, 0, QModelIndex());
@@ -195,6 +192,12 @@ void AddressWidget::setupTabs()
             &QItemSelectionModel::selectionChanged,
             this, &AddressWidget::selectionChanged);
 
+        connect(this, &QTabWidget::currentChanged, this, [this](int tabIndex) {
+            auto *tableView = qobject_cast<QTableView *>(widget(tabIndex));
+            if (tableView)
+                emit selectionChanged(tableView->selectionModel()->selection());
+        });
+
         addTab(tableView, str);
     }
 }
@@ -211,18 +214,16 @@ void AddressWidget::readFromFile(const QString &fileName)
         return;
     }
 
-    QList<QPair<QString, QString> > pairs = table->getList();
+    QList<Contact> contacts;
     QDataStream in(&file);
-    in >> pairs;
+    in >> contacts;
 
-    if (pairs.isEmpty()) {
+    if (contacts.isEmpty()) {
         QMessageBox::information(this, tr("No contacts in file"),
                                  tr("The file you are attempting to open contains no contacts."));
     } else {
-        for (int i=0; i<pairs.size(); ++i) {
-            QPair<QString, QString> p = pairs.at(i);
-            addEntry(p.first, p.second);
-        }
+        for (const auto &contact: qAsConst(contacts))
+            addEntry(contact.name, contact.address);
     }
 }
 //! [7]
@@ -237,8 +238,7 @@ void AddressWidget::writeToFile(const QString &fileName)
         return;
     }
 
-    QList<QPair<QString, QString> > pairs = table->getList();
     QDataStream out(&file);
-    out << pairs;
+    out << table->getContacts();
 }
 //! [6]
diff --git a/examples/widgets/itemviews/addressbook/tablemodel.cpp b/examples/widgets/itemviews/addressbook/tablemodel.cpp
index d701ef3223..674e312753 100644
--- a/examples/widgets/itemviews/addressbook/tablemodel.cpp
+++ b/examples/widgets/itemviews/addressbook/tablemodel.cpp
@@ -56,10 +56,10 @@ TableModel::TableModel(QObject *parent)
 {
 }
 
-TableModel::TableModel(QList<QPair<QString, QString> > pairs, QObject *parent)
+TableModel::TableModel(QList<Contact> contacts, QObject *parent)
     : QAbstractTableModel(parent)
+    , contacts(contacts)
 {
-    listOfPairs = pairs;
 }
 //! [0]
 
@@ -67,7 +67,7 @@ TableModel::TableModel(QList<QPair<QString, QString> > pairs, QObject *parent)
 int TableModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
-    return listOfPairs.size();
+    return contacts.size();
 }
 
 int TableModel::columnCount(const QModelIndex &parent) const
@@ -83,16 +83,16 @@ QVariant TableModel::data(const QModelIndex &index, int role) const
     if (!index.isValid())
         return QVariant();
 
-    if (index.row() >= listOfPairs.size() || index.row() < 0)
+    if (index.row() >= contacts.size() || index.row() < 0)
         return QVariant();
 
     if (role == Qt::DisplayRole) {
-        QPair<QString, QString> pair = listOfPairs.at(index.row());
+        const auto &contact = contacts.at(index.row());
 
         if (index.column() == 0)
-            return pair.first;
+            return contact.name;
         else if (index.column() == 1)
-            return pair.second;
+            return contact.address;
     }
     return QVariant();
 }
@@ -126,10 +126,8 @@ bool TableModel::insertRows(int position, int rows, const QModelIndex &index)
     Q_UNUSED(index);
     beginInsertRows(QModelIndex(), position, position + rows - 1);
 
-    for (int row = 0; row < rows; ++row) {
-        QPair<QString, QString> pair(" ", " ");
-        listOfPairs.insert(position, pair);
-    }
+    for (int row = 0; row < rows; ++row)
+        contacts.insert(position, { QString(), QString() });
 
     endInsertRows();
     return true;
@@ -142,9 +140,8 @@ bool TableModel::removeRows(int position, int rows, const QModelIndex &index)
     Q_UNUSED(index);
     beginRemoveRows(QModelIndex(), position, position + rows - 1);
 
-    for (int row = 0; row < rows; ++row) {
-        listOfPairs.removeAt(position);
-    }
+    for (int row = 0; row < rows; ++row)
+        contacts.removeAt(position);
 
     endRemoveRows();
     return true;
@@ -157,16 +154,16 @@ bool TableModel::setData(const QModelIndex &index, const QVariant &value, int ro
     if (index.isValid() && role == Qt::EditRole) {
         int row = index.row();
 
-        QPair<QString, QString> p = listOfPairs.value(row);
+        auto contact = contacts.value(row);
 
         if (index.column() == 0)
-            p.first = value.toString();
+            contact.name = value.toString();
         else if (index.column() == 1)
-            p.second = value.toString();
+            contact.address = value.toString();
         else
             return false;
 
-        listOfPairs.replace(row, p);
+        contacts.replace(row, contact);
         emit(dataChanged(index, index));
 
         return true;
@@ -187,8 +184,8 @@ Qt::ItemFlags TableModel::flags(const QModelIndex &index) const
 //! [7]
 
 //! [8]
-QList< QPair<QString, QString> > TableModel::getList()
+QList<Contact> TableModel::getContacts() const
 {
-    return listOfPairs;
+    return contacts;
 }
 //! [8]
diff --git a/examples/widgets/itemviews/addressbook/tablemodel.h b/examples/widgets/itemviews/addressbook/tablemodel.h
index 9a669c508d..1004a35d31 100644
--- a/examples/widgets/itemviews/addressbook/tablemodel.h
+++ b/examples/widgets/itemviews/addressbook/tablemodel.h
@@ -53,16 +53,37 @@
 
 #include <QAbstractTableModel>
 #include <QList>
-#include <QPair>
 
 //! [0]
+
+struct Contact
+{
+    QString name;
+    QString address;
+
+    bool operator==(const Contact &other) const
+    {
+        return name == other.name && address == other.address;
+    }
+};
+
+inline QDataStream &operator<<(QDataStream &stream, const Contact &contact)
+{
+    return stream << contact.name << contact.address;
+}
+
+inline QDataStream &operator>>(QDataStream &stream, Contact &contact)
+{
+    return stream >> contact.name >> contact.address;
+}
+
 class TableModel : public QAbstractTableModel
 {
     Q_OBJECT
 
 public:
     TableModel(QObject *parent = 0);
-    TableModel(QList<QPair<QString, QString> > listofPairs, QObject *parent = 0);
+    TableModel(QList<Contact> contacts, QObject *parent = 0);
 
     int rowCount(const QModelIndex &parent) const override;
     int columnCount(const QModelIndex &parent) const override;
@@ -72,10 +93,10 @@ public:
     bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
     bool insertRows(int position, int rows, const QModelIndex &index = QModelIndex()) override;
     bool removeRows(int position, int rows, const QModelIndex &index = QModelIndex()) override;
-    QList<QPair<QString, QString> > getList();
+    QList<Contact> getContacts() const;
 
 private:
-    QList<QPair<QString, QString> > listOfPairs;
+    QList<Contact> contacts;
 };
 //! [0]
 
diff --git a/examples/widgets/itemviews/puzzle/main.cpp b/examples/widgets/itemviews/puzzle/main.cpp
index 1f5e7ee9b2..d013bf078d 100644
--- a/examples/widgets/itemviews/puzzle/main.cpp
+++ b/examples/widgets/itemviews/puzzle/main.cpp
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
 
     QApplication app(argc, argv);
     MainWindow window;
-    window.loadImage(":/images/example.jpg");
+    window.loadImage(QStringLiteral(":/images/example.jpg"));
     window.show();
     return app.exec();
 }
diff --git a/examples/widgets/itemviews/puzzle/mainwindow.cpp b/examples/widgets/itemviews/puzzle/mainwindow.cpp
index 282a7b477b..8ee5cf659e 100644
--- a/examples/widgets/itemviews/puzzle/mainwindow.cpp
+++ b/examples/widgets/itemviews/puzzle/mainwindow.cpp
@@ -69,12 +69,19 @@ MainWindow::MainWindow(QWidget *parent)
 
 void MainWindow::openImage()
 {
-    const QString fileName =
-        QFileDialog::getOpenFileName(this,
-                                     tr("Open Image"), QString(),
-                                     tr("Image Files (*.png *.jpg *.bmp)"));
-    if (!fileName.isEmpty())
-        loadImage(fileName);
+    const QString directory =
+        QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).value(0, QDir::homePath());
+    QFileDialog dialog(this, tr("Open Image"), directory);
+    dialog.setAcceptMode(QFileDialog::AcceptOpen);
+    dialog.setFileMode(QFileDialog::ExistingFile);
+    QStringList mimeTypeFilters;
+    for (const QByteArray &mimeTypeName : QImageReader::supportedMimeTypes())
+        mimeTypeFilters.append(mimeTypeName);
+    mimeTypeFilters.sort();
+    dialog.setMimeTypeFilters(mimeTypeFilters);
+    dialog.selectMimeTypeFilter("image/jpeg");
+    if (dialog.exec() == QDialog::Accepted)
+        loadImage(dialog.selectedFiles().constFirst());
 }
 
 void MainWindow::loadImage(const QString &fileName)
@@ -83,7 +90,7 @@ void MainWindow::loadImage(const QString &fileName)
     if (!newImage.load(fileName)) {
         QMessageBox::warning(this, tr("Open Image"),
                              tr("The image file could not be loaded."),
-                             QMessageBox::Cancel);
+                             QMessageBox::Close);
         return;
     }
     puzzleImage = newImage;
@@ -117,19 +124,15 @@ void MainWindow::setupMenus()
 {
     QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
 
-    QAction *openAction = fileMenu->addAction(tr("&Open..."));
+    QAction *openAction = fileMenu->addAction(tr("&Open..."), this, &MainWindow::openImage);
     openAction->setShortcuts(QKeySequence::Open);
 
-    QAction *exitAction = fileMenu->addAction(tr("E&xit"));
+    QAction *exitAction = fileMenu->addAction(tr("E&xit"), qApp, &QCoreApplication::quit);
     exitAction->setShortcuts(QKeySequence::Quit);
 
     QMenu *gameMenu = menuBar()->addMenu(tr("&Game"));
 
-    QAction *restartAction = gameMenu->addAction(tr("&Restart"));
-
-    connect(openAction, &QAction::triggered, this, &MainWindow::openImage);
-    connect(exitAction, &QAction::triggered, qApp, &QCoreApplication::quit);
-    connect(restartAction, &QAction::triggered, this, &MainWindow::setupPuzzle);
+    gameMenu->addAction(tr("&Restart"), this, &MainWindow::setupPuzzle);
 }
 
 void MainWindow::setupWidgets()
diff --git a/examples/widgets/itemviews/puzzle/mainwindow.h b/examples/widgets/itemviews/puzzle/mainwindow.h
index 7e27dc6f3a..208d3a5281 100644
--- a/examples/widgets/itemviews/puzzle/mainwindow.h
+++ b/examples/widgets/itemviews/puzzle/mainwindow.h
@@ -65,7 +65,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    MainWindow(QWidget *parent = 0);
+    explicit MainWindow(QWidget *parent = nullptr);
 
 public slots:
     void openImage();
diff --git a/examples/widgets/itemviews/puzzle/puzzlewidget.cpp b/examples/widgets/itemviews/puzzle/puzzlewidget.cpp
index 78931a95a3..06968da80f 100644
--- a/examples/widgets/itemviews/puzzle/puzzlewidget.cpp
+++ b/examples/widgets/itemviews/puzzle/puzzlewidget.cpp
@@ -62,9 +62,7 @@ PuzzleWidget::PuzzleWidget(int imageSize, QWidget *parent)
 
 void PuzzleWidget::clear()
 {
-    pieceLocations.clear();
-    piecePixmaps.clear();
-    pieceRects.clear();
+    pieces.clear();
     highlightedRect = QRect();
     inPlace = 0;
     update();
@@ -110,23 +108,20 @@ void PuzzleWidget::dropEvent(QDropEvent *event)
         && findPiece(targetSquare(event->pos())) == -1) {
 
         QByteArray pieceData = event->mimeData()->data("image/x-puzzle-piece");
-        QDataStream stream(&pieceData, QIODevice::ReadOnly);
-        QRect square = targetSquare(event->pos());
-        QPixmap pixmap;
-        QPoint location;
-        stream >> pixmap >> location;
+        QDataStream dataStream(&pieceData, QIODevice::ReadOnly);
+        Piece piece;
+        piece.rect = targetSquare(event->pos());
+        dataStream >> piece.pixmap >> piece.location;
 
-        pieceLocations.append(location);
-        piecePixmaps.append(pixmap);
-        pieceRects.append(square);
+        pieces.append(piece);
 
         highlightedRect = QRect();
-        update(square);
+        update(piece.rect);
 
         event->setDropAction(Qt::MoveAction);
         event->accept();
 
-        if (location == QPoint(square.x()/pieceSize(), square.y()/pieceSize())) {
+        if (piece.location == piece.rect.topLeft() / pieceSize()) {
             inPlace++;
             if (inPlace == 25)
                 emit puzzleCompleted();
@@ -139,8 +134,8 @@ void PuzzleWidget::dropEvent(QDropEvent *event)
 
 int PuzzleWidget::findPiece(const QRect &pieceRect) const
 {
-    for (int i = 0; i < pieceRects.size(); ++i) {
-        if (pieceRect == pieceRects[i])
+    for (int i = 0, size = pieces.size(); i < size; ++i) {
+        if (pieces.at(i).rect == pieceRect)
             return i;
     }
     return -1;
@@ -154,13 +149,9 @@ void PuzzleWidget::mousePressEvent(QMouseEvent *event)
     if (found == -1)
         return;
 
-    QPoint location = pieceLocations[found];
-    QPixmap pixmap = piecePixmaps[found];
-    pieceLocations.removeAt(found);
-    piecePixmaps.removeAt(found);
-    pieceRects.removeAt(found);
+    Piece piece = pieces.takeAt(found);
 
-    if (location == QPoint(square.x()/pieceSize(), square.y()/pieceSize()))
+    if (piece.location == square.topLeft() / pieceSize())
         inPlace--;
 
     update(square);
@@ -168,7 +159,7 @@ void PuzzleWidget::mousePressEvent(QMouseEvent *event)
     QByteArray itemData;
     QDataStream dataStream(&itemData, QIODevice::WriteOnly);
 
-    dataStream << pixmap << location;
+    dataStream << piece.pixmap << piece.location;
 
     QMimeData *mimeData = new QMimeData;
     mimeData->setData("image/x-puzzle-piece", itemData);
@@ -176,23 +167,20 @@ void PuzzleWidget::mousePressEvent(QMouseEvent *event)
     QDrag *drag = new QDrag(this);
     drag->setMimeData(mimeData);
     drag->setHotSpot(event->pos() - square.topLeft());
-    drag->setPixmap(pixmap);
+    drag->setPixmap(piece.pixmap);
 
-    if (drag->start(Qt::MoveAction) == 0) {
-        pieceLocations.insert(found, location);
-        piecePixmaps.insert(found, pixmap);
-        pieceRects.insert(found, square);
+    if (drag->start(Qt::MoveAction) == Qt::IgnoreAction) {
+        pieces.insert(found, piece);
         update(targetSquare(event->pos()));
 
-        if (location == QPoint(square.x()/pieceSize(), square.y()/pieceSize()))
+        if (piece.location == QPoint(square.x() / pieceSize(), square.y() / pieceSize()))
             inPlace++;
     }
 }
 
 void PuzzleWidget::paintEvent(QPaintEvent *event)
 {
-    QPainter painter;
-    painter.begin(this);
+    QPainter painter(this);
     painter.fillRect(event->rect(), Qt::white);
 
     if (highlightedRect.isValid()) {
@@ -201,15 +189,14 @@ void PuzzleWidget::paintEvent(QPaintEvent *event)
         painter.drawRect(highlightedRect.adjusted(0, 0, -1, -1));
     }
 
-    for (int i = 0; i < pieceRects.size(); ++i) {
-        painter.drawPixmap(pieceRects[i], piecePixmaps[i]);
-    }
-    painter.end();
+    for (const Piece &piece : pieces)
+        painter.drawPixmap(piece.rect, piece.pixmap);
 }
 
 const QRect PuzzleWidget::targetSquare(const QPoint &position) const
 {
-    return QRect(position.x()/pieceSize() * pieceSize(), position.y()/pieceSize() * pieceSize(), pieceSize(), pieceSize());
+    return QRect(position / pieceSize() * pieceSize(),
+                 QSize(pieceSize(), pieceSize()));
 }
 
 int PuzzleWidget::pieceSize() const
diff --git a/examples/widgets/itemviews/puzzle/puzzlewidget.h b/examples/widgets/itemviews/puzzle/puzzlewidget.h
index 137e0b7162..40dd654af6 100644
--- a/examples/widgets/itemviews/puzzle/puzzlewidget.h
+++ b/examples/widgets/itemviews/puzzle/puzzlewidget.h
@@ -51,9 +51,9 @@
 #ifndef PUZZLEWIDGET_H
 #define PUZZLEWIDGET_H
 
-#include <QList>
-#include <QPixmap>
 #include <QPoint>
+#include <QPixmap>
+#include <QVector>
 #include <QWidget>
 
 QT_BEGIN_NAMESPACE
@@ -67,7 +67,7 @@ class PuzzleWidget : public QWidget
     Q_OBJECT
 
 public:
-    explicit PuzzleWidget(int imageSize, QWidget *parent = 0);
+    explicit PuzzleWidget(int imageSize, QWidget *parent = nullptr);
     void clear();
 
     int pieceSize() const;
@@ -85,12 +85,16 @@ protected:
     void paintEvent(QPaintEvent *event) override;
 
 private:
+    struct Piece {
+        QPixmap pixmap;
+        QRect rect;
+        QPoint location;
+    };
+
     int findPiece(const QRect &pieceRect) const;
     const QRect targetSquare(const QPoint &position) const;
 
-    QList<QPixmap> piecePixmaps;
-    QList<QRect> pieceRects;
-    QList<QPoint> pieceLocations;
+    QVector<Piece> pieces;
     QRect highlightedRect;
     int inPlace;
     int m_ImageSize;
diff --git a/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp b/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp
index 7fdce3b674..67d0db4bed 100644
--- a/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp
+++ b/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp
@@ -129,6 +129,10 @@ PatternLineEdit::PatternLineEdit(QWidget *parent) :
     connect(escapeSelectionAction, &QAction::triggered, this, &PatternLineEdit::escapeSelection);
     connect(copyToCodeAction, &QAction::triggered, this, &PatternLineEdit::copyToCode);
     connect(pasteFromCodeAction, &QAction::triggered, this, &PatternLineEdit::pasteFromCode);
+#if !QT_CONFIG(clipboard)
+    copyToCodeAction->setEnabled(false);
+    pasteFromCodeAction->setEnabled(false);
+#endif
 }
 
 void PatternLineEdit::escapeSelection()
@@ -144,12 +148,16 @@ void PatternLineEdit::escapeSelection()
 
 void PatternLineEdit::copyToCode()
 {
+#if QT_CONFIG(clipboard)
     QGuiApplication::clipboard()->setText(patternToCode(text()));
+#endif
 }
 
 void PatternLineEdit::pasteFromCode()
 {
+#if QT_CONFIG(clipboard)
     setText(codeToPattern(QGuiApplication::clipboard()->text()));
+#endif
 }
 
 void PatternLineEdit::contextMenuEvent(QContextMenuEvent *event)
@@ -316,7 +324,7 @@ void RegularExpressionDialog::refresh()
 
 void RegularExpressionDialog::copyEscapedPatternToClipboard()
 {
-#ifndef QT_NO_CLIPBOARD
+#if QT_CONFIG(clipboard)
     QClipboard *clipboard = QGuiApplication::clipboard();
     if (clipboard)
         clipboard->setText(escapedPatternLineEdit->text());
@@ -361,7 +369,7 @@ QWidget *RegularExpressionDialog::setupLeftUi()
     palette.setBrush(QPalette::Base, palette.brush(QPalette::Disabled, QPalette::Base));
     escapedPatternLineEdit->setPalette(palette);
 
-#ifndef QT_NO_CLIPBOARD
+#if QT_CONFIG(clipboard)
     QAction *copyEscapedPatternAction = new QAction(this);
     copyEscapedPatternAction->setText(tr("Copy to clipboard"));
     copyEscapedPatternAction->setIcon(QIcon(QStringLiteral(":/images/copy.png")));