Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
author: Tobias Hunger <tobias.hunger@qt.io> 2019-04-16 16:32:08 +0200
committer: Tobias Hunger <tobias.hunger@qt.io> 2019-04-16 16:32:08 +0200
commit: 6630937e63ae5797487b86743a7733c8ae5cc42c (patch)
tree: 3d53dacf6430f9099e1fb20835881205de674961 /src/widgets
parent: 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff)
parent: c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff)
254 files changed, 3637 insertions, 2433 deletions
diff --git a/src/widgets/accessible/itemviews.cpp b/src/widgets/accessible/itemviews.cpp
index 159d61d683..51cfaa7f5e 100644
--- a/src/widgets/accessible/itemviews.cpp
+++ b/src/widgets/accessible/itemviews.cpp
@@ -973,7 +973,7 @@ void QAccessibleTableCell::unselectCell()
 {
 
     QAbstractItemView::SelectionMode selectionMode = view->selectionMode();
-    if (!m_index.isValid() || (selectionMode & QAbstractItemView::NoSelection))
+    if (!m_index.isValid() || (selectionMode == QAbstractItemView::NoSelection))
         return;
 
     QAccessibleTableInterface *cellTable = table()->tableInterface();
diff --git a/src/widgets/configure.cmake b/src/widgets/configure.cmake
index f703a03b79..fead6b60b5 100644
--- a/src/widgets/configure.cmake
+++ b/src/widgets/configure.cmake
@@ -26,14 +26,14 @@ qt_feature("style_fusion" PRIVATE
 )
 qt_feature("style_mac" PRIVATE
     LABEL "macOS"
-    CONDITION APPLE_OSX
+    CONDITION APPLE_OSX AND QT_FEATURE_animation
 )
 qt_feature("style_windows" PRIVATE
     LABEL "Windows"
 )
 qt_feature("style_windowsvista" PRIVATE
     LABEL "WindowsVista"
-    CONDITION QT_FEATURE_style_windows AND WIN32 AND NOT WINRT AND tests.uxtheme OR FIXME
+    CONDITION QT_FEATURE_style_windows AND QT_FEATURE_animation AND WIN32 AND NOT WINRT AND tests.uxtheme OR FIXME
 )
 qt_feature("style_android" PRIVATE
     LABEL "Android"
diff --git a/src/widgets/configure.json b/src/widgets/configure.json
index b3a5227d26..cc9019dfdd 100644
--- a/src/widgets/configure.json
+++ b/src/widgets/configure.json
@@ -47,7 +47,7 @@
         },
         "style-mac": {
             "label": "macOS",
-            "condition": "config.osx",
+            "condition": "config.osx && features.animation",
             "output": [ "privateFeature", "styles" ]
         },
         "style-windows": {
@@ -56,7 +56,7 @@
         },
         "style-windowsvista": {
             "label": "WindowsVista",
-            "condition": "features.style-windows && config.win32 && !config.winrt && tests.uxtheme",
+            "condition": "features.style-windows && features.animation && config.win32 && !config.winrt && tests.uxtheme",
             "output": [ "privateFeature", "styles" ]
         },
         "style-android": {
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp
index 4aa680af61..c0bacd553d 100644
--- a/src/widgets/dialogs/qcolordialog.cpp
+++ b/src/widgets/dialogs/qcolordialog.cpp
@@ -57,7 +57,9 @@
 #include "qpainter.h"
 #include "qpixmap.h"
 #include "qpushbutton.h"
+#if QT_CONFIG(settings)
 #include "qsettings.h"
+#endif
 #include "qsharedpointer.h"
 #include "qstyle.h"
 #include "qstyleoption.h"
@@ -644,7 +646,7 @@ void QColorWell::mouseMoveEvent(QMouseEvent *e)
         drg->setMimeData(mime);
         drg->setPixmap(pix);
         mousePressed = false;
-        drg->start();
+        drg->exec(Qt::CopyAction);
     }
 #endif
 }
@@ -840,8 +842,8 @@ void QColorLuminancePicker::paintEvent(QPaintEvent *)
     p.drawPixmap(1, coff, *pix);
     const QPalette &g = palette();
     qDrawShadePanel(&p, r, g, true);
-    p.setPen(g.foreground().color());
-    p.setBrush(g.foreground());
+    p.setPen(g.windowText().color());
+    p.setBrush(g.windowText());
     QPolygon a;
     int y = val2y(val);
     a.setPoints(3, w, y, w+5, y+5, w+5, y-5);
@@ -1129,7 +1131,7 @@ void QColorShowLabel::mouseMoveEvent(QMouseEvent *e)
         drg->setMimeData(mime);
         drg->setPixmap(pix);
         mousePressed = false;
-        drg->start();
+        drg->exec(Qt::CopyAction);
     }
 #endif
 }
@@ -1177,7 +1179,8 @@ QColorShower::QColorShower(QColorDialog *parent)
     curQColor = Qt::white;
 
     gl = new QGridLayout(this);
-    gl->setMargin(gl->spacing());
+    const int s = gl->spacing();
+    gl->setContentsMargins(s, s, s, s);
     lab = new QColorShowLabel(this);
 
 #ifdef QT_SMALL_COLORDIALOG
@@ -1805,7 +1808,7 @@ void QColorDialogPrivate::initWidgets()
     rightLay->addStretch();
 
     cs = new QColorShower(q);
-    pickLay->setMargin(cs->gl->margin());
+    pickLay->setContentsMargins(cs->gl->contentsMargins());
     QObject::connect(cs, SIGNAL(newCol(QRgb)), q, SLOT(_q_newColorTypedIn(QRgb)));
     QObject::connect(cs, SIGNAL(currentColorChanged(QColor)),
                      q, SIGNAL(currentColorChanged(QColor)));
@@ -1814,7 +1817,7 @@ void QColorDialogPrivate::initWidgets()
 #else
     rightLay->addWidget(cs);
     if (leftLay)
-        leftLay->addSpacing(cs->gl->margin());
+        leftLay->addSpacing(cs->gl->contentsMargins().right());
 #endif
 
     buttons = new QDialogButtonBox(q);
@@ -1851,7 +1854,7 @@ void QColorDialogPrivate::_q_addCustom()
     QColorDialogOptions::setCustomColor(nextCust, cs->currentColor());
     if (custom)
         custom->update();
-    nextCust = (nextCust+1) % 16;
+    nextCust = (nextCust+1) % QColorDialogOptions::customColorCount();
 }
 
 void QColorDialogPrivate::retranslateStrings()
@@ -1885,7 +1888,7 @@ bool QColorDialogPrivate::canBeNativeDialog() const
 }
 
 static const Qt::WindowFlags DefaultWindowFlags =
-        Qt::Dialog | Qt::WindowTitleHint | Qt::MSWindowsFixedSizeDialogHint
+        Qt::Dialog | Qt::WindowTitleHint
         | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint;
 
 /*!
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp
index cadd7ef031..5692a16bce 100644
--- a/src/widgets/dialogs/qdialog.cpp
+++ b/src/widgets/dialogs/qdialog.cpp
@@ -145,10 +145,48 @@ bool QDialogPrivate::canBeNativeDialog() const
     return false;
 }
 
-QWindow *QDialogPrivate::parentWindow() const
+/*!
+    \internal
+
+    Properly hides dialog and sets the \a resultCode.
+ */
+void QDialogPrivate::hide(int resultCode)
 {
-    if (const QWidget *parent = q_func()->nativeParentWidget())
+    Q_Q(QDialog);
+
+    q->setResult(resultCode);
+    q->hide();
+
+    close_helper(QWidgetPrivate::CloseNoEvent);
+    resetModalitySetByOpen();
+}
+
+/*!
+    \internal
+
+    Emits finished() signal with \a resultCode. If the \a dialogCode
+    is equal to 0 emits rejected(), if the \a dialogCode is equal to
+    1 emits accepted().
+ */
+void QDialogPrivate::finalize(int resultCode, int dialogCode)
+{
+    Q_Q(QDialog);
+
+    if (dialogCode == QDialog::Accepted)
+        emit q->accepted();
+    else if (dialogCode == QDialog::Rejected)
+        emit q->rejected();
+
+    emit q->finished(resultCode);
+}
+
+QWindow *QDialogPrivate::transientParentWindow() const
+{
+    Q_Q(const QDialog);
+    if (const QWidget *parent = q->nativeParentWidget())
         return parent->windowHandle();
+    else if (q->windowHandle())
+        return q->windowHandle()->transientParent();
     return 0;
 }
 
@@ -158,7 +196,7 @@ bool QDialogPrivate::setNativeDialogVisible(bool visible)
         if (visible) {
             Q_Q(QDialog);
             helperPrepareShow(helper);
-            nativeDialogInUse = helper->show(q->windowFlags(), q->windowModality(), parentWindow());
+            nativeDialogInUse = helper->show(q->windowFlags(), q->windowModality(), transientParentWindow());
         } else if (nativeDialogInUse) {
             helper->hide();
         }
@@ -208,6 +246,13 @@ void QDialogPrivate::deletePlatformHelper()
     window-system properties for the widget (in particular it will
     reset the Qt::Dialog flag).
 
+    \note The parent relationship of the dialog does \e{not} imply
+    that the dialog will always be stacked on top of the parent
+    window. To ensure that the dialog is always on top, make the
+    dialog modal. This also applies for child windows of the dialog
+    itself. To ensure that child windows of the dialog stay on top
+    of the dialog, make the child windows modal as well.
+
     \section1 Modal Dialogs
 
     A \b{modal} dialog is a dialog that blocks input to other
@@ -225,12 +270,11 @@ void QDialogPrivate::deletePlatformHelper()
 
     The most common way to display a modal dialog is to call its
     exec() function. When the user closes the dialog, exec() will
-    provide a useful \l{#return}{return value}. Typically,
-    to get the dialog to close and return the appropriate value, we
-    connect a default button, e.g. \uicontrol OK, to the accept() slot and a
-    \uicontrol Cancel button to the reject() slot.
-    Alternatively you can call the done() slot with \c Accepted or
-    \c Rejected.
+    provide a useful \l{#return}{return value}. To close the dialog
+    and return the appropriate value, you must connect a default button,
+    e.g. an \uicontrol OK button to the accept() slot and a
+    \uicontrol Cancel button to the reject() slot. Alternatively, you
+    can call the done() slot with \c Accepted or \c Rejected.
 
     An alternative is to call setModal(true) or setWindowModality(),
     then show(). Unlike exec(), show() returns control to the caller
@@ -384,7 +428,7 @@ QDialog::~QDialog()
 /*!
   \internal
   This function is called by the push button \a pushButton when it
-  becomes the default button. If \a pushButton is 0, the dialogs
+  becomes the default button. If \a pushButton is \nullptr, the dialogs
   default default button becomes the default button. This is what a
   push button calls when it loses focus.
 */
@@ -590,17 +634,8 @@ int QDialog::exec()
 void QDialog::done(int r)
 {
     Q_D(QDialog);
-    setResult(r);
-    hide();
-
-    d->close_helper(QWidgetPrivate::CloseNoEvent);
-    d->resetModalitySetByOpen();
-
-    emit finished(r);
-    if (r == Accepted)
-        emit accepted();
-    else if (r == Rejected)
-        emit rejected();
+    d->hide(r);
+    d->finalize(r, r);
 }
 
 /*!
@@ -750,7 +785,12 @@ void QDialog::setVisible(bool visible)
             return;
 
         QWidget::setVisible(visible);
+#if QT_DEPRECATED_SINCE(5, 13)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
         showExtension(d->doShowExtension);
+QT_WARNING_POP
+#endif
         QWidget *fw = window()->focusWidget();
         if (!fw)
             fw = this;
@@ -917,6 +957,7 @@ void QDialog::adjustPosition(QWidget* w)
     move(p);
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -959,7 +1000,7 @@ Qt::Orientation QDialog::orientation() const
 
     Sets the widget, \a extension, to be the dialog's extension,
     deleting any previous extension. The dialog takes ownership of the
-    extension. Note that if 0 is passed any existing extension will be
+    extension. Note that if \nullptr is passed, any existing extension will be
     deleted. This function must only be called while the dialog is hidden.
 
     Instead of using this functionality, we recommend that you simply call
@@ -985,7 +1026,7 @@ void QDialog::setExtension(QWidget* extension)
 /*!
     \obsolete
 
-    Returns the dialog's extension or 0 if no extension has been
+    Returns the dialog's extension or \nullptr if no extension has been
     defined.
 
     Instead of using this functionality, we recommend that you simply call
@@ -1061,7 +1102,7 @@ void QDialog::showExtension(bool showIt)
 #endif
     }
 }
-
+#endif
 
 /*! \reimp */
 QSize QDialog::sizeHint() const
diff --git a/src/widgets/dialogs/qdialog.h b/src/widgets/dialogs/qdialog.h
index 7f267dd939..ce2194a1de 100644
--- a/src/widgets/dialogs/qdialog.h
+++ b/src/widgets/dialogs/qdialog.h
@@ -69,11 +69,12 @@ public:
 
     void setVisible(bool visible) override;
 
-    void setOrientation(Qt::Orientation orientation);
-    Qt::Orientation orientation() const;
-
-    void setExtension(QWidget* extension);
-    QWidget* extension() const;
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use show/hide on the affected widget instead") void setOrientation(Qt::Orientation orientation);
+    QT_DEPRECATED_X("Use show/hide on the affected widget instead") Qt::Orientation orientation() const;
+    QT_DEPRECATED_X("Use show/hide on the affected widget instead") void setExtension(QWidget* extension);
+    QT_DEPRECATED_X("Use show/hide on the affected widget instead") QWidget* extension() const;
+#endif
 
     QSize sizeHint() const override;
     QSize minimumSizeHint() const override;
@@ -96,7 +97,9 @@ public Q_SLOTS:
     virtual void accept();
     virtual void reject();
 
-    void showExtension(bool);
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use show/hide on the affected widget instead") void showExtension(bool);
+#endif
 
 protected:
     QDialog(QDialogPrivate &, QWidget *parent, Qt::WindowFlags f = Qt::WindowFlags());
diff --git a/src/widgets/dialogs/qdialog_p.h b/src/widgets/dialogs/qdialog_p.h
index 99fff08e65..74f775a0bd 100644
--- a/src/widgets/dialogs/qdialog_p.h
+++ b/src/widgets/dialogs/qdialog_p.h
@@ -75,19 +75,19 @@ public:
     QDialogPrivate()
         :
 #if QT_CONFIG(pushbutton)
-          mainDef(0),
+          mainDef(nullptr),
 #endif
-          orientation(Qt::Horizontal),extension(0), doShowExtension(false),
+          orientation(Qt::Horizontal),extension(nullptr), doShowExtension(false),
 #if QT_CONFIG(sizegrip)
-          resizer(0),
+          resizer(nullptr),
           sizeGripEnabled(false),
 #endif
-          rescode(0), resetModalityTo(-1), wasModalitySet(true), eventLoop(0),
-          nativeDialogInUse(false), m_platformHelper(0), m_platformHelperCreated(false)
+          rescode(0), resetModalityTo(-1), wasModalitySet(true), eventLoop(nullptr),
+          nativeDialogInUse(false), m_platformHelper(nullptr), m_platformHelperCreated(false)
         {}
     ~QDialogPrivate();
 
-    QWindow *parentWindow() const;
+    QWindow *transientParentWindow() const;
     bool setNativeDialogVisible(bool visible);
     QVariant styleHint(QPlatformDialogHelper::StyleHint hint) const;
     void deletePlatformHelper();
@@ -122,6 +122,9 @@ public:
     QPlatformDialogHelper *platformHelper() const;
     virtual bool canBeNativeDialog() const;
 
+    void hide(int resultCode);
+    void finalize(int resultCode, int dialogCode);
+
 private:
     virtual void initHelper(QPlatformDialogHelper *) {}
     virtual void helperPrepareShow(QPlatformDialogHelper *) {}
@@ -137,14 +140,14 @@ class QAutoPointer {
     struct internal { void func() {} };
     typedef void (internal::*RestrictedBool)();
 public:
-    explicit QAutoPointer(T *t) Q_DECL_NOTHROW : o(t) {}
+    explicit QAutoPointer(T *t) noexcept : o(t) {}
     ~QAutoPointer() { delete o; }
 
-    T *operator->() const Q_DECL_NOTHROW { return get(); }
-    T *get() const Q_DECL_NOTHROW { return o; }
+    T *operator->() const noexcept { return get(); }
+    T *get() const noexcept { return o; }
     T &operator*() const { return *get(); }
-    operator RestrictedBool() const Q_DECL_NOTHROW { return o ? &internal::func : nullptr; }
-    bool operator!() const Q_DECL_NOTHROW { return !o; }
+    operator RestrictedBool() const noexcept { return o ? &internal::func : nullptr; }
+    bool operator!() const noexcept { return !o; }
 private:
     Q_DISABLE_COPY(QAutoPointer);
 };
diff --git a/src/widgets/dialogs/qerrormessage.cpp b/src/widgets/dialogs/qerrormessage.cpp
index fd68f19680..51a3e080bf 100644
--- a/src/widgets/dialogs/qerrormessage.cpp
+++ b/src/widgets/dialogs/qerrormessage.cpp
@@ -322,8 +322,8 @@ bool QErrorMessagePrivate::nextPending()
 #else
             errors->setPlainText(message);
 #endif
-            currentMessage = qMove(message);
-            currentType = qMove(type);
+            currentMessage = std::move(message);
+            currentType = std::move(type);
             return true;
         }
     }
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index 870a833b34..fcac12068d 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -57,9 +57,13 @@
 #include <qmessagebox.h>
 #endif
 #include <stdlib.h>
+#if QT_CONFIG(settings)
 #include <qsettings.h>
+#endif
 #include <qdebug.h>
+#if QT_CONFIG(mimetype)
 #include <qmimedatabase.h>
+#endif
 #include <qapplication.h>
 #include <qstylepainter.h>
 #include "ui_qfiledialog.h"
@@ -69,6 +73,11 @@
 #elif defined(Q_OS_WIN)
 #  include <QtCore/qt_windows.h>
 #endif
+#if defined(Q_OS_WASM)
+#include <private/qwasmlocalfileaccess_p.h>
+#endif
+
+#include <algorithm>
 
 QT_BEGIN_NAMESPACE
 
@@ -219,6 +228,9 @@ Q_GLOBAL_STATIC(QUrl, lastVisitedDir)
     of QFileDialog that contains the Q_OBJECT macro, or the platform
     does not have a native dialog of the type that you require.
 
+    \note This option must be set before changing dialog properties
+    or showing the dialog.
+
     \value ReadOnly Indicates that the model is readonly.
 
     \value HideNameFilterDetails Indicates if the file name filter details are
@@ -381,7 +393,7 @@ QFileDialog::QFileDialog(const QFileDialogArgs &args)
 */
 QFileDialog::~QFileDialog()
 {
-#ifndef QT_NO_SETTINGS
+#if QT_CONFIG(settings)
     Q_D(QFileDialog);
     d->saveSettings();
 #endif
@@ -577,10 +589,13 @@ void QFileDialogPrivate::retranslateWindowTitle()
         return;
     if (q->acceptMode() == QFileDialog::AcceptOpen) {
         const QFileDialog::FileMode fileMode = q->fileMode();
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
         if (fileMode == QFileDialog::DirectoryOnly || fileMode == QFileDialog::Directory)
             q->setWindowTitle(QFileDialog::tr("Find Directory"));
         else
             q->setWindowTitle(QFileDialog::tr("Open"));
+QT_WARNING_POP
     } else
         q->setWindowTitle(QFileDialog::tr("Save As"));
 
@@ -604,7 +619,10 @@ void QFileDialogPrivate::updateFileNameLabel()
         setLabelTextControl(QFileDialog::FileName, options->labelText(QFileDialogOptions::FileName));
     } else {
         switch (q_func()->fileMode()) {
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
         case QFileDialog::DirectoryOnly:
+QT_WARNING_POP
         case QFileDialog::Directory:
             setLabelTextControl(QFileDialog::FileName, QFileDialog::tr("Directory:"));
             break;
@@ -632,7 +650,10 @@ void QFileDialogPrivate::updateOkButtonText(bool saveAsOnFolder)
         return;
     } else {
         switch (q->fileMode()) {
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
         case QFileDialog::DirectoryOnly:
+QT_WARNING_POP
         case QFileDialog::Directory:
             setLabelTextControl(QFileDialog::Accept, QFileDialog::tr("&Choose"));
             break;
@@ -720,6 +741,16 @@ bool QFileDialogPrivate::usingWidgets() const
     Sets the given \a option to be enabled if \a on is true; otherwise,
     clears the given \a option.
 
+    Options (particularly the DontUseNativeDialogs option) should be set
+    before changing dialog properties or showing the dialog.
+
+    Setting options while the dialog is visible is not guaranteed to have
+    an immediate effect on the dialog (depending on the option and on the
+    platform).
+
+    Setting options after changing other properties may cause these
+    values to have no effect.
+
     \sa options, testOption()
 */
 void QFileDialog::setOption(Option option, bool on)
@@ -750,9 +781,15 @@ bool QFileDialog::testOption(Option option) const
 
     By default, all options are disabled.
 
-    Options should be set before showing the dialog. Setting them while the
-    dialog is visible is not guaranteed to have an immediate effect on the
-    dialog (depending on the option and on the platform).
+    Options (particularly the DontUseNativeDialogs option) should be set
+    before changing dialog properties or showing the dialog.
+
+    Setting options while the dialog is visible is not guaranteed to have
+    an immediate effect on the dialog (depending on the option and on the
+    platform).
+
+    Setting options after changing other properties may cause these
+    values to have no effect.
 
     \sa setOption(), testOption()
 */
@@ -1336,6 +1373,7 @@ void QFileDialog::setNameFilter(const QString &filter)
 }
 
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \property QFileDialog::nameFilterDetailsVisible
     \obsolete
@@ -1357,6 +1395,7 @@ bool QFileDialog::isNameFilterDetailsVisible() const
 {
     return !testOption(HideNameFilterDetails);
 }
+#endif
 
 
 /*
@@ -1518,7 +1557,7 @@ void QFileDialog::setFilter(QDir::Filters filters)
     d->showHiddenAction->setChecked((filters & QDir::Hidden));
 }
 
-#ifndef QT_NO_MIMETYPE
+#if QT_CONFIG(mimetype)
 
 static QString nameFilterForMime(const QString &mimeType)
 {
@@ -1599,7 +1638,7 @@ void QFileDialog::selectMimeTypeFilter(const QString &filter)
     }
 }
 
-#endif // QT_NO_MIMETYPE
+#endif // mimetype
 
 /*!
  * \since 5.9
@@ -1612,7 +1651,7 @@ QString QFileDialog::selectedMimeTypeFilter() const
     if (!d->usingWidgets())
         mimeTypeFilter = d->selectedMimeTypeFilter_sys();
 
-#ifndef QT_NO_MIMETYPE
+#if QT_CONFIG(mimetype)
     if (mimeTypeFilter.isNull() && !d->options->mimeTypeFilters().isEmpty()) {
         const auto nameFilter = selectedNameFilter();
         const auto mimeTypes = d->options->mimeTypeFilters();
@@ -1681,7 +1720,10 @@ void QFileDialog::setFileMode(QFileDialog::FileMode mode)
     d->options->setFileMode(static_cast<QFileDialogOptions::FileMode>(mode));
 
     // keep ShowDirsOnly option in sync with fileMode (BTW, DirectoryOnly is obsolete)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
     setOption(ShowDirsOnly, mode == DirectoryOnly);
+QT_WARNING_POP
 
     if (!d->usingWidgets())
         return;
@@ -1699,11 +1741,14 @@ void QFileDialog::setFileMode(QFileDialog::FileMode mode)
     // set filter
     d->model->setFilter(d->filterForMode(filter()));
     // setup file type for directory
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
     if (mode == DirectoryOnly || mode == Directory) {
         d->qFileDialogUi->fileTypeCombo->clear();
         d->qFileDialogUi->fileTypeCombo->addItem(tr("Directories"));
         d->qFileDialogUi->fileTypeCombo->setEnabled(false);
     }
+QT_WARNING_POP
     d->updateFileNameLabel();
     d->updateOkButtonText();
     d->qFileDialogUi->fileTypeCombo->setEnabled(!testOption(ShowDirsOnly));
@@ -1836,6 +1881,7 @@ QFileDialog::AcceptMode QFileDialog::acceptMode() const
     return static_cast<AcceptMode>(d->options->acceptMode());
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \property QFileDialog::readOnly
     \obsolete
@@ -1895,6 +1941,7 @@ bool QFileDialog::confirmOverwrite() const
 {
     return !testOption(DontConfirmOverwrite);
 }
+#endif
 
 /*!
     \property QFileDialog::defaultSuffix
@@ -2099,8 +2146,8 @@ QString QFileDialog::labelText(DialogLabel label) const
     \snippet code/src_gui_dialogs_qfiledialog.cpp 8
 
     The function creates a modal file dialog with the given \a parent widget.
-    If \a parent is not 0, the dialog will be shown centered over the parent
-    widget.
+    If \a parent is not \nullptr, the dialog will be shown centered over the
+    parent widget.
 
     The file dialog's working directory will be set to \a dir. If \a dir
     includes a file name, the file will be selected. Only files that match the
@@ -2109,9 +2156,7 @@ QString QFileDialog::labelText(DialogLabel label) const
     strings. If you want multiple filters, separate them with ';;', for
     example:
 
-    \code
-    "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)"
-    \endcode
+    \snippet code/src_gui_dialogs_qfiledialog.cpp 14
 
     The \a options argument holds various options about how to run the dialog,
     see the QFileDialog::Option enum for more information on the flags you can
@@ -2124,8 +2169,8 @@ QString QFileDialog::labelText(DialogLabel label) const
     native file dialog and not a QFileDialog.
 
     On Windows the dialog will spin a blocking modal event loop that will not
-    dispatch any QTimers, and if \a parent is not 0 then it will position the
-    dialog just below the parent's title bar.
+    dispatch any QTimers, and if \a parent is not \nullptr then it will position
+    the dialog just below the parent's title bar.
 
     On Unix/X11, the normal behavior of the file dialog is to resolve and
     follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp},
@@ -2214,8 +2259,8 @@ QUrl QFileDialog::getOpenFileUrl(QWidget *parent,
     \snippet code/src_gui_dialogs_qfiledialog.cpp 9
 
     This function creates a modal file dialog with the given \a parent widget.
-    If \a parent is not 0, the dialog will be shown centered over the parent
-    widget.
+    If \a parent is not \nullptr, the dialog will be shown centered over the
+    parent widget.
 
     The file dialog's working directory will be set to \a dir. If \a dir
     includes a file name, the file will be selected. The filter is set to
@@ -2224,9 +2269,7 @@ QUrl QFileDialog::getOpenFileUrl(QWidget *parent,
     \a selectedFilter and \a filter may be empty strings. If you need multiple
     filters, separate them with ';;', for instance:
 
-    \code
-    "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)"
-    \endcode
+    \snippet code/src_gui_dialogs_qfiledialog.cpp 14
 
     The dialog's caption is set to \a caption. If \a caption is not specified
     then a default caption will be used.
@@ -2235,8 +2278,8 @@ QUrl QFileDialog::getOpenFileUrl(QWidget *parent,
     native file dialog and not a QFileDialog.
 
     On Windows the dialog will spin a blocking modal event loop that will not
-    dispatch any QTimers, and if \a parent is not 0 then it will position the
-    dialog just below the parent's title bar.
+    dispatch any QTimers, and if \a parent is not \nullptr then it will position
+    the dialog just below the parent's title bar.
 
     On Unix/X11, the normal behavior of the file dialog is to resolve and
     follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp},
@@ -2325,12 +2368,91 @@ QList<QUrl> QFileDialog::getOpenFileUrls(QWidget *parent,
 }
 
 /*!
+    This is a convenience static function that will return the content of a file
+    selected by the user.
+
+    This function is used to access local files on Qt for WebAssembly, where the web
+    sandbox places restrictions on how such access may happen. Its implementation will
+    make the browser display a native file dialog, where the user makes the file selection.
+
+    It can also be used on other platforms, where it will fall back to using QFileDialog.
+
+    The function is asynchronous and returns immediately. The \a fileOpenCompleted
+    callback will be called when a file has been selected and its contents has been
+    read into memory.
+
+    \snippet code/src_gui_dialogs_qfiledialog.cpp 14
+    \since 5.13
+*/
+void QFileDialog::getOpenFileContent(const QString &nameFilter, const std::function<void(const QString &, const QByteArray &)> &fileOpenCompleted)
+{
+#ifdef Q_OS_WASM
+    auto openFileImpl = std::make_shared<std::function<void(void)>>();
+    QString fileName;
+    QByteArray fileContent;
+    *openFileImpl = [=]() mutable {
+        auto fileDialogClosed = [&](bool fileSelected) {
+            if (!fileSelected) {
+                fileOpenCompleted(fileName, fileContent);
+                openFileImpl.reset();
+            }
+        };
+        auto acceptFile = [&](uint64_t size, const std::string name) -> char * {
+            const uint64_t twoGB = 1ULL << 31; // QByteArray limit
+            if (size > twoGB)
+                return nullptr;
+
+            fileName = QString::fromStdString(name);
+            fileContent.resize(size);
+            return fileContent.data();
+        };
+        auto fileContentReady = [&]() mutable {
+            fileOpenCompleted(fileName, fileContent);
+            openFileImpl.reset();
+        };
+
+        auto qtFilterStringToWebAcceptString = [](const QString &qtString) {
+            // The Qt and Web name filter string formats are similar, but
+            // not identical.
+            return qtString.toStdString(); // ### TODO
+        };
+
+        QWasmLocalFileAccess::openFile(qtFilterStringToWebAcceptString(nameFilter), fileDialogClosed, acceptFile, fileContentReady);
+    };
+
+    (*openFileImpl)();
+#else
+    QFileDialog *dialog = new QFileDialog();
+    dialog->selectNameFilter(nameFilter);
+
+    auto fileSelected = [=](const QString &fileName) {
+        QByteArray fileContent;
+        if (!fileName.isNull()) {
+            QFile selectedFile(fileName);
+            selectedFile.open(QIODevice::ReadOnly);
+            fileContent = selectedFile.readAll();
+        }
+        fileOpenCompleted(fileName, fileContent);
+    };
+
+    auto dialogClosed = [=](int code) {
+        Q_UNUSED(code);
+        delete dialog;
+    };
+
+    connect(dialog, &QFileDialog::fileSelected, fileSelected);
+    connect(dialog, &QFileDialog::finished, dialogClosed);
+    dialog->show();
+#endif
+}
+
+/*!
     This is a convenience static function that will return a file name selected
     by the user. The file does not have to exist.
 
     It creates a modal file dialog with the given \a parent widget. If
-    \a parent is not 0, the dialog will be shown centered over the parent
-    widget.
+    \a parent is not \nullptr, the dialog will be shown centered over the
+    parent widget.
 
     \snippet code/src_gui_dialogs_qfiledialog.cpp 11
 
@@ -2340,9 +2462,7 @@ QList<QUrl> QFileDialog::getOpenFileUrls(QWidget *parent,
     parameters \a dir, \a selectedFilter, and \a filter may be empty strings.
     Multiple filters are separated with ';;'. For instance:
 
-    \code
-    "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)"
-    \endcode
+    \snippet code/src_gui_dialogs_qfiledialog.cpp 14
 
     The \a options argument holds various options about how to run the dialog,
     see the QFileDialog::Option enum for more information on the flags you can
@@ -2358,9 +2478,9 @@ QList<QUrl> QFileDialog::getOpenFileUrls(QWidget *parent,
     native file dialog and not a QFileDialog.
 
     On Windows the dialog will spin a blocking modal event loop that will not
-    dispatch any QTimers, and if \a parent is not 0 then it will position the
-    dialog just below the parent's title bar. On \macos, with its native file
-    dialog, the filter argument is ignored.
+    dispatch any QTimers, and if \a parent is not \nullptr then it will
+    position the  dialog just below the parent's title bar. On \macos, with its
+    native file dialog, the filter argument is ignored.
 
     On Unix/X11, the normal behavior of the file dialog is to resolve and
     follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp},
@@ -2450,8 +2570,8 @@ QUrl QFileDialog::getSaveFileUrl(QWidget *parent,
     \snippet code/src_gui_dialogs_qfiledialog.cpp 12
 
     This function creates a modal file dialog with the given \a parent widget.
-    If \a parent is not 0, the dialog will be shown centered over the parent
-    widget.
+    If \a parent is not \nullptr, the dialog will be shown centered over the
+    parent widget.
 
     The dialog's working directory is set to \a dir, and the caption is set to
     \a caption. Either of these may be an empty string in which case the
@@ -2475,8 +2595,8 @@ QUrl QFileDialog::getSaveFileUrl(QWidget *parent,
     symlinks as regular directories.
 
     On Windows, the dialog will spin a blocking modal event loop that will not
-    dispatch any QTimers, and if \a parent is not 0 then it will position the
-    dialog just below the parent's title bar.
+    dispatch any QTimers, and if \a parent is not \nullptr then it will position
+    the dialog just below the parent's title bar.
 
     \warning Do not delete \a parent during the execution of the dialog. If you
     want to do this, you should create the dialog yourself using one of the
@@ -2531,7 +2651,10 @@ QUrl QFileDialog::getExistingDirectoryUrl(QWidget *parent,
     args.parent = parent;
     args.caption = caption;
     args.directory = QFileDialogPrivate::workingDirectory(dir);
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
     args.mode = (options & ShowDirsOnly ? DirectoryOnly : Directory);
+QT_WARNING_POP
     args.options = options;
 
     QFileDialog dialog(args);
@@ -2644,7 +2767,10 @@ void QFileDialog::accept()
     }
 
     switch (fileMode()) {
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
     case DirectoryOnly:
+QT_WARNING_POP
     case Directory: {
         QString fn = files.first();
         QFileInfo info(fn);
@@ -2680,7 +2806,7 @@ void QFileDialog::accept()
         }
 
         // check if we have to ask for permission to overwrite the file
-        if (!info.exists() || !confirmOverwrite() || acceptMode() == AcceptOpen) {
+        if (!info.exists() || testOption(DontConfirmOverwrite) || acceptMode() == AcceptOpen) {
             d->emitFilesSelected(QStringList(fn));
             QDialog::accept();
 #if QT_CONFIG(messagebox)
@@ -2724,7 +2850,7 @@ void QFileDialog::accept()
     }
 }
 
-#ifndef QT_NO_SETTINGS
+#if QT_CONFIG(settings)
 void QFileDialogPrivate::saveSettings()
 {
     Q_Q(QFileDialog);
@@ -2782,7 +2908,7 @@ bool QFileDialogPrivate::restoreFromSettings()
 
     return restoreWidgetState(history, settings.value(QLatin1String("sidebarWidth"), -1).toInt());
 }
-#endif // QT_NO_SETTINGS
+#endif // settings
 
 bool QFileDialogPrivate::restoreWidgetState(QStringList &history, int splitterPosition)
 {
@@ -2849,13 +2975,17 @@ void QFileDialogPrivate::init(const QUrl &directory, const QString &nameFilter,
     q->setFileMode(QFileDialog::AnyFile);
     if (!nameFilter.isEmpty())
         q->setNameFilter(nameFilter);
+    // QTBUG-70798, prevent the default blocking the restore logic.
+    const bool dontStoreDir = !directory.isValid() && !lastVisitedDir()->isValid();
     q->setDirectoryUrl(workingDirectory(directory));
+    if (dontStoreDir)
+        lastVisitedDir()->clear();
     if (directory.isLocalFile())
         q->selectFile(initialSelection(directory));
     else
         q->selectUrl(directory);
 
-#ifndef QT_NO_SETTINGS
+#if QT_CONFIG(settings)
     // Try to restore from the FileDialog settings group; if it fails, fall back
     // to the pre-5.5 QByteArray serialized settings.
     if (!restoreFromSettings()) {
@@ -3020,7 +3150,7 @@ void QFileDialogPrivate::createWidgets()
     createToolButtons();
     createMenuActions();
 
-#ifndef QT_NO_SETTINGS
+#if QT_CONFIG(settings)
     // Try to restore from the FileDialog settings group; if it fails, fall back
     // to the pre-5.5 QByteArray serialized settings.
     if (!restoreFromSettings()) {
@@ -3037,7 +3167,7 @@ void QFileDialogPrivate::createWidgets()
     if (!options->sidebarUrls().isEmpty())
         q->setSidebarUrls(options->sidebarUrls());
     q->setDirectoryUrl(options->initialDirectory());
-#ifndef QT_NO_MIMETYPE
+#if QT_CONFIG(mimetype)
     if (!options->mimeTypeFilters().isEmpty())
         q->setMimeTypeFilters(options->mimeTypeFilters());
     else
@@ -3244,6 +3374,18 @@ void QFileDialogPrivate::_q_goHome()
     q->setDirectory(QDir::homePath());
 }
 
+
+void QFileDialogPrivate::saveHistorySelection()
+{
+    if (qFileDialogUi.isNull() || currentHistoryLocation < 0 || currentHistoryLocation >= currentHistory.size())
+        return;
+    auto &item = currentHistory[currentHistoryLocation];
+    item.selection.clear();
+    const auto selectedIndexes = qFileDialogUi->listView->selectionModel()->selectedRows();
+    for (const auto &index : selectedIndexes)
+        item.selection.append(QPersistentModelIndex(index));
+}
+
 /*!
     \internal
 
@@ -3257,17 +3399,49 @@ void QFileDialogPrivate::_q_pathChanged(const QString &newPath)
     qFileDialogUi->sidebar->selectUrl(QUrl::fromLocalFile(newPath));
     q->setHistory(qFileDialogUi->lookInCombo->history());
 
-    if (currentHistoryLocation < 0 || currentHistory.value(currentHistoryLocation) != QDir::toNativeSeparators(newPath)) {
+    const QString newNativePath = QDir::toNativeSeparators(newPath);
+
+    // equal paths indicate this was invoked by _q_navigateBack/Forward()
+    if (currentHistoryLocation < 0 || currentHistory.value(currentHistoryLocation).path != newNativePath) {
+        if (currentHistoryLocation >= 0)
+            saveHistorySelection();
         while (currentHistoryLocation >= 0 && currentHistoryLocation + 1 < currentHistory.count()) {
             currentHistory.removeLast();
         }
-        currentHistory.append(QDir::toNativeSeparators(newPath));
+        currentHistory.append({newNativePath, PersistentModelIndexList()});
         ++currentHistoryLocation;
     }
     qFileDialogUi->forwardButton->setEnabled(currentHistory.size() - currentHistoryLocation > 1);
     qFileDialogUi->backButton->setEnabled(currentHistoryLocation > 0);
 }
 
+void QFileDialogPrivate::navigate(HistoryItem &historyItem)
+{
+    Q_Q(QFileDialog);
+    q->setDirectory(historyItem.path);
+    // Restore selection unless something has changed in the file system
+    if (qFileDialogUi.isNull() || historyItem.selection.isEmpty())
+        return;
+    if (std::any_of(historyItem.selection.cbegin(), historyItem.selection.cend(),
+                    [](const QPersistentModelIndex &i) { return !i.isValid(); })) {
+        historyItem.selection.clear();
+        return;
+    }
+
+    QAbstractItemView *view = q->viewMode() == QFileDialog::List
+        ? static_cast<QAbstractItemView *>(qFileDialogUi->listView)
+        : static_cast<QAbstractItemView *>(qFileDialogUi->treeView);
+    auto selectionModel = view->selectionModel();
+    const QItemSelectionModel::SelectionFlags flags = QItemSelectionModel::Select
+        | QItemSelectionModel::Rows;
+    selectionModel->select(historyItem.selection.constFirst(),
+                           flags | QItemSelectionModel::Clear | QItemSelectionModel::Current);
+    for (int i = 1, size = historyItem.selection.size(); i < size; ++i)
+        selectionModel->select(historyItem.selection.at(i), flags);
+
+    view->scrollTo(historyItem.selection.constFirst());
+}
+
 /*!
     \internal
 
@@ -3275,11 +3449,9 @@ void QFileDialogPrivate::_q_pathChanged(const QString &newPath)
 */
 void QFileDialogPrivate::_q_navigateBackward()
 {
-    Q_Q(QFileDialog);
     if (!currentHistory.isEmpty() && currentHistoryLocation > 0) {
-        --currentHistoryLocation;
-        QString previousHistory = currentHistory.at(currentHistoryLocation);
-        q->setDirectory(previousHistory);
+        saveHistorySelection();
+        navigate(currentHistory[--currentHistoryLocation]);
     }
 }
 
@@ -3290,11 +3462,9 @@ void QFileDialogPrivate::_q_navigateBackward()
 */
 void QFileDialogPrivate::_q_navigateForward()
 {
-    Q_Q(QFileDialog);
     if (!currentHistory.isEmpty() && currentHistoryLocation < currentHistory.size() - 1) {
-        ++currentHistoryLocation;
-        QString nextHistory = currentHistory.at(currentHistoryLocation);
-        q->setDirectory(nextHistory);
+        saveHistorySelection();
+        navigate(currentHistory[++currentHistoryLocation]);
     }
 }
 
@@ -3544,7 +3714,10 @@ void QFileDialogPrivate::_q_updateOkButton()
         isOpenDirectory = true;
     } else {
         switch (fileMode) {
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
         case QFileDialog::DirectoryOnly:
+QT_WARNING_POP
         case QFileDialog::Directory: {
             QString fn = files.first();
             QModelIndex idx = model->index(fn);
@@ -3636,12 +3809,15 @@ void QFileDialogPrivate::_q_enterDirectory(const QModelIndex &index)
         const QFileDialog::FileMode fileMode = q->fileMode();
         q->setDirectory(path);
         emit q->directoryEntered(path);
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
         if (fileMode == QFileDialog::Directory
                 || fileMode == QFileDialog::DirectoryOnly) {
             // ### find out why you have to do both of these.
             lineEdit()->setText(QString());
             lineEdit()->clear();
         }
+QT_WARNING_POP
     } else {
         // Do not accept when shift-clicking to multi-select a file in environments with single-click-activation (KDE)
         if (!q->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, nullptr, qFileDialogUi->treeView)
@@ -3674,7 +3850,7 @@ void QFileDialogPrivate::_q_goToDirectory(const QString &path)
     }
     QDir dir(path2);
     if (!dir.exists())
-        dir = getEnvironmentVariable(path2);
+        dir.setPath(getEnvironmentVariable(path2));
 
     if (dir.exists() || path2.isEmpty() || path2 == model->myComputer().toString()) {
         _q_enterDirectory(index);
@@ -3733,7 +3909,10 @@ void QFileDialogPrivate::_q_selectionChanged()
 {
     const QFileDialog::FileMode fileMode = q_func()->fileMode();
     const QModelIndexList indexes = qFileDialogUi->listView->selectionModel()->selectedRows();
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
     bool stripDirs = (fileMode != QFileDialog::DirectoryOnly && fileMode != QFileDialog::Directory);
+QT_WARNING_POP
 
     QStringList allFiles;
     for (const auto &index : indexes) {
@@ -3785,10 +3964,13 @@ void QFileDialogPrivate::_q_rowsInserted(const QModelIndex &parent)
 void QFileDialogPrivate::_q_fileRenamed(const QString &path, const QString &oldName, const QString &newName)
 {
     const QFileDialog::FileMode fileMode = q_func()->fileMode();
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
     if (fileMode == QFileDialog::Directory || fileMode == QFileDialog::DirectoryOnly) {
         if (path == rootPath() && lineEdit()->text() == oldName)
             lineEdit()->setText(newName);
     }
+QT_WARNING_POP
 }
 
 void QFileDialogPrivate::_q_emitUrlSelected(const QUrl &file)
diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h
index 8646894750..95e03618ac 100644
--- a/src/widgets/dialogs/qfiledialog.h
+++ b/src/widgets/dialogs/qfiledialog.h
@@ -46,6 +46,8 @@
 #include <QtCore/qurl.h>
 #include <QtWidgets/qdialog.h>
 
+#include <functional>
+
 QT_REQUIRE_CONFIG(filedialog);
 
 QT_BEGIN_NAMESPACE
@@ -64,19 +66,22 @@ class Q_WIDGETS_EXPORT QFileDialog : public QDialog
     Q_PROPERTY(ViewMode viewMode READ viewMode WRITE setViewMode)
     Q_PROPERTY(FileMode fileMode READ fileMode WRITE setFileMode)
     Q_PROPERTY(AcceptMode acceptMode READ acceptMode WRITE setAcceptMode)
+    Q_PROPERTY(QString defaultSuffix READ defaultSuffix WRITE setDefaultSuffix)
+#if QT_DEPRECATED_SINCE(5, 13)
     Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE false)
-    Q_PROPERTY(bool resolveSymlinks READ resolveSymlinks WRITE setResolveSymlinks DESIGNABLE false)
     Q_PROPERTY(bool confirmOverwrite READ confirmOverwrite WRITE setConfirmOverwrite DESIGNABLE false)
-    Q_PROPERTY(QString defaultSuffix READ defaultSuffix WRITE setDefaultSuffix)
+    Q_PROPERTY(bool resolveSymlinks READ resolveSymlinks WRITE setResolveSymlinks DESIGNABLE false)
     Q_PROPERTY(bool nameFilterDetailsVisible READ isNameFilterDetailsVisible
                WRITE setNameFilterDetailsVisible DESIGNABLE false)
+#endif
     Q_PROPERTY(Options options READ options WRITE setOptions)
     Q_PROPERTY(QStringList supportedSchemes READ supportedSchemes WRITE setSupportedSchemes)
 
 public:
     enum ViewMode { Detail, List };
     Q_ENUM(ViewMode)
-    enum FileMode { AnyFile, ExistingFile, Directory, ExistingFiles, DirectoryOnly };
+    enum FileMode { AnyFile, ExistingFile, Directory, ExistingFiles,
+                    DirectoryOnly Q_DECL_ENUMERATOR_DEPRECATED_X("Use setOption(ShowDirsOnly, true) instead")};
     Q_ENUM(FileMode)
     enum AcceptMode { AcceptOpen, AcceptSave };
     Q_ENUM(AcceptMode)
@@ -117,8 +122,12 @@ public:
     void selectUrl(const QUrl &url);
     QList<QUrl> selectedUrls() const;
 
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use setOption(HideNameFilterDetails, !enabled) instead")
     void setNameFilterDetailsVisible(bool enabled);
+    QT_DEPRECATED_X("Use !testOption(HideNameFilterDetails) instead")
     bool isNameFilterDetailsVisible() const;
+#endif
 
     void setNameFilter(const QString &filter);
     void setNameFilters(const QStringList &filters);
@@ -127,7 +136,7 @@ public:
     QString selectedMimeTypeFilter() const;
     QString selectedNameFilter() const;
 
-#ifndef QT_NO_MIMETYPE
+#if QT_CONFIG(mimetype)
     void setMimeTypeFilters(const QStringList &filters);
     QStringList mimeTypeFilters() const;
     void selectMimeTypeFilter(const QString &filter);
@@ -145,11 +154,15 @@ public:
     void setAcceptMode(AcceptMode mode);
     AcceptMode acceptMode() const;
 
+#if QT_DEPRECATED_SINCE(5, 13)
     void setReadOnly(bool enabled);
     bool isReadOnly() const;
 
+    QT_DEPRECATED_X("Use setOption(DontResolveSymlinks, !enabled) instead")
     void setResolveSymlinks(bool enabled);
+    QT_DEPRECATED_X("Use !testOption(DontResolveSymlinks) instead")
     bool resolveSymlinks() const;
+#endif
 
     void setSidebarUrls(const QList<QUrl> &urls);
     QList<QUrl> sidebarUrls() const;
@@ -157,8 +170,12 @@ public:
     QByteArray saveState() const;
     bool restoreState(const QByteArray &state);
 
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use setOption(DontConfirmOverwrite, !enabled) instead")
     void setConfirmOverwrite(bool enabled);
+    QT_DEPRECATED_X("Use !testOption(DontConfirmOverwrite) instead")
     bool confirmOverwrite() const;
+#endif
 
     void setDefaultSuffix(const QString &suffix);
     QString defaultSuffix() const;
@@ -263,6 +280,8 @@ public:
                                        Options options = Options(),
                                        const QStringList &supportedSchemes = QStringList());
 
+    static void getOpenFileContent(const QString &nameFilter,
+                                   const std::function<void(const QString &, const QByteArray &)> &fileContentsReady);
 
 protected:
     QFileDialog(const QFileDialogArgs &args);
diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h
index 3a93a53911..dcf147348f 100644
--- a/src/widgets/dialogs/qfiledialog_p.h
+++ b/src/widgets/dialogs/qfiledialog_p.h
@@ -98,7 +98,7 @@ class QPlatformDialogHelper;
 
 struct QFileDialogArgs
 {
-    QFileDialogArgs() : parent(0), mode(QFileDialog::AnyFile) {}
+    QFileDialogArgs() : parent(nullptr), mode(QFileDialog::AnyFile) {}
 
     QWidget *parent;
     QString caption;
@@ -116,6 +116,14 @@ class Q_WIDGETS_EXPORT QFileDialogPrivate : public QDialogPrivate
     Q_DECLARE_PUBLIC(QFileDialog)
 
 public:
+    using PersistentModelIndexList = QVector<QPersistentModelIndex>;
+
+    struct HistoryItem
+    {
+        QString path;
+        PersistentModelIndexList selection;
+    };
+
     QFileDialogPrivate();
 
     QPlatformFileDialogHelper *platformFileDialogHelper() const
@@ -164,13 +172,9 @@ public:
 
     QDir::Filters filterForMode(QDir::Filters filters) const
     {
-        const QFileDialog::FileMode fileMode = q_func()->fileMode();
-        if (fileMode == QFileDialog::DirectoryOnly) {
-            filters |= QDir::Drives | QDir::AllDirs | QDir::Dirs;
+        filters |= QDir::Drives | QDir::AllDirs | QDir::Dirs | QDir::Files;
+        if (q_func()->testOption(QFileDialog::ShowDirsOnly))
             filters &= ~QDir::Files;
-        } else {
-            filters |= QDir::Drives | QDir::AllDirs | QDir::Files | QDir::Dirs;
-        }
         return filters;
     }
 
@@ -187,7 +191,7 @@ public:
 #endif
     }
 
-#ifndef QT_NO_SETTINGS
+#if QT_CONFIG(settings)
     void saveSettings();
     bool restoreFromSettings();
 #endif
@@ -197,9 +201,11 @@ public:
     void retranslateWindowTitle();
     void retranslateStrings();
     void emitFilesSelected(const QStringList &files);
+    void saveHistorySelection();
 
     void _q_goHome();
     void _q_pathChanged(const QString &);
+    void navigate(HistoryItem &);
     void _q_navigateBackward();
     void _q_navigateForward();
     void _q_navigateToParent();
@@ -241,7 +247,7 @@ public:
 
     QString setWindowTitle;
 
-    QStringList currentHistory;
+    QList<HistoryItem> currentHistory;
     int currentHistoryLocation;
 
     QAction *renameAction;
@@ -290,13 +296,13 @@ private:
     virtual void helperPrepareShow(QPlatformDialogHelper *) override;
     virtual void helperDone(QDialog::DialogCode, QPlatformDialogHelper *) override;
 
-    Q_DISABLE_COPY(QFileDialogPrivate)
+    Q_DISABLE_COPY_MOVE(QFileDialogPrivate)
 };
 
 class QFileDialogLineEdit : public QLineEdit
 {
 public:
-    QFileDialogLineEdit(QWidget *parent = 0) : QLineEdit(parent), d_ptr(0){}
+    QFileDialogLineEdit(QWidget *parent = nullptr) : QLineEdit(parent), d_ptr(nullptr){}
     void setFileDialogPrivate(QFileDialogPrivate *d_pointer) {d_ptr = d_pointer; }
     void keyPressEvent(QKeyEvent *e) override;
     bool hideOnEsc;
@@ -307,7 +313,7 @@ private:
 class QFileDialogComboBox : public QComboBox
 {
 public:
-    QFileDialogComboBox(QWidget *parent = 0) : QComboBox(parent), urlModel(0) {}
+    QFileDialogComboBox(QWidget *parent = nullptr) : QComboBox(parent), urlModel(nullptr) {}
     void setFileDialogPrivate(QFileDialogPrivate *d_pointer);
     void showPopup() override;
     void setHistory(const QStringList &paths);
@@ -323,7 +329,7 @@ private:
 class QFileDialogListView : public QListView
 {
 public:
-    QFileDialogListView(QWidget *parent = 0);
+    QFileDialogListView(QWidget *parent = nullptr);
     void setFileDialogPrivate(QFileDialogPrivate *d_pointer);
     QSize sizeHint() const override;
 protected:
diff --git a/src/widgets/dialogs/qfileinfogatherer_p.h b/src/widgets/dialogs/qfileinfogatherer_p.h
index 134a14b7ce..795f60249f 100644
--- a/src/widgets/dialogs/qfileinfogatherer_p.h
+++ b/src/widgets/dialogs/qfileinfogatherer_p.h
@@ -166,7 +166,7 @@ Q_SIGNALS:
     void directoryLoaded(const QString &path);
 
 public:
-    explicit QFileInfoGatherer(QObject *parent = 0);
+    explicit QFileInfoGatherer(QObject *parent = nullptr);
     ~QFileInfoGatherer();
 
 #if QT_CONFIG(filesystemwatcher) && defined(Q_OS_WIN)
diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp
index 8b3549c3f5..d29f74e93d 100644
--- a/src/widgets/dialogs/qfilesystemmodel.cpp
+++ b/src/widgets/dialogs/qfilesystemmodel.cpp
@@ -2032,8 +2032,7 @@ bool QFileSystemModelPrivate::passNameFilters(const QFileSystemNode *node) const
                                             : QRegularExpression::CaseInsensitiveOption;
 
         for (const auto &nameFilter : nameFilters) {
-            const QString wildcard = QRegularExpression::wildcardToRegularExpression(nameFilter);
-            QRegularExpression rx(QRegularExpression::anchoredPattern(wildcard), options);
+            QRegularExpression rx(QRegularExpression::wildcardToRegularExpression(nameFilter), options);
             QRegularExpressionMatch match = rx.match(node->fileName);
             if (match.hasMatch())
                 return true;
diff --git a/src/widgets/dialogs/qfilesystemmodel_p.h b/src/widgets/dialogs/qfilesystemmodel_p.h
index 9c432e1ae6..d8f9f2b076 100644
--- a/src/widgets/dialogs/qfilesystemmodel_p.h
+++ b/src/widgets/dialogs/qfilesystemmodel_p.h
@@ -99,13 +99,13 @@ public:
     class QFileSystemNode
     {
     public:
-        explicit QFileSystemNode(const QString &filename = QString(), QFileSystemNode *p = 0)
-            : fileName(filename), populatedChildren(false), isVisible(false), dirtyChildrenIndex(-1), parent(p), info(0) {}
+        explicit QFileSystemNode(const QString &filename = QString(), QFileSystemNode *p = nullptr)
+            : fileName(filename), populatedChildren(false), isVisible(false), dirtyChildrenIndex(-1), parent(p), info(nullptr) {}
         ~QFileSystemNode() {
             qDeleteAll(children);
             delete info;
-            info = 0;
-            parent = 0;
+            info = nullptr;
+            parent = nullptr;
         }
 
         QString fileName;
@@ -116,7 +116,7 @@ public:
         inline qint64 size() const { if (info && !info->isDir()) return info->size(); return 0; }
         inline QString type() const { if (info) return info->displayType; return QLatin1String(""); }
         inline QDateTime lastModified() const { if (info) return info->lastModified(); return QDateTime(); }
-        inline QFile::Permissions permissions() const { if (info) return info->permissions(); return 0; }
+        inline QFile::Permissions permissions() const { if (info) return info->permissions(); return nullptr; }
         inline bool isReadable() const { return ((permissions() & QFile::ReadUser) != 0); }
         inline bool isWritable() const { return ((permissions() & QFile::WriteUser) != 0); }
         inline bool isExecutable() const { return ((permissions() & QFile::ExeUser) != 0); }
@@ -162,7 +162,7 @@ public:
             return info && (*info == fileInfo);
         }
 
-        inline bool hasInformation() const { return info != 0; }
+        inline bool hasInformation() const { return info != nullptr; }
 
         void populate(const QExtendedInformation &fileInfo) {
             if (!info)
diff --git a/src/widgets/dialogs/qfscompleter_p.h b/src/widgets/dialogs/qfscompleter_p.h
index 3b829d4a52..f5110a7622 100644
--- a/src/widgets/dialogs/qfscompleter_p.h
+++ b/src/widgets/dialogs/qfscompleter_p.h
@@ -64,8 +64,8 @@ QT_BEGIN_NAMESPACE
   */
 class Q_WIDGETS_EXPORT QFSCompleter :  public QCompleter {
 public:
-    explicit QFSCompleter(QFileSystemModel *model, QObject *parent = 0)
-        : QCompleter(model, parent), proxyModel(0), sourceModel(model)
+    explicit QFSCompleter(QFileSystemModel *model, QObject *parent = nullptr)
+        : QCompleter(model, parent), proxyModel(nullptr), sourceModel(model)
     {
 #if defined(Q_OS_WIN)
         setCaseSensitivity(Qt::CaseInsensitive);
diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp
index 5a7d6edddf..3cfe8367e0 100644
--- a/src/widgets/dialogs/qinputdialog.cpp
+++ b/src/widgets/dialogs/qinputdialog.cpp
@@ -168,6 +168,18 @@ private:
     }
 };
 
+class QInputDialogListView : public QListView
+{
+public:
+    QInputDialogListView(QWidget *parent = 0) : QListView(parent) {}
+    QVariant inputMethodQuery(Qt::InputMethodQuery query) const override
+    {
+        if (query == Qt::ImEnabled)
+            return false;
+        return QListView::inputMethodQuery(query);
+    }
+};
+
 class QInputDialogPrivate : public QDialogPrivate
 {
     Q_DECLARE_PUBLIC(QInputDialog)
@@ -201,7 +213,7 @@ public:
     mutable QSpinBox *intSpinBox;
     mutable QDoubleSpinBox *doubleSpinBox;
     mutable QComboBox *comboBox;
-    mutable QListView *listView;
+    mutable QInputDialogListView *listView;
     mutable QWidget *inputWidget;
     mutable QVBoxLayout *mainLayout;
     QInputDialog::InputDialogOptions opts;
@@ -298,8 +310,7 @@ void QInputDialogPrivate::ensureListView()
     Q_Q(QInputDialog);
     if (!listView) {
         ensureComboBox();
-
-        listView = new QListView(q);
+        listView = new QInputDialogListView(q);
         listView->hide();
         listView->setEditTriggers(QAbstractItemView::NoEditTriggers);
         listView->setSelectionMode(QAbstractItemView::SingleSelection);
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp
index 99157747dd..f143e3b527 100644
--- a/src/widgets/dialogs/qmessagebox.cpp
+++ b/src/widgets/dialogs/qmessagebox.cpp
@@ -113,7 +113,7 @@ public:
         , copyAvailable(false)
     {
         QVBoxLayout *layout = new QVBoxLayout;
-        layout->setMargin(0);
+        layout->setContentsMargins(QMargins());
         QFrame *line = new QFrame(this);
         line->setFrameShape(QFrame::HLine);
         line->setFrameShadow(QFrame::Sunken);
@@ -209,6 +209,7 @@ public:
     void setupLayout();
     void _q_buttonClicked(QAbstractButton *);
     void _q_clicked(QPlatformDialogHelper::StandardButton button, QPlatformDialogHelper::ButtonRole role);
+    void setClickedButton(QAbstractButton *button);
 
     QAbstractButton *findButton(int button0, int button1, int button2, int flags);
     void addOldButtons(int button0, int button1, int button2);
@@ -216,6 +217,8 @@ public:
     QAbstractButton *abstractButtonForId(int id) const;
     int execReturnCode(QAbstractButton *button);
 
+    int dialogCodeForButton(QAbstractButton *button) const;
+
     void detectEscapeButton();
     void updateSize();
     int layoutMinimumWidth();
@@ -466,6 +469,27 @@ int QMessageBoxPrivate::execReturnCode(QAbstractButton *button)
     return ret;
 }
 
+/*!
+    \internal
+
+    Returns 0 for RejectedRole and NoRole, 1 for AcceptedRole and YesRole, -1 otherwise
+ */
+int QMessageBoxPrivate::dialogCodeForButton(QAbstractButton *button) const
+{
+    Q_Q(const QMessageBox);
+
+    switch (q->buttonRole(button)) {
+    case QMessageBox::AcceptRole:
+    case QMessageBox::YesRole:
+        return QDialog::Accepted;
+    case QMessageBox::RejectRole:
+    case QMessageBox::NoRole:
+        return QDialog::Rejected;
+    default:
+        return -1;
+    }
+}
+
 void QMessageBoxPrivate::_q_buttonClicked(QAbstractButton *button)
 {
     Q_Q(QMessageBox);
@@ -477,20 +501,30 @@ void QMessageBoxPrivate::_q_buttonClicked(QAbstractButton *button)
     } else
 #endif
     {
-        clickedButton = button;
-        q->done(execReturnCode(button)); // does not trigger closeEvent
-        emit q->buttonClicked(button);
+        setClickedButton(button);
 
         if (receiverToDisconnectOnClose) {
             QObject::disconnect(q, signalToDisconnectOnClose, receiverToDisconnectOnClose,
                                 memberToDisconnectOnClose);
-            receiverToDisconnectOnClose = 0;
+            receiverToDisconnectOnClose = nullptr;
         }
         signalToDisconnectOnClose.clear();
         memberToDisconnectOnClose.clear();
     }
 }
 
+void QMessageBoxPrivate::setClickedButton(QAbstractButton *button)
+{
+    Q_Q(QMessageBox);
+
+    clickedButton = button;
+    emit q->buttonClicked(clickedButton);
+
+    auto resultCode = execReturnCode(button);
+    hide(resultCode);
+    finalize(resultCode, dialogCodeForButton(button));
+}
+
 void QMessageBoxPrivate::_q_clicked(QPlatformDialogHelper::StandardButton button, QPlatformDialogHelper::ButtonRole role)
 {
     Q_Q(QMessageBox);
@@ -800,7 +834,7 @@ QMessageBox::QMessageBox(QWidget *parent)
     The message box is an \l{Qt::ApplicationModal} {application modal}
     dialog box.
 
-    On \macos, if \a parent is not 0 and you want your message box
+    On \macos, if \a parent is not \nullptr and you want your message box
     to appear as a Qt::Sheet of that parent, set the message box's
     \l{setWindowModality()} {window modality} to Qt::WindowModal
     (default). Otherwise, the message box will be a standard dialog.
@@ -949,7 +983,7 @@ QMessageBox::StandardButton QMessageBox::standardButton(QAbstractButton *button)
     \since 4.2
 
     Returns a pointer corresponding to the standard button \a which,
-    or 0 if the standard button doesn't exist in this message box.
+    or \nullptr if the standard button doesn't exist in this message box.
 
     \sa standardButtons, standardButton()
 */
@@ -1072,7 +1106,7 @@ void QMessageBoxPrivate::detectEscapeButton()
     \since 4.2
 
     Returns the button that was clicked by the user,
-    or 0 if the user hit the \uicontrol Esc key and
+    or \nullptr if the user hit the \uicontrol Esc key and
     no \l{setEscapeButton()}{escape button} was set.
 
     If exec() hasn't been called yet, returns nullptr.
@@ -1139,7 +1173,7 @@ void QMessageBox::setDefaultButton(QMessageBox::StandardButton button)
 /*! \since 5.2
 
     Sets the checkbox \a cb on the message dialog. The message box takes ownership of the checkbox.
-    The argument \a cb can be 0 to remove an existing checkbox from the message box.
+    The argument \a cb can be \nullptr to remove an existing checkbox from the message box.
 
     \sa checkBox()
 */
@@ -1171,7 +1205,7 @@ void QMessageBox::setCheckBox(QCheckBox *cb)
 
 /*! \since 5.2
 
-    Returns the checkbox shown on the dialog. This is 0 if no checkbox is set.
+    Returns the checkbox shown on the dialog. This is \nullptr if no checkbox is set.
     \sa setCheckBox()
 */
 
@@ -1536,7 +1570,7 @@ QList<QAbstractButton *> QMessageBox::buttons() const
     \since 4.5
 
     Returns the button role for the specified \a button. This function returns
-    \l InvalidRole if \a button is 0 or has not been added to the message box.
+    \l InvalidRole if \a button is \nullptr or has not been added to the message box.
 
     \sa buttons(), addButton()
 */
@@ -1801,7 +1835,7 @@ void QMessageBox::about(QWidget *parent, const QString &title, const QString &te
 
 /*!
     Displays a simple message box about Qt, with the given \a title
-    and centered over \a parent (if \a parent is not 0). The message
+    and centered over \a parent (if \a parent is not \nullptr). The message
     includes the version number of Qt being used by the application.
 
     This is useful for inclusion in the \uicontrol Help menu of an application,
@@ -1832,22 +1866,23 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title)
         "<h3>About Qt</h3>"
         "<p>This program uses Qt version %1.</p>"
         ).arg(QLatin1String(QT_VERSION_STR));
-    QString translatedTextAboutQtText;
-    translatedTextAboutQtText = QMessageBox::tr(
+    //: Leave this text untranslated or include a verbatim copy of it below
+    //: and note that it is the authoritative version in case of doubt.
+    const QString translatedTextAboutQtText = QMessageBox::tr(
         "<p>Qt is a C++ toolkit for cross-platform application "
         "development.</p>"
         "<p>Qt provides single-source portability across all major desktop "
         "operating systems. It is also available for embedded Linux and other "
         "embedded and mobile operating systems.</p>"
-        "<p>Qt is available under three different licensing options designed "
+        "<p>Qt is available under multiple licensing options designed "
         "to accommodate the needs of our various users.</p>"
         "<p>Qt licensed under our commercial license agreement is appropriate "
         "for development of proprietary/commercial software where you do not "
         "want to share any source code with third parties or otherwise cannot "
-        "comply with the terms of the GNU LGPL version 3.</p>"
-        "<p>Qt licensed under the GNU LGPL version 3 is appropriate for the "
+        "comply with the terms of GNU (L)GPL.</p>"
+        "<p>Qt licensed under GNU (L)GPL is appropriate for the "
         "development of Qt&nbsp;applications provided you can comply with the terms "
-        "and conditions of the GNU LGPL version 3.</p>"
+        "and conditions of the respective licenses.</p>"
         "<p>Please see <a href=\"http://%2/\">%2</a> "
         "for an overview of Qt licensing.</p>"
         "<p>Copyright (C) %1 The Qt Company Ltd and other "
@@ -1855,7 +1890,7 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title)
         "<p>Qt and the Qt logo are trademarks of The Qt Company Ltd.</p>"
         "<p>Qt is The Qt Company Ltd product developed as an open source "
         "project. See <a href=\"http://%3/\">%3</a> for more information.</p>"
-        ).arg(QStringLiteral("2018"),
+        ).arg(QStringLiteral("2019"),
               QStringLiteral("qt.io/licensing"),
               QStringLiteral("qt.io"));
     QMessageBox *msgBox = new QMessageBox(parent);
diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h
index 4b993a9e65..0a2edb1eee 100644
--- a/src/widgets/dialogs/qmessagebox.h
+++ b/src/widgets/dialogs/qmessagebox.h
@@ -284,9 +284,9 @@ public:
 Q_SIGNALS:
     void buttonClicked(QAbstractButton *button);
 
-#ifdef Q_QDOC
+#ifdef Q_CLANG_QDOC
 public Q_SLOTS:
-    int exec();
+    int exec() override;
 #endif
 
 protected:
diff --git a/src/widgets/dialogs/qprogressdialog.cpp b/src/widgets/dialogs/qprogressdialog.cpp
index 4bf78e2115..078dd6463b 100644
--- a/src/widgets/dialogs/qprogressdialog.cpp
+++ b/src/widgets/dialogs/qprogressdialog.cpp
@@ -47,7 +47,6 @@
 #include "qapplication.h"
 #include "qstyle.h"
 #include "qpushbutton.h"
-#include "qcursor.h"
 #include "qtimer.h"
 #include "qelapsedtimer.h"
 #include <private/qdialog_p.h>
@@ -94,9 +93,6 @@ public:
     bool cancellation_flag;
     bool setValue_called;
     QElapsedTimer starttime;
-#ifndef QT_NO_CURSOR
-    QCursor parentCursor;
-#endif
     int showTime;
     bool autoClose;
     bool autoReset;
@@ -397,7 +393,7 @@ void QProgressDialog::setLabelText(const QString &text)
   Sets the cancel button to the push button, \a cancelButton. The
   progress dialog takes ownership of this button which will be deleted
   when necessary, so do not pass the address of an object that is on
-  the stack, i.e. use new() to create the button.  If 0 is passed then
+  the stack, i.e. use new() to create the button.  If \nullptr is passed,
   no cancel button will be shown.
 
   \sa setCancelButtonText()
@@ -597,12 +593,6 @@ void QProgressDialog::setRange(int minimum, int maximum)
 void QProgressDialog::reset()
 {
     Q_D(QProgressDialog);
-#ifndef QT_NO_CURSOR
-    if (value() >= 0) {
-        if (parentWidget())
-            parentWidget()->setCursor(d->parentCursor);
-    }
-#endif
     if (d->autoClose || d->forceHide)
         hide();
     d->bar->reset();
diff --git a/src/widgets/dialogs/qsidebar_p.h b/src/widgets/dialogs/qsidebar_p.h
index 4a82f88878..6056f19452 100644
--- a/src/widgets/dialogs/qsidebar_p.h
+++ b/src/widgets/dialogs/qsidebar_p.h
@@ -67,7 +67,7 @@ class QFileSystemModel;
 class QSideBarDelegate : public QStyledItemDelegate
 {
  public:
-     QSideBarDelegate(QWidget *parent = 0) : QStyledItemDelegate(parent) {}
+     QSideBarDelegate(QWidget *parent = nullptr) : QStyledItemDelegate(parent) {}
      void initStyleOption(QStyleOptionViewItem *option,
                           const QModelIndex &index) const override;
 };
@@ -82,7 +82,7 @@ public:
         EnabledRole = Qt::UserRole + 2
     };
 
-    QUrlModel(QObject *parent = 0);
+    QUrlModel(QObject *parent = nullptr);
 
     QStringList mimeTypes() const override;
     QMimeData *mimeData(const QModelIndexList &indexes) const override;
@@ -127,7 +127,7 @@ Q_SIGNALS:
     void goToUrl(const QUrl &url);
 
 public:
-    QSidebar(QWidget *parent = 0);
+    QSidebar(QWidget *parent = nullptr);
     void setModelAndUrls(QFileSystemModel *model, const QList<QUrl> &newUrls);
     ~QSidebar();
 
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
index 3876cf16c6..f428114bbe 100644
--- a/src/widgets/dialogs/qwizard.cpp
+++ b/src/widgets/dialogs/qwizard.cpp
@@ -331,7 +331,7 @@ QWizardHeader::QWizardHeader(QWidget *parent)
     titleLabel->setFont(font);
 
     layout = new QGridLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(QMargins());
     layout->setSpacing(0);
 
     layout->setRowMinimumHeight(3, 1);
@@ -456,7 +456,7 @@ public:
 
     QSize minimumSizeHint() const override {
         if (pixmap() && !pixmap()->isNull())
-            return pixmap()->size();
+            return pixmap()->size() / pixmap()->devicePixelRatio();
         return QFrame::minimumSizeHint();
     }
 
@@ -769,7 +769,7 @@ void QWizardPrivate::reset()
         for (int i = history.count() - 1; i >= 0; --i)
             q->cleanupPage(history.at(i));
         history.clear();
-        for (QWizardPage *page : pageMap)
+        for (QWizardPage *page : qAsConst(pageMap))
             page->d_func()->initialized = false;
 
         current = -1;
@@ -1032,13 +1032,13 @@ void QWizardPrivate::recreateLayout(const QWizardLayoutInfo &info)
     int pageColumn = qMin(1, numColumns - 1);
 
     if (mac) {
-        mainLayout->setMargin(0);
+        mainLayout->setContentsMargins(QMargins());
         mainLayout->setSpacing(0);
         buttonLayout->setContentsMargins(MacLayoutLeftMargin, MacButtonTopMargin, MacLayoutRightMargin, MacLayoutBottomMargin);
-        pageVBoxLayout->setMargin(7);
+        pageVBoxLayout->setContentsMargins(7, 7, 7, 7);
     } else {
         if (modern) {
-            mainLayout->setMargin(0);
+            mainLayout->setContentsMargins(QMargins());
             mainLayout->setSpacing(0);
             pageVBoxLayout->setContentsMargins(deltaMarginLeft, deltaMarginTop,
                                                deltaMarginRight, deltaMarginBottom);
@@ -1595,23 +1595,25 @@ bool QWizardPrivate::handleAeroStyleChange()
     bool vistaMargins = false;
 
     if (isVistaThemeEnabled()) {
+        const int topOffset = vistaHelper->topOffset();
+        const int topPadding = vistaHelper->topPadding();
         if (isVistaThemeEnabled(QVistaHelper::VistaAero)) {
             if (isWindow) {
                 vistaHelper->setDWMTitleBar(QVistaHelper::ExtendedTitleBar);
                 q->installEventFilter(vistaHelper);
             }
             q->setMouseTracking(true);
-            antiFlickerWidget->move(0, vistaHelper->titleBarSize() + vistaHelper->topOffset());
+            antiFlickerWidget->move(0, vistaHelper->titleBarSize() + topOffset);
             vistaHelper->backButton()->move(
-                0, vistaHelper->topOffset() // ### should ideally work without the '+ 1'
-                - qMin(vistaHelper->topOffset(), vistaHelper->topPadding() + 1));
+                0, topOffset // ### should ideally work without the '+ 1'
+                - qMin(topOffset, topPadding + 1));
             vistaMargins = true;
             vistaHelper->backButton()->show();
         } else {
             if (isWindow)
                 vistaHelper->setDWMTitleBar(QVistaHelper::NormalTitleBar);
             q->setMouseTracking(true);
-            antiFlickerWidget->move(0, vistaHelper->topOffset());
+            antiFlickerWidget->move(0, topOffset);
             vistaHelper->backButton()->move(0, -1); // ### should ideally work with (0, 0)
         }
         if (isWindow)
@@ -2374,8 +2376,8 @@ void QWizard::removePage(int id)
 /*!
     \fn QWizardPage *QWizard::page(int id) const
 
-    Returns the page with the given \a id, or 0 if there is no such
-    page.
+    Returns the page with the given \a id, or \nullptr if there is no
+    such page.
 
     \sa addPage(), setPage()
 */
@@ -2462,8 +2464,8 @@ int QWizard::startId() const
 }
 
 /*!
-    Returns a pointer to the current page, or 0 if there is no current
-    page (e.g., before the wizard is shown).
+    Returns a pointer to the current page, or \nullptr if there is no
+    current page (e.g., before the wizard is shown).
 
     This is equivalent to calling page(currentId()).
 
@@ -2954,7 +2956,7 @@ void QWizard::setDefaultProperty(const char *className, const char *property,
 
     Passing 0 shows no side widget.
 
-    When the \a widget is not 0 the wizard reparents it.
+    When the \a widget is not \nullptr the wizard reparents it.
 
     Any previous side widget is hidden.
 
@@ -2963,7 +2965,7 @@ void QWizard::setDefaultProperty(const char *className, const char *property,
 
     All widgets set here will be deleted by the wizard when it is
     destroyed unless you separately reparent the widget after setting
-    some other side widget (or 0).
+    some other side widget (or \nullptr).
 
     By default, no side widget is present.
 */
@@ -2981,7 +2983,7 @@ void QWizard::setSideWidget(QWidget *widget)
 /*!
     \since 4.7
 
-    Returns the widget on the left side of the wizard or 0.
+    Returns the widget on the left side of the wizard or \nullptr.
 
     By default, no side widget is present.
 */
@@ -3257,7 +3259,11 @@ void QWizard::paintEvent(QPaintEvent * event)
 /*!
     \reimp
 */
+#  if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QWizard::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
+#  else
 bool QWizard::nativeEvent(const QByteArray &eventType, void *message, long *result)
+#  endif
 {
 #if QT_CONFIG(style_windowsvista)
     Q_D(QWizard);
@@ -3969,7 +3975,7 @@ void QWizardPage::registerField(const QString &name, QWidget *widget, const char
 }
 
 /*!
-    Returns the wizard associated with this page, or 0 if this page
+    Returns the wizard associated with this page, or \nullptr if this page
     hasn't been inserted into a QWizard yet.
 
     \sa QWizard::addPage(), QWizard::setPage()
diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h
index 0dd837b197..ef71efa0cb 100644
--- a/src/widgets/dialogs/qwizard.h
+++ b/src/widgets/dialogs/qwizard.h
@@ -188,7 +188,11 @@ protected:
     void resizeEvent(QResizeEvent *event) override;
     void paintEvent(QPaintEvent *event) override;
 #if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC)
+#  if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override;
+#  else
     bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
+#  endif
 #endif
     void done(int result) override;
     virtual void initializePage(int id);
diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp
index aa9ad7f290..95f8f6a878 100644
--- a/src/widgets/dialogs/qwizard_win.cpp
+++ b/src/widgets/dialogs/qwizard_win.cpp
@@ -172,7 +172,7 @@ void QVistaHelper::updateCustomMargins(bool vistaMargins)
         const QMargins customMarginsDp = vistaMargins
             ? QMargins(0, -titleBarSizeDp(), 0, 0)
             : QMargins();
-        const QVariant customMarginsV = qVariantFromValue(customMarginsDp);
+        const QVariant customMarginsV = QVariant::fromValue(customMarginsDp);
         // The dynamic property takes effect when creating the platform window.
         window->setProperty("_q_windowsCustomMargins", customMarginsV);
         // If a platform window exists, change via native interface.
@@ -293,9 +293,9 @@ void QVistaHelper::drawTitleBar(QPainter *painter)
     int glowOffset = 0;
 
     if (vistaState() == VistaAero) {
-        textHeight += 2 * glowSize();
-        textWidth += 2 * glowSize();
         glowOffset = glowSize();
+        textHeight += 2 * glowOffset;
+        textWidth += 2 * glowOffset;
     }
 
     const int titleLeft = (wizard->layoutDirection() == Qt::LeftToRight
@@ -339,7 +339,11 @@ void QVistaHelper::setTitleBarIconAndCaptionVisible(bool visible)
         SetWindowThemeAttribute(handle, WTA_NONCLIENT, &opt, sizeof(WTA_OPTIONS));
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QVistaHelper::winEvent(MSG* msg, qintptr *result)
+#else
 bool QVistaHelper::winEvent(MSG* msg, long* result)
+#endif
 {
     switch (msg->message) {
     case WM_NCHITTEST: {
@@ -401,7 +405,11 @@ void QVistaHelper::mouseEvent(QEvent *event)
     }
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QVistaHelper::handleWinEvent(MSG *message, qintptr *result)
+#else
 bool QVistaHelper::handleWinEvent(MSG *message, long *result)
+#endif
 {
     if (message->message == WM_THEMECHANGED || message->message == WM_DWMCOMPOSITIONCHANGED)
         cachedVistaState = Dirty;
@@ -509,7 +517,11 @@ bool QVistaHelper::eventFilter(QObject *obj, QEvent *event)
 
     if (event->type() == QEvent::MouseMove) {
         QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        qintptr result;
+#else
         long result;
+#endif
         MSG msg;
         msg.message = WM_NCHITTEST;
         msg.wParam  = 0;
@@ -523,7 +535,11 @@ bool QVistaHelper::eventFilter(QObject *obj, QEvent *event)
         QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
 
         if (mouseEvent->button() == Qt::LeftButton) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            qintptr result;
+#else
             long result;
+#endif
             MSG msg;
             msg.message = WM_NCHITTEST;
             msg.wParam  = 0;
@@ -538,7 +554,11 @@ bool QVistaHelper::eventFilter(QObject *obj, QEvent *event)
         QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
 
         if (mouseEvent->button() == Qt::LeftButton) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            qintptr result;
+#else
             long result;
+#endif
             MSG msg;
             msg.message = WM_NCHITTEST;
             msg.wParam  = 0;
diff --git a/src/widgets/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h
index d302dedaa3..b3796e3f48 100644
--- a/src/widgets/dialogs/qwizard_win_p.h
+++ b/src/widgets/dialogs/qwizard_win_p.h
@@ -84,7 +84,7 @@ class QWizard;
 
 class QVistaHelper : public QObject
 {
-    Q_DISABLE_COPY(QVistaHelper)
+    Q_DISABLE_COPY_MOVE(QVistaHelper)
 public:
     QVistaHelper(QWizard *wizard);
     ~QVistaHelper() override;
@@ -93,7 +93,11 @@ public:
     bool setDWMTitleBar(TitleBarChangeType type);
     void setTitleBarIconAndCaptionVisible(bool visible);
     void mouseEvent(QEvent *event);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool handleWinEvent(MSG *message, qintptr *result);
+#else
     bool handleWinEvent(MSG *message, long *result);
+#endif
     void resizeEvent(QResizeEvent *event);
     void paintEvent(QPaintEvent *event);
     QVistaBackButton *backButton() const { return backButton_; }
@@ -130,7 +134,11 @@ private:
     void drawTitleBar(QPainter *painter);
     void setMouseCursor(QPoint pos);
     void collapseTopFrameStrut();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool winEvent(MSG *message, qintptr *result);
+#else
     bool winEvent(MSG *message, long *result);
+#endif
     void mouseMoveEvent(QMouseEvent *event);
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
diff --git a/src/widgets/doc/images/gridlayout.png b/src/widgets/doc/images/qgridlayout.png
index ae76c0487b..ae76c0487b 100644
--- a/src/widgets/doc/images/gridlayout.png
+++ b/src/widgets/doc/images/qgridlayout.png
diff --git a/src/widgets/doc/qtwidgets.qdocconf b/src/widgets/doc/qtwidgets.qdocconf
index 4700ee29bf..5d7262fca1 100644
--- a/src/widgets/doc/qtwidgets.qdocconf
+++ b/src/widgets/doc/qtwidgets.qdocconf
@@ -40,6 +40,9 @@ exampledirs += ../../../examples/widgets \
 
 excludedirs += snippets
 
+# Included in qttestlib.qdocconf instead
+excludefiles += ../kernel/qtestsupport_widgets.cpp
+
 imagedirs   += images \
                ../../../doc/src/images \
                ../../../examples/widgets/doc/images \
diff --git a/src/widgets/doc/snippets/code/doc_src_examples_dropsite.qdoc b/src/widgets/doc/snippets/code/doc_src_examples_dropsite.qdoc
deleted file mode 100644
index a91933cdce..0000000000
--- a/src/widgets/doc/snippets/code/doc_src_examples_dropsite.qdoc
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [0]
-\code
-foreach(variable, container)
-\endcode
-//! [0]
diff --git a/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc b/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc
index 48d8954e60..098eaf4717 100644
--- a/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc
+++ b/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc
@@ -956,6 +956,7 @@ QLineEdit[echoMode="2"] {
 //! [119]
 QLineEdit:read-only {
     background: lightblue;
+}
 //! [119]
 
 
diff --git a/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp b/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp
index 58f0ae560f..1e9daf824b 100644
--- a/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp
@@ -140,3 +140,18 @@ QFileDialog dialog(this);
 dialog.setMimeTypeFilters(mimeTypeFilters);
 dialog.exec();
 //! [13]
+
+//! [14]
+"Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)"
+//! [14]
+
+//! [14]
+auto fileOpenCompleted = [](const QSting &fileName, const QByteArray &fileContent) {
+    if (fileName.isEmpty()) {
+        // No file was selected
+    } else {
+        // Use fileName and fileContent
+    }
+}
+QFileDialog::getOpenFileContent("Images (*.png *.xpm *.jpg)",  fileContentReady);
+//! [14]
diff --git a/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
index 8d8c63db9e..ebca9d5368 100644
--- a/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
@@ -271,3 +271,18 @@ QRect deviceRect = xform.mapRect(rect).toAlignedRect();
 view->viewport()->scroll(dx, dy, deviceRect);
 //! [19]
 
+//! [20]
+item->setTransform(QTransform().rotate(angle), true);
+//! [20]
+
+//! [21]
+setTransform(QTransform::fromScale(sx, sy), true);
+//! [21]
+
+//! [22]
+setTransform(QTransform().shear(sh, sv), true);
+//! [22]
+
+//! [23]
+setTransform(QTransform::fromTranslate(dx, dy), true);
+//! [23]
diff --git a/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp b/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp
index 4dad563660..cc1568cb9d 100644
--- a/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp
@@ -59,7 +59,7 @@ mapper->toFirst();
 
 
 //! [1]
-QDataWidgetMapper *mapper = new QDataWidgetMapper();
+QDataWidgetMapper *mapper = new QDataWidgetMapper;
 mapper->setModel(myModel);
 mapper->addMapping(nameLineEdit, 0);
 mapper->addMapping(ageSpinBox, 1);
@@ -67,7 +67,7 @@ mapper->addMapping(ageSpinBox, 1);
 
 
 //! [2]
-QDataWidgetMapper *mapper = new QDataWidgetMapper();
-connect(myTableView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
-        mapper, SLOT(setCurrentModelIndex(QModelIndex)));
+QDataWidgetMapper *mapper = new QDataWidgetMapper;
+connect(myTableView->selectionModel(), &QItemSelectionModel::currentRowChanged,
+        mapper, &QDataWidgetMapper::setCurrentModelIndex);
 //! [2]
diff --git a/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp b/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp
index a907a0421f..0a70c1d32a 100644
--- a/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp
@@ -100,7 +100,8 @@ QSize MyWidget::sizeHint() const
 //! [4]
 void showAllHiddenTopLevelWidgets()
 {
-    foreach (QWidget *widget, QApplication::topLevelWidgets()) {
+    const QWidgetList topLevelWidgets = QApplication::topLevelWidgets();
+    for (QWidget *widget : topLevelWidgets) {
         if (widget->isHidden())
             widget->show();
     }
@@ -111,7 +112,8 @@ void showAllHiddenTopLevelWidgets()
 //! [5]
 void updateAllWidgets()
 {
-    foreach (QWidget *widget, QApplication::allWidgets())
+    const QWidgetList allWidgets = QApplication::allWidgets();
+    for (QWidget *widget : allWidgets)
         widget->update();
 }
 //! [5]
@@ -171,13 +173,15 @@ appname -session id
 
 
 //! [10]
-foreach (const QString &command, mySession.restartCommand())
+const QStringList commands = mySession.restartCommand();
+for (const QString &command : commands)
     do_something(command);
 //! [10]
 
 
 //! [11]
-foreach (const QString &command, mySession.discardCommand())
+const QStringList commands = mySession.discardCommand();
+for (const QString &command : commands)
     do_something(command);
 //! [11]
 
diff --git a/src/widgets/doc/snippets/code/src_gui_kernel_qformlayout.cpp b/src/widgets/doc/snippets/code/src_gui_kernel_qformlayout.cpp
index eadf753ded..a2ac780a82 100644
--- a/src/widgets/doc/snippets/code/src_gui_kernel_qformlayout.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_kernel_qformlayout.cpp
@@ -84,3 +84,51 @@ formLayout->setFieldGrowthPolicy(QFormLayout::FieldsStayAtSizeHint);
 formLayout->setFormAlignment(Qt::AlignHCenter | Qt::AlignTop);
 formLayout->setLabelAlignment(Qt::AlignLeft);
 //! [2]
+
+//! [3]
+QFormLayout *flay = ...;
+QPointer<QLineEdit> le = new QLineEdit;
+flay->insertRow(2, "User:", le);
+// later:
+flay->removeRow(2); // le == nullptr at this point
+//! [3]
+
+//! [4]
+QFormLayout *flay = ...;
+QPointer<QLineEdit> le = new QLineEdit;
+flay->insertRow(2, "User:", le);
+// later:
+flay->removeRow(le); // le == nullptr at this point
+//! [4]
+
+//! [5]
+QFormLayout *flay = ...;
+QPointer<QVBoxLayout> vbl = new QVBoxLayout;
+flay->insertRow(2, "User:", vbl);
+// later:
+flay->removeRow(layout); // vbl == nullptr at this point
+//! [5]
+
+//! [6]
+QFormLayout *flay = ...;
+QPointer<QLineEdit> le = new QLineEdit;
+flay->insertRow(2, "User:", le);
+// later:
+QFormLayout::TakeRowResult result = flay->takeRow(2);
+//! [6]
+
+//! [7]
+QFormLayout *flay = ...;
+QPointer<QLineEdit> le = new QLineEdit;
+flay->insertRow(2, "User:", le);
+// later:
+QFormLayout::TakeRowResult result = flay->takeRow(widget);
+//! [7]
+
+//! [8]
+QFormLayout *flay = ...;
+QPointer<QVBoxLayout> vbl = new QVBoxLayout;
+flay->insertRow(2, "User:", vbl);
+// later:
+QFormLayout::TakeRowResult result = flay->takeRow(widget);
+//! [8]
diff --git a/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp
index 4b1c4cd645..da3fd28056 100644
--- a/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp
@@ -81,7 +81,7 @@ exec(e->globalPos());
 //! [6]
 QMenu menu;
 QAction *at = actions[0]; // Assumes actions is not empty
-foreach (QAction *a, actions)
+for (QAction *a : qAsConst(actions))
     menu.addAction(a);
 menu.exec(pos, at);
 //! [6]
diff --git a/src/widgets/doc/snippets/code/src_widgets_util_qscroller.cpp b/src/widgets/doc/snippets/code/src_widgets_util_qscroller.cpp
new file mode 100644
index 0000000000..2b3d825266
--- /dev/null
+++ b/src/widgets/doc/snippets/code/src_widgets_util_qscroller.cpp
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWidgets module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+    QWidget *w = ...;
+    QScroller::grabGesture(w, QScroller::LeftMouseButtonGesture);
+//! [0]
+
+//! [1]
+    QWidget *w = ...;
+    QScroller *scroller = QScroller::scroller(w);
+    scroller->scrollTo(QPointF(100, 100));
+//! [1]
diff --git a/src/widgets/doc/snippets/code/src_widgets_widgets_qmainwindow.cpp b/src/widgets/doc/snippets/code/src_widgets_widgets_qmainwindow.cpp
new file mode 100644
index 0000000000..8ebaaf3991
--- /dev/null
+++ b/src/widgets/doc/snippets/code/src_widgets_widgets_qmainwindow.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWidgets module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+    void MainWindow::createMenus()
+    {
+        fileMenu = menuBar()->addMenu(tr("&File"));
+        fileMenu->addAction(newAct);
+        fileMenu->addAction(openAct);
+        fileMenu->addAction(saveAct);
+//! [0]
+
+//! [1]
+    void MainWindow::createToolBars()
+    {
+        fileToolBar = addToolBar(tr("File"));
+        fileToolBar->addAction(newAct);
+//! [1]
+
+//! [2]
+    resizeDocks({blueWidget, yellowWidget}, {20 , 40}, Qt::Horizontal);
+//! [2]
diff --git a/src/widgets/doc/snippets/dialogs/dialogs.cpp b/src/widgets/doc/snippets/dialogs/dialogs.cpp
index cca3ac8d75..7fa793c70f 100644
--- a/src/widgets/doc/snippets/dialogs/dialogs.cpp
+++ b/src/widgets/doc/snippets/dialogs/dialogs.cpp
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 typedef QDialog WordCountDialog;
 typedef QDialog FindDialog;
@@ -76,7 +76,8 @@ void EditorWindow::find()
 {
     if (!findDialog) {
         findDialog = new FindDialog(this);
-        connect(findDialog, SIGNAL(findNext()), this, SLOT(findNext()));
+        connect(findDialog, &FindDialog::findNext,
+                this, &EditorWindow::findNext);
     }
 
     findDialog->show();
@@ -249,9 +250,9 @@ Operation::Operation(QObject *parent)
     : QObject(parent), steps(0)
 {
     pd = new QProgressDialog("Operation in progress.", "Cancel", 0, 100);
-    connect(pd, SIGNAL(canceled()), this, SLOT(cancel()));
+    connect(pd, &QProgressDialog::canceled, this, &Operation::cancel);
     t = new QTimer(this);
-    connect(t, SIGNAL(timeout()), this, SLOT(perform()));
+    connect(t, &QTimer::timeout, this, &Operation::perform);
     t->start(0);
 }
 //! [4] //! [5]
diff --git a/src/widgets/doc/snippets/dockwidgets/mainwindow.cpp b/src/widgets/doc/snippets/dockwidgets/mainwindow.cpp
index f6959cc12b..53f91589bf 100644
--- a/src/widgets/doc/snippets/dockwidgets/mainwindow.cpp
+++ b/src/widgets/doc/snippets/dockwidgets/mainwindow.cpp
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "mainwindow.h"
 
@@ -63,8 +63,8 @@ MainWindow::MainWindow(QWidget *parent)
 
     textBrowser = new QTextBrowser(this);
 
-    connect(headingList, SIGNAL(itemClicked(QListWidgetItem*)),
-            this, SLOT(updateText(QListWidgetItem*)));
+    connect(headingList, &QListWidget::itemClicked,
+            this, &MainWindow::updateText);
 
     updateText(headingList->item(0));
     headingList->setCurrentRow(0);
@@ -119,7 +119,7 @@ void MainWindow::setupMenus()
     QAction *exitAct = new QAction(tr("E&xit"), this);
     exitAct->setShortcut(tr("Ctrl+Q"));
     exitAct->setStatusTip(tr("Exit the application"));
-    connect(exitAct, SIGNAL(triggered()), qApp, SLOT(closeAllWindows()));
+    connect(exitAct, &QAction::triggered, qApp, &QApplication::closeAllWindows);
 
     QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
     fileMenu->addAction(exitAct);
diff --git a/src/widgets/doc/snippets/mdiareasnippets.cpp b/src/widgets/doc/snippets/mdiareasnippets.cpp
index b9d6f05daf..dec7aaa1e7 100644
--- a/src/widgets/doc/snippets/mdiareasnippets.cpp
+++ b/src/widgets/doc/snippets/mdiareasnippets.cpp
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 void mainWindowExample()
 {
@@ -95,7 +95,7 @@ int main(int argv, char **args)
    QAction *act = new QAction(qApp);
    act->setShortcut(Qt::ALT + Qt::Key_S);
    act->setShortcutContext( Qt::ApplicationShortcut );
-   QObject::connect(act, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+   QObject::connect(act, &QAction::triggered, qApp, &QApplication::aboutQt);
 
     QWidget widget5;
     widget5.show();
diff --git a/src/widgets/doc/snippets/qlistview-dnd/mainwindow.cpp b/src/widgets/doc/snippets/qlistview-dnd/mainwindow.cpp
index c2af9c4cf1..45f1eb7aa3 100644
--- a/src/widgets/doc/snippets/qlistview-dnd/mainwindow.cpp
+++ b/src/widgets/doc/snippets/qlistview-dnd/mainwindow.cpp
@@ -73,7 +73,8 @@ listView->setDropIndicatorShown(true);
 
     this->listView = listView;
 
-    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+    connect(quitAction, &QAction::triggered,
+            this, &QWidget::close);
 
     setupListItems();
 
diff --git a/src/widgets/doc/snippets/qlistview-dnd/model.cpp b/src/widgets/doc/snippets/qlistview-dnd/model.cpp
index 710bbb2964..6835479e7a 100644
--- a/src/widgets/doc/snippets/qlistview-dnd/model.cpp
+++ b/src/widgets/doc/snippets/qlistview-dnd/model.cpp
@@ -54,7 +54,7 @@
   A simple model that uses a QStringList as its data source.
 */
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "model.h"
 
@@ -121,7 +121,7 @@ bool DragDropListModel::dropMimeData(const QMimeData *data,
 
 //! [6]
     insertRows(beginRow, rows, QModelIndex());
-    foreach (const QString &text, newItems) {
+    for (const QString &text : qAsConst(newItems)) {
         QModelIndex idx = index(beginRow, 0, QModelIndex());
         setData(idx, text);
         beginRow++;
@@ -146,12 +146,12 @@ Qt::ItemFlags DragDropListModel::flags(const QModelIndex &index) const
 //! [8]
 QMimeData *DragDropListModel::mimeData(const QModelIndexList &indexes) const
 {
-    QMimeData *mimeData = new QMimeData();
+    QMimeData *mimeData = new QMimeData;
     QByteArray encodedData;
 
     QDataStream stream(&encodedData, QIODevice::WriteOnly);
 
-    foreach (const QModelIndex &index, indexes) {
+    for (const QModelIndex &index : indexes) {
         if (index.isValid()) {
             QString text = data(index, Qt::DisplayRole).toString();
             stream << text;
diff --git a/src/widgets/doc/snippets/qlistwidget-dnd/mainwindow.cpp b/src/widgets/doc/snippets/qlistwidget-dnd/mainwindow.cpp
index 1153250b17..70df2b112e 100644
--- a/src/widgets/doc/snippets/qlistwidget-dnd/mainwindow.cpp
+++ b/src/widgets/doc/snippets/qlistwidget-dnd/mainwindow.cpp
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "mainwindow.h"
 
@@ -74,7 +74,7 @@ listWidget->setDragDropMode(QAbstractItemView::InternalMove);
 
     this->listWidget = listWidget;
 
-    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+    connect(quitAction, &QAction::triggered, this, &QWidget::close);
 
     setupListItems();
 
diff --git a/src/widgets/doc/snippets/qlistwidget-using/mainwindow.cpp b/src/widgets/doc/snippets/qlistwidget-using/mainwindow.cpp
index ff69fd2efd..13b20bb856 100644
--- a/src/widgets/doc/snippets/qlistwidget-using/mainwindow.cpp
+++ b/src/widgets/doc/snippets/qlistwidget-using/mainwindow.cpp
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "mainwindow.h"
 
@@ -77,14 +77,13 @@ MainWindow::MainWindow()
     listWidget = new QListWidget(this);
     listWidget->setSelectionMode(QAbstractItemView::SingleSelection);
 
-    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
-    connect(ascendingAction, SIGNAL(triggered()), this, SLOT(sortAscending()));
-    connect(descendingAction, SIGNAL(triggered()), this, SLOT(sortDescending()));
-    connect(insertAction, SIGNAL(triggered()), this, SLOT(insertItem()));
-    connect(removeAction, SIGNAL(triggered()), this, SLOT(removeItem()));
-    connect(listWidget,
-            SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
-            this, SLOT(updateMenus(QListWidgetItem*)));
+    connect(quitAction, &QAction::triggered, this, &QWidget::close);
+    connect(ascendingAction, &QAction::triggered, this, &MainWindow::sortAscending);
+    connect(descendingAction, &QAction::triggered, this, &MainWindow::sortDescending);
+    connect(insertAction, &QAction::triggered, this, &MainWindow::insertItem);
+    connect(removeAction, &QAction::triggered, this, &MainWindow::removeItem);
+    connect(listWidget, &QListWidget::currentItemChanged,
+            this, &MainWindow::updateMenus);
 
     setupListItems();
     updateMenus(listWidget->currentItem());
diff --git a/src/widgets/doc/snippets/qsortfilterproxymodel/main.cpp b/src/widgets/doc/snippets/qsortfilterproxymodel/main.cpp
index a6284bd578..2d4b1023f1 100644
--- a/src/widgets/doc/snippets/qsortfilterproxymodel/main.cpp
+++ b/src/widgets/doc/snippets/qsortfilterproxymodel/main.cpp
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 int main(int argc, char *argv[])
 {
@@ -74,9 +74,8 @@ int main(int argc, char *argv[])
     filteredView->setWindowTitle("Filtered view onto a string list model");
 
     QLineEdit *patternEditor = new QLineEdit;
-    QObject::
-    connect(patternEditor, SIGNAL(textChanged(QString)),
-            filterModel, SLOT(setFilterRegExp(QString)));
+    QObject::connect(patternEditor, &QLineEdit::textChanged,
+                     filterModel, &QSortFilterProxyModel::setFilterWildcard);
 
     QVBoxLayout *layout = new QVBoxLayout(window);
     layout->addWidget(filteredView);
diff --git a/src/widgets/doc/snippets/qstackedlayout/main.cpp b/src/widgets/doc/snippets/qstackedlayout/main.cpp
index 765608848c..9c61939dee 100644
--- a/src/widgets/doc/snippets/qstackedlayout/main.cpp
+++ b/src/widgets/doc/snippets/qstackedlayout/main.cpp
@@ -48,13 +48,12 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
-#include <QApplication>
+#include <QtWidgets>
 
 class Widget : public QWidget
 {
 public:
-    Widget(QWidget *parent = 0);
+    Widget(QWidget *parent = nullptr);
 };
 
 Widget::Widget(QWidget *parent)
@@ -75,8 +74,8 @@ Widget::Widget(QWidget *parent)
     pageComboBox->addItem(tr("Page 1"));
     pageComboBox->addItem(tr("Page 2"));
     pageComboBox->addItem(tr("Page 3"));
-    connect(pageComboBox, SIGNAL(activated(int)),
-            stackedLayout, SLOT(setCurrentIndex(int)));
+    connect(pageComboBox, QOverload<int>::of(&QComboBox::activated),
+            stackedLayout, &QStackedLayout::setCurrentIndex);
 //! [1]
 
 //! [2]
diff --git a/src/widgets/doc/snippets/qstackedwidget/main.cpp b/src/widgets/doc/snippets/qstackedwidget/main.cpp
index a6c9c7afe3..077c281830 100644
--- a/src/widgets/doc/snippets/qstackedwidget/main.cpp
+++ b/src/widgets/doc/snippets/qstackedwidget/main.cpp
@@ -48,8 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
-#include <QApplication>
+#include <QtWidgets>
 
 class Widget : public QWidget
 {
@@ -75,8 +74,8 @@ Widget::Widget(QWidget *parent)
     pageComboBox->addItem(tr("Page 1"));
     pageComboBox->addItem(tr("Page 2"));
     pageComboBox->addItem(tr("Page 3"));
-    connect(pageComboBox, SIGNAL(activated(int)),
-            stackedWidget, SLOT(setCurrentIndex(int)));
+    connect(pageComboBox, QOverload<int>::of(&QComboBox::activated),
+            stackedWidget, &QStackedWidget::setCurrentIndex);
 
 //! [1] //! [2]
     QVBoxLayout *layout = new QVBoxLayout;
diff --git a/src/widgets/doc/snippets/qtablewidget-resizing/mainwindow.cpp b/src/widgets/doc/snippets/qtablewidget-resizing/mainwindow.cpp
index 95113153e1..d2c50336f6 100644
--- a/src/widgets/doc/snippets/qtablewidget-resizing/mainwindow.cpp
+++ b/src/widgets/doc/snippets/qtablewidget-resizing/mainwindow.cpp
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "mainwindow.h"
 
@@ -72,9 +72,9 @@ MainWindow::MainWindow()
 //! [0]
     tableWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
-    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
-    connect(tableWidthAction, SIGNAL(triggered()), this, SLOT(changeWidth()));
-    connect(tableHeightAction, SIGNAL(triggered()), this, SLOT(changeHeight()));
+    connect(quitAction, &QAction::triggered, this, &QWidget::close);
+    connect(tableWidthAction, &QAction::triggered, this, &MainWindow::changeWidth);
+    connect(tableHeightAction, &QAction::triggered, this, &MainWindow::changeHeight);
 
     setupTableItems();
 
diff --git a/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp b/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp
index 15b9457dd5..47b63b2b3f 100644
--- a/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp
+++ b/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
-#include "math.h"
+#include <QtWidgets>
+#include <math.h>
 
 #include "mainwindow.h"
 
@@ -89,9 +89,9 @@ MainWindow::MainWindow()
     tableWidget->setHorizontalHeaderItem(1, squaresHeaderItem);
     tableWidget->setHorizontalHeaderItem(2, cubesHeaderItem);
 
-    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
-    connect(sumItemsAction, SIGNAL(triggered()), this, SLOT(sumItems()));
-    connect(averageItemsAction, SIGNAL(triggered()), this, SLOT(averageItems()));
+    connect(quitAction, &QAction::triggered, this, &QWidget::close);
+    connect(sumItemsAction, &QAction::triggered, this, &MainWindow::sumItems);
+    connect(averageItemsAction, &QAction::triggered, this, &MainWindow::averageItems);
 
     setupTableItems();
 
@@ -119,12 +119,11 @@ void MainWindow::setupTableItems()
 
 void MainWindow::averageItems()
 {
-    QList<QTableWidgetItem *> selected = tableWidget->selectedItems();
-    QTableWidgetItem *item;
+    const QList<QTableWidgetItem *> selected = tableWidget->selectedItems();
     int number = 0;
     double total = 0;
 
-    foreach (item, selected) {
+    for (QTableWidgetItem *item : selected) {
         bool ok;
         double value = item->text().toDouble(&ok);
 
@@ -140,12 +139,11 @@ void MainWindow::averageItems()
 void MainWindow::sumItems()
 {
 //! [4]
-    QList<QTableWidgetItem *> selected = tableWidget->selectedItems();
-    QTableWidgetItem *item;
+    const QList<QTableWidgetItem *> selected = tableWidget->selectedItems();
     int number = 0;
     double total = 0;
 
-    foreach (item, selected) {
+    for (QTableWidgetItem *item : selected) {
         bool ok;
         double value = item->text().toDouble(&ok);
 
diff --git a/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp b/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp
index ee7e028a13..b9e258cb03 100644
--- a/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp
+++ b/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "mainwindow.h"
 
@@ -90,16 +90,15 @@ MainWindow::MainWindow()
     treeWidget->setHeaderLabels(headers);
 //! [2]
 
-    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
-    connect(ascendingAction, SIGNAL(triggered()), this, SLOT(sortAscending()));
-    connect(autoSortAction, SIGNAL(triggered()), this, SLOT(updateSortItems()));
-    connect(descendingAction, SIGNAL(triggered()), this, SLOT(sortDescending()));
-    connect(findItemsAction, SIGNAL(triggered()), this, SLOT(findItems()));
-    connect(insertAction, SIGNAL(triggered()), this, SLOT(insertItem()));
-    connect(removeAction, SIGNAL(triggered()), this, SLOT(removeItem()));
-    connect(treeWidget,
-            SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
-            this, SLOT(updateMenus(QTreeWidgetItem*)));
+    connect(quitAction, &QAction::triggered, this, &QWidget::close);
+    connect(ascendingAction, &QAction::triggered, this, &MainWindow::sortAscending);
+    connect(autoSortAction, &QAction::triggered, this, &MainWindow::updateSortItems);
+    connect(descendingAction, &QAction::triggered, this, &MainWindow::sortDescending);
+    connect(findItemsAction, &QAction::triggered, this, &MainWindow::findItems);
+    connect(insertAction, &QAction::triggered, this, &MainWindow::insertItem);
+    connect(removeAction, &QAction::triggered, this, &MainWindow::removeItem);
+    connect(treeWidget, &QTreeWidget::currentItemChanged,
+            this, &MainWindow::updateMenus);
 
     setupTreeItems();
     updateMenus(treeWidget->currentItem());
@@ -150,18 +149,16 @@ void MainWindow::findItems()
     if (itemText.isEmpty())
         return;
 
-//! [6]
-    QTreeWidgetItem *item;
-//! [6]
-    foreach (item, treeWidget->selectedItems())
-        treeWidget->setItemSelected(item, false);
+    const QList<QTreeWidgetItem *> items = treeWidget->selectedItems();
+    for (QTreeWidgetItem *item : items)
+        item->setSelected(false);
 
 //! [7]
-    QList<QTreeWidgetItem *> found = treeWidget->findItems(
+    const QList<QTreeWidgetItem *> found = treeWidget->findItems(
         itemText, Qt::MatchWildcard);
 
-    foreach (item, found) {
-        treeWidget->setItemSelected(item, true);
+    for (QTreeWidgetItem *item : found) {
+        item->setSelected(true);
         // Show the item->text(0) for each item.
     }
 //! [7]
diff --git a/src/widgets/doc/snippets/qtreewidgetitemiterator-using/mainwindow.cpp b/src/widgets/doc/snippets/qtreewidgetitemiterator-using/mainwindow.cpp
index 5f1f606185..bfe099bbb4 100644
--- a/src/widgets/doc/snippets/qtreewidgetitemiterator-using/mainwindow.cpp
+++ b/src/widgets/doc/snippets/qtreewidgetitemiterator-using/mainwindow.cpp
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "mainwindow.h"
 
@@ -85,16 +85,15 @@ MainWindow::MainWindow()
     headers << tr("Subject") << tr("Default");
     treeWidget->setHeaderLabels(headers);
 
-    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
-    connect(ascendingAction, SIGNAL(triggered()), this, SLOT(sortAscending()));
-    connect(autoSortAction, SIGNAL(triggered()), this, SLOT(updateSortItems()));
-    connect(descendingAction, SIGNAL(triggered()), this, SLOT(sortDescending()));
-    connect(findItemsAction, SIGNAL(triggered()), this, SLOT(findItems()));
-    connect(insertAction, SIGNAL(triggered()), this, SLOT(insertItem()));
-    connect(removeAction, SIGNAL(triggered()), this, SLOT(removeItem()));
-    connect(treeWidget,
-            SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
-            this, SLOT(updateMenus(QTreeWidgetItem*)));
+    connect(quitAction, &QAction::triggered, this, &QWidget::close);
+    connect(ascendingAction, &QAction::triggered, this, &MainWindow::sortAscending);
+    connect(autoSortAction, &QAction::triggered, this, &MainWindow::updateSortItems);
+    connect(descendingAction, &QAction::triggered, this, &MainWindow::sortDescending);
+    connect(findItemsAction, &QAction::triggered, this, &MainWindow::findItems);
+    connect(insertAction, &QAction::triggered, this, &MainWindow::insertItem);
+    connect(removeAction, &QAction::triggered, this, &MainWindow::removeItem);
+    connect(treeWidget, &QTreeWidget::currentItemChanged,
+            this, &MainWindow::updateMenus);
 
     setupTreeItems();
     updateMenus(treeWidget->currentItem());
diff --git a/src/widgets/doc/snippets/reading-selections/window.cpp b/src/widgets/doc/snippets/reading-selections/window.cpp
index 08805fe4b3..045d66a199 100644
--- a/src/widgets/doc/snippets/reading-selections/window.cpp
+++ b/src/widgets/doc/snippets/reading-selections/window.cpp
@@ -81,9 +81,9 @@ MainWindow::MainWindow(QWidget *parent)
     QAction *selectAllAction = actionMenu->addAction(tr("&Select All"));
     menuBar()->addMenu(actionMenu);
 
-    connect(fillAction, SIGNAL(triggered()), this, SLOT(fillSelection()));
-    connect(clearAction, SIGNAL(triggered()), this, SLOT(clearSelection()));
-    connect(selectAllAction, SIGNAL(triggered()), this, SLOT(selectAll()));
+    connect(fillAction, &QAction::triggered, this, &MainWindow::fillSelection);
+    connect(clearAction, &QAction::triggered, this, &MainWindow::clearSelection);
+    connect(selectAllAction, &QAction::triggered, this, &MainWindow::selectAll);
 
     selectionModel = table->selectionModel();
 
@@ -94,10 +94,9 @@ MainWindow::MainWindow(QWidget *parent)
 void MainWindow::fillSelection()
 {
 //! [0]
-    QModelIndexList indexes = selectionModel->selectedIndexes();
-    QModelIndex index;
+    const QModelIndexList indexes = selectionModel->selectedIndexes();
 
-    foreach(index, indexes) {
+    for (const QModelIndex &index : indexes) {
         QString text = QString("(%1,%2)").arg(index.row()).arg(index.column());
         model->setData(index, text);
     }
@@ -106,11 +105,10 @@ void MainWindow::fillSelection()
 
 void MainWindow::clearSelection()
 {
-    QModelIndexList indexes = selectionModel->selectedIndexes();
-    QModelIndex index;
+    const QModelIndexList indexes = selectionModel->selectedIndexes();
 
-    foreach(index, indexes)
-        model->setData(index, "");
+    for (const QModelIndex &index : indexes)
+        model->setData(index, QString());
 }
 
 void MainWindow::selectAll()
diff --git a/src/widgets/doc/snippets/timeline/main.cpp b/src/widgets/doc/snippets/timeline/main.cpp
index 74aa749254..4dfa2400d0 100644
--- a/src/widgets/doc/snippets/timeline/main.cpp
+++ b/src/widgets/doc/snippets/timeline/main.cpp
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include <math.h>
 
 int main(int argv, char *args[])
@@ -68,7 +68,7 @@ int main(int argv, char *args[])
     for (int i = 0; i < 200; ++i)
         animation->setPosAt(i / 200.0, QPointF(i, i));
 
-    QGraphicsScene *scene = new QGraphicsScene();
+    QGraphicsScene *scene = new QGraphicsScene;
     scene->setSceneRect(0, 0, 250, 250);
     scene->addItem(ball);
 
diff --git a/src/widgets/doc/snippets/updating-selections/window.cpp b/src/widgets/doc/snippets/updating-selections/window.cpp
index 0bdcf8a64d..26e9b56ae4 100644
--- a/src/widgets/doc/snippets/updating-selections/window.cpp
+++ b/src/widgets/doc/snippets/updating-selections/window.cpp
@@ -74,12 +74,10 @@ MainWindow::MainWindow(QWidget *parent)
     table->setModel(model);
 
     selectionModel = table->selectionModel();
-    connect(selectionModel,
-        SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
-        this, SLOT(updateSelection(QItemSelection,QItemSelection)));
-    connect(selectionModel,
-        SIGNAL(currentChanged(QModelIndex,QModelIndex)),
-        this, SLOT(changeCurrent(QModelIndex,QModelIndex)));
+    connect(selectionModel, &QItemSelectionModel::selectionChanged,
+            this, &MainWindow::updateSelection);
+    connect(selectionModel, &QItemSelectionModel::currentChanged,
+            this, &MainWindow::changeCurrent);
 
     statusBar();
     setCentralWidget(table);
@@ -89,10 +87,9 @@ MainWindow::MainWindow(QWidget *parent)
 void MainWindow::updateSelection(const QItemSelection &selected,
     const QItemSelection &deselected)
 {
-    QModelIndex index;
     QModelIndexList items = selected.indexes();
 
-    foreach (index, items) {
+    for (const QModelIndex &index : qAsConst(items)) {
         QString text = QString("(%1,%2)").arg(index.row()).arg(index.column());
         model->setData(index, text);
 //! [0] //! [1]
@@ -102,8 +99,8 @@ void MainWindow::updateSelection(const QItemSelection &selected,
 //! [2]
     items = deselected.indexes();
 
-    foreach (index, items)
-        model->setData(index, "");
+    for (const QModelIndex &index : qAsConst(items)) {
+        model->setData(index, QString());
 }
 //! [2]
 
diff --git a/src/widgets/doc/src/model-view-programming.qdoc b/src/widgets/doc/src/model-view-programming.qdoc
index f6b7c80656..9335ff78c9 100644
--- a/src/widgets/doc/src/model-view-programming.qdoc
+++ b/src/widgets/doc/src/model-view-programming.qdoc
@@ -693,9 +693,9 @@
     \l QAbstractItemDelegate class.
 
     Delegates are expected to be able to render their contents themselves
-    by implementing the \l{QItemDelegate::paint()}{paint()}
-    and \l{QItemDelegate::sizeHint()}{sizeHint()} functions.
-    However, simple widget-based delegates can subclass \l QItemDelegate
+    by implementing the \l{QStyledItemDelegate::paint()}{paint()}
+    and \l{QStyledItemDelegate::sizeHint()}{sizeHint()} functions.
+    However, simple widget-based delegates can subclass \l QStyledItemDelegate
     instead of \l QAbstractItemDelegate, and take advantage of the default
     implementations of these functions.
 
@@ -709,14 +709,14 @@
 
     \section2 Using an existing delegate
 
-    The standard views provided with Qt use instances of \l QItemDelegate
+    The standard views provided with Qt use instances of \l QStyledItemDelegate
     to provide editing facilities. This default implementation of the
     delegate interface renders items in the usual style for each of the
     standard views: \l QListView, \l QTableView, and \l QTreeView.
 
     All the standard roles are handled by the default delegate used by
     the standard views. The way these are interpreted is described in the
-    QItemDelegate documentation.
+    QStyledItemDelegate documentation.
 
     The delegate used by a view is returned by the
     \l{QAbstractItemView::itemDelegate()}{itemDelegate()} function.
@@ -799,7 +799,7 @@
     In this case, we ensure that the spin box is up-to-date, and update
     the model with the value it contains using the index specified.
 
-    The standard \l QItemDelegate class informs the view when it has
+    The standard \l QStyledItemDelegate class informs the view when it has
     finished editing by emitting the
     \l{QAbstractItemDelegate::closeEditor()}{closeEditor()} signal.
     The view ensures that the editor widget is closed and destroyed. In
@@ -838,11 +838,11 @@
     assist any subsequent editing operations. This is achieved by
     emitting the \l{QAbstractItemDelegate::closeEditor()}{closeEditor()}
     signal with a suitable hint. This is taken care of by the default
-    QItemDelegate event filter which we installed on the spin box when
+    QStyledItemDelegate event filter which we installed on the spin box when
     it was constructed.
 
     The behavior of the spin box could be adjusted to make it more user
-    friendly. In the default event filter supplied by QItemDelegate, if
+    friendly. In the default event filter supplied by QStyledItemDelegate, if
     the user hits \uicontrol Return to confirm their choice in the spin box,
     the delegate commits the value to the model and closes the spin box.
     We can change this behavior by installing our own event filter on the
@@ -1003,8 +1003,8 @@
 
     \snippet reading-selections/window.cpp 0
 
-    The above code uses Qt's convenient \l{Container Classes}{foreach
-    keyword} to iterate over, and modify, the items corresponding to the
+    The above code uses a range-based for-loop to iterate over,
+    and modify, the items corresponding to the
     indexes returned by the selection model.
 
     The selection model emits signals to indicate changes in the
@@ -1611,7 +1611,6 @@
     We can obtain a list of matching items with the \c findItems()
     function:
 
-    \snippet qtreewidget-using/mainwindow.cpp 6
     \snippet qtreewidget-using/mainwindow.cpp 7
 
     The above code causes items in a tree widget to be selected if they
diff --git a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
index a9d95bc02c..645da5bca2 100644
--- a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
@@ -286,7 +286,7 @@
     QStyleOption to a subclass (e.g., QStyleOptionFocusRect). For
     safety, you can use qstyleoption_cast() to ensure that the
     pointer type is correct. If the object isn't of the right type,
-    qstyleoption_cast() returns 0. For example:
+    qstyleoption_cast() returns \nullptr. For example:
 
     \snippet code/doc_src_qt4-styles.cpp 0
 
diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
index 623d770f2f..00323eace6 100644
--- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -520,7 +520,7 @@
     user had manually called the corresponding QWidget::setPalette() and
     QWidget::setFont() methods on all of the QWidgets targeted by the style
     sheet.  If this would have caused propagation in C++, it will cause
-    propagation in style sheets and visa versa.
+    propagation in style sheets and vice versa.
 
     \section1 Widgets Inside C++ Namespaces
 
diff --git a/src/widgets/effects/qgraphicseffect.cpp b/src/widgets/effects/qgraphicseffect.cpp
index 028010d3dd..94188f3485 100644
--- a/src/widgets/effects/qgraphicseffect.cpp
+++ b/src/widgets/effects/qgraphicseffect.cpp
@@ -178,7 +178,7 @@ QRectF QGraphicsEffect::sourceBoundingRect(Qt::CoordinateSystem system) const
 
 /*!
     Returns a pointer to the item if this source is a QGraphicsItem; otherwise
-    returns 0.
+    returns \nullptr.
 
     \sa widget()
 */
@@ -189,7 +189,7 @@ const QGraphicsItem *QGraphicsEffectSource::graphicsItem() const
 
 /*!
     Returns a pointer to the widget if this source is a QWidget; otherwise
-    returns 0.
+    returns \nullptr.
 
     \sa graphicsItem()
 */
@@ -200,7 +200,7 @@ const QWidget *QGraphicsEffectSource::widget() const
 
 /*!
     Returns a pointer to the style options (used when drawing the source) if
-    available; otherwise returns 0.
+    available; otherwise returns \nullptr.
 
     \sa graphicsItem(), widget()
 */
diff --git a/src/widgets/effects/qgraphicseffect_p.h b/src/widgets/effects/qgraphicseffect_p.h
index c5c7ff5900..7e342a9f3c 100644
--- a/src/widgets/effects/qgraphicseffect_p.h
+++ b/src/widgets/effects/qgraphicseffect_p.h
@@ -80,15 +80,15 @@ public:
     QRectF boundingRect(Qt::CoordinateSystem coordinateSystem = Qt::LogicalCoordinates) const;
     QRect deviceRect() const;
     QPixmap pixmap(Qt::CoordinateSystem system = Qt::LogicalCoordinates,
-                   QPoint *offset = 0,
+                   QPoint *offset = nullptr,
                    QGraphicsEffect::PixmapPadMode mode = QGraphicsEffect::PadToEffectiveBoundingRect) const;
 
 protected:
-    QGraphicsEffectSource(QGraphicsEffectSourcePrivate &dd, QObject *parent = 0);
+    QGraphicsEffectSource(QGraphicsEffectSourcePrivate &dd, QObject *parent = nullptr);
 
 private:
     Q_DECLARE_PRIVATE(QGraphicsEffectSource)
-    Q_DISABLE_COPY(QGraphicsEffectSource)
+    Q_DISABLE_COPY_MOVE(QGraphicsEffectSource)
     friend class QGraphicsEffect;
     friend class QGraphicsEffectPrivate;
     friend class QGraphicsScenePrivate;
@@ -125,7 +125,7 @@ public:
     virtual void draw(QPainter *p) = 0;
     virtual void update() = 0;
     virtual bool isPixmap() const = 0;
-    virtual QPixmap pixmap(Qt::CoordinateSystem system, QPoint *offset = 0,
+    virtual QPixmap pixmap(Qt::CoordinateSystem system, QPoint *offset = nullptr,
                            QGraphicsEffect::PixmapPadMode mode = QGraphicsEffect::PadToTransparentBorder) const = 0;
     virtual void effectBoundingRectChanged() = 0;
 
@@ -149,7 +149,7 @@ class Q_WIDGETS_EXPORT QGraphicsEffectPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QGraphicsEffect)
 public:
-    QGraphicsEffectPrivate() : source(0), isEnabled(1) {}
+    QGraphicsEffectPrivate() : source(nullptr), isEnabled(1) {}
     ~QGraphicsEffectPrivate();
 
     inline void setGraphicsEffectSource(QGraphicsEffectSource *newSource)
diff --git a/src/widgets/effects/qpixmapfilter.cpp b/src/widgets/effects/qpixmapfilter.cpp
index b330afebed..e1e8175423 100644
--- a/src/widgets/effects/qpixmapfilter.cpp
+++ b/src/widgets/effects/qpixmapfilter.cpp
@@ -1105,13 +1105,15 @@ void QPixmapColorizeFilter::draw(QPainter *painter, const QPointF &dest, const Q
 
     if (srcRect.isNull()) {
         srcImage = src.toImage();
-        srcImage = srcImage.convertToFormat(srcImage.hasAlphaChannel() ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32);
+        const auto format = srcImage.hasAlphaChannel() ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32;
+        srcImage = std::move(srcImage).convertToFormat(format);
         destImage = QImage(srcImage.size(), srcImage.format());
     } else {
         QRect rect = srcRect.toAlignedRect().intersected(src.rect());
 
         srcImage = src.copy(rect).toImage();
-        srcImage = srcImage.convertToFormat(srcImage.hasAlphaChannel() ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32);
+        const auto format = srcImage.hasAlphaChannel() ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32;
+        srcImage = std::move(srcImage).convertToFormat(format);
         destImage = QImage(rect.size(), srcImage.format());
     }
     destImage.setDevicePixelRatio(src.devicePixelRatioF());
@@ -1130,7 +1132,7 @@ void QPixmapColorizeFilter::draw(QPainter *painter, const QPointF &dest, const Q
         bufPainter.setOpacity(d->strength);
         bufPainter.drawImage(0, 0, destImage);
         bufPainter.end();
-        destImage = buffer;
+        destImage = std::move(buffer);
     }
 
     if (srcImage.hasAlphaChannel())
@@ -1334,7 +1336,7 @@ void QPixmapDropShadowFilter::draw(QPainter *p,
     qt_blurImage(&blurPainter, tmp, d->radius, false, true);
     blurPainter.end();
 
-    tmp = blurred;
+    tmp = std::move(blurred);
 
     // blacken the image...
     tmpPainter.begin(&tmp);
diff --git a/src/widgets/effects/qpixmapfilter_p.h b/src/widgets/effects/qpixmapfilter_p.h
index 0f582bde60..c56acb8a24 100644
--- a/src/widgets/effects/qpixmapfilter_p.h
+++ b/src/widgets/effects/qpixmapfilter_p.h
@@ -100,7 +100,7 @@ class Q_WIDGETS_EXPORT QPixmapConvolutionFilter : public QPixmapFilter
     Q_DECLARE_PRIVATE(QPixmapConvolutionFilter)
 
 public:
-    QPixmapConvolutionFilter(QObject *parent = 0);
+    QPixmapConvolutionFilter(QObject *parent = nullptr);
     ~QPixmapConvolutionFilter();
 
     void setConvolutionKernel(const qreal *matrix, int rows, int columns);
@@ -124,7 +124,7 @@ class Q_WIDGETS_EXPORT QPixmapBlurFilter : public QPixmapFilter
     Q_DECLARE_PRIVATE(QPixmapBlurFilter)
 
 public:
-    QPixmapBlurFilter(QObject *parent = 0);
+    QPixmapBlurFilter(QObject *parent = nullptr);
     ~QPixmapBlurFilter();
 
     void setRadius(qreal radius);
@@ -148,7 +148,7 @@ class Q_WIDGETS_EXPORT QPixmapColorizeFilter : public QPixmapFilter
     Q_DECLARE_PRIVATE(QPixmapColorizeFilter)
 
 public:
-    QPixmapColorizeFilter(QObject *parent = 0);
+    QPixmapColorizeFilter(QObject *parent = nullptr);
     ~QPixmapColorizeFilter();
 
     void setColor(const QColor& color);
@@ -168,7 +168,7 @@ class Q_WIDGETS_EXPORT QPixmapDropShadowFilter : public QPixmapFilter
     Q_DECLARE_PRIVATE(QPixmapDropShadowFilter)
 
 public:
-    QPixmapDropShadowFilter(QObject *parent = 0);
+    QPixmapDropShadowFilter(QObject *parent = nullptr);
     ~QPixmapDropShadowFilter();
 
     QRectF boundingRectFor(const QRectF &rect) const override;
diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h
index 699ca32bfe..b5f14948ac 100644
--- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h
+++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h
@@ -89,7 +89,7 @@ struct AnchorVertex {
         : m_item(item), m_edge(edge), m_type(Normal) {}
 
     AnchorVertex()
-        : m_item(0), m_edge(Qt::AnchorPoint(0)), m_type(Normal) {}
+        : m_item(nullptr), m_edge(Qt::AnchorPoint(0)), m_type(Normal) {}
 
 #ifdef QT_DEBUG
     inline QString toString() const;
@@ -123,18 +123,18 @@ struct AnchorData : public QSimplexVariable {
     };
 
     AnchorData()
-        : QSimplexVariable(), from(0), to(0),
+        : QSimplexVariable(), from(nullptr), to(nullptr),
           minSize(0), prefSize(0), maxSize(0),
           minPrefSize(0), maxPrefSize(0),
           sizeAtMinimum(0), sizeAtPreferred(0),
-          sizeAtMaximum(0), item(0), graphicsAnchor(0),
+          sizeAtMaximum(0), item(nullptr), graphicsAnchor(nullptr),
           type(Normal), isLayoutAnchor(false),
           isCenterAnchor(false), orientation(0),
           dependency(Independent) {}
     virtual ~AnchorData();
 
     virtual void updateChildrenSizes() {}
-    void refreshSizeHints(const QLayoutStyleInfo *styleInfo = 0);
+    void refreshSizeHints(const QLayoutStyleInfo *styleInfo = nullptr);
 
 #ifdef QT_DEBUG
     void dump(int indent = 2);
@@ -402,7 +402,7 @@ public:
 
     static QGraphicsAnchorLayoutPrivate *get(QGraphicsAnchorLayout *q)
     {
-        return q ? q->d_func() : 0;
+        return q ? q->d_func() : nullptr;
     }
 
     static Qt::AnchorPoint oppositeEdge(
@@ -443,7 +443,7 @@ public:
                             Qt::AnchorPoint firstEdge,
                             QGraphicsLayoutItem *secondItem,
                             Qt::AnchorPoint secondEdge,
-                            qreal *spacing = 0);
+                            qreal *spacing = nullptr);
 
     // Helper for Anchor Manipulation methods
     void addAnchor_helper(QGraphicsLayoutItem *firstItem,
diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.cpp b/src/widgets/graphicsview/qgraphicsgridlayout.cpp
index d9005afbef..6b7052a0ab 100644
--- a/src/widgets/graphicsview/qgraphicsgridlayout.cpp
+++ b/src/widgets/graphicsview/qgraphicsgridlayout.cpp
@@ -552,20 +552,19 @@ int QGraphicsGridLayout::count() const
 }
 
 /*!
-    Returns the layout item at \a index, or 0 if there is no layout item at
-    this index.
+    Returns the layout item at \a index, or \nullptr if there is no
+    layout item at this index.
 */
 QGraphicsLayoutItem *QGraphicsGridLayout::itemAt(int index) const
 {
     Q_D(const QGraphicsGridLayout);
     if (index < 0 || index >= d->engine.itemCount()) {
         qWarning("QGraphicsGridLayout::itemAt: invalid index %d", index);
-        return 0;
+        return nullptr;
     }
-    QGraphicsLayoutItem *item = 0;
     if (QGraphicsGridLayoutEngineItem *engineItem = static_cast<QGraphicsGridLayoutEngineItem*>(d->engine.itemAt(index)))
-        item = engineItem->layoutItem();
-    return item;
+        return engineItem->layoutItem();
+    return nullptr;
 }
 
 /*!
diff --git a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h
index 370df9eed7..e98160e40f 100644
--- a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h
+++ b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h
@@ -68,7 +68,7 @@ class QGraphicsLayoutPrivate;
 class QGraphicsGridLayoutEngineItem : public QGridLayoutItem {
 public:
     QGraphicsGridLayoutEngineItem(QGraphicsLayoutItem *item, int row, int columns, int rowSpan = 1, int columnSpan = 1,
-                            Qt::Alignment alignment = 0)
+                            Qt::Alignment alignment = nullptr)
         : QGridLayoutItem(row, columns, rowSpan, columnSpan, alignment), q_layoutItem(item) {}
 
     virtual QLayoutPolicy::Policy sizePolicy(Qt::Orientation orientation) const override
@@ -115,7 +115,7 @@ public:
     {
         const int index = indexOf(layoutItem);
         if (index < 0)
-            return 0;
+            return nullptr;
         return static_cast<QGraphicsGridLayoutEngineItem*>(q_items.at(index));
     }
 
diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp
index a32f1388bf..6e53ea94f3 100644
--- a/src/widgets/graphicsview/qgraphicsitem.cpp
+++ b/src/widgets/graphicsview/qgraphicsitem.cpp
@@ -661,9 +661,9 @@
 
     \value ItemSceneChange The item is moved to a new scene. This notification is
     also sent when the item is added to its initial scene, and when it is removed.
-    The item's scene() is the old scene (or 0 if the item has not been added to a
-    scene yet). The value argument is the new scene (i.e., a QGraphicsScene
-    pointer), or a null pointer if the item is removed from a scene. Do not
+    The item's scene() is the old scene, or \nullptr if the item has not been added
+    to a scene yet. The value argument is the new scene (i.e., a QGraphicsScene
+    pointer), or \nullptr if the item is removed from a scene. Do not
     override this change by passing this item to QGraphicsScene::addItem() as this
     notification is delivered; instead, you can return the new scene from
     itemChange(). Use this feature with caution; objecting to a scene change can
@@ -1542,7 +1542,7 @@ void QGraphicsItemCache::purge()
     Constructs a QGraphicsItem with the given \a parent item.
     It does not modify the parent object returned by QObject::parent().
 
-    If \a parent is 0, you can add the item to a scene by calling
+    If \a parent is \nullptr, you can add the item to a scene by calling
     QGraphicsScene::addItem(). The item will then become a top-level item.
 
     \sa QGraphicsScene::addItem(), setParentItem()
@@ -1650,8 +1650,8 @@ QGraphicsItem::~QGraphicsItem()
 }
 
 /*!
-    Returns the current scene for the item, or 0 if the item is not stored in
-    a scene.
+    Returns the current scene for the item, or \nullptr if the item is
+    not stored in a scene.
 
     To add or move an item to a scene, call QGraphicsScene::addItem().
 */
@@ -1661,15 +1661,15 @@ QGraphicsScene *QGraphicsItem::scene() const
 }
 
 /*!
-    Returns a pointer to this item's item group, or 0 if this item is not
-    member of a group.
+    Returns a pointer to this item's item group, or \nullptr if this
+    item is not  member of a group.
 
     \sa QGraphicsItemGroup, QGraphicsScene::createItemGroup()
 */
 QGraphicsItemGroup *QGraphicsItem::group() const
 {
     if (!d_ptr->isMemberOfGroup)
-        return 0;
+        return nullptr;
     QGraphicsItem *parent = const_cast<QGraphicsItem *>(this);
     while ((parent = parent->d_ptr->parent)) {
         if (QGraphicsItemGroup *group = qgraphicsitem_cast<QGraphicsItemGroup *>(parent))
@@ -1677,11 +1677,11 @@ QGraphicsItemGroup *QGraphicsItem::group() const
     }
     // Unreachable; if d_ptr->isMemberOfGroup is != 0, then one parent of this
     // item is a group item.
-    return 0;
+    return nullptr;
 }
 
 /*!
-    Adds this item to the item group \a group. If \a group is 0, this item is
+    Adds this item to the item group \a group. If \a group is \nullptr, this item is
     removed from any current group and added as a child of the previous
     group's parent.
 
@@ -1699,7 +1699,7 @@ void QGraphicsItem::setGroup(QGraphicsItemGroup *group)
 
 /*!
     Returns a pointer to this item's parent item. If this item does not have a
-    parent, 0 is returned.
+    parent, \nullptr is returned.
 
     \sa setParentItem(), childItems()
 */
@@ -1710,8 +1710,9 @@ QGraphicsItem *QGraphicsItem::parentItem() const
 
 /*!
     Returns this item's top-level item. The top-level item is the item's
-    topmost ancestor item whose parent is 0. If an item has no parent, its own
-    pointer is returned (i.e., a top-level item is its own top-level item).
+    topmost ancestor item whose parent is \nullptr. If an item has no
+    parent, its own pointer is returned (i.e., a top-level item is its
+    own top-level item).
 
     \sa parentItem()
 */
@@ -1726,15 +1727,15 @@ QGraphicsItem *QGraphicsItem::topLevelItem() const
 /*!
     \since 4.6
 
-    Returns a pointer to the item's parent, cast to a QGraphicsObject. returns 0 if the parent item
-    is not a QGraphicsObject.
+    Returns a pointer to the item's parent, cast to a QGraphicsObject. Returns
+    \nullptr if the parent item is not a QGraphicsObject.
 
     \sa parentItem(), childItems()
 */
 QGraphicsObject *QGraphicsItem::parentObject() const
 {
     QGraphicsItem *p = d_ptr->parent;
-    return (p && p->d_ptr->isObject) ? static_cast<QGraphicsObject *>(p) : 0;
+    return (p && p->d_ptr->isObject) ? static_cast<QGraphicsObject *>(p) : nullptr;
 }
 
 /*!
@@ -1757,23 +1758,24 @@ QGraphicsWidget *QGraphicsItem::parentWidget() const
     \since 4.4
 
     Returns a pointer to the item's top level widget (i.e., the item's
-    ancestor whose parent is 0, or whose parent is not a widget), or 0 if this
-    item does not have a top level widget. If the item is its own top level
-    widget, this function returns a pointer to the item itself.
+    ancestor whose parent is \nullptr, or whose parent is not a widget), or
+    \nullptr if this item does not have a top level widget. If the item
+    is its own top level  widget, this function returns a pointer to the
+    item itself.
 */
 QGraphicsWidget *QGraphicsItem::topLevelWidget() const
 {
     if (const QGraphicsWidget *p = parentWidget())
         return p->topLevelWidget();
-    return isWidget() ? static_cast<QGraphicsWidget *>(const_cast<QGraphicsItem *>(this)) : 0;
+    return isWidget() ? static_cast<QGraphicsWidget *>(const_cast<QGraphicsItem *>(this)) : nullptr;
 }
 
 /*!
     \since 4.4
 
-    Returns the item's window, or 0 if this item does not have a window. If
-    the item is a window, it will return itself.  Otherwise it will return the
-    closest ancestor that is a window.
+    Returns the item's window, or \nullptr if this item does not have a
+    window. If the item is a window, it will return itself.  Otherwise
+    it will return the closest ancestor that is a window.
 
     \sa QGraphicsWidget::isWindow()
 */
@@ -1782,15 +1784,15 @@ QGraphicsWidget *QGraphicsItem::window() const
     QGraphicsItem *p = panel();
     if (p && p->isWindow())
         return static_cast<QGraphicsWidget *>(p);
-    return 0;
+    return nullptr;
 }
 
 /*!
     \since 4.6
 
-    Returns the item's panel, or 0 if this item does not have a panel. If the
-    item is a panel, it will return itself. Otherwise it will return the
-    closest ancestor that is a panel.
+    Returns the item's panel, or \nullptr if this item does not have a
+    panel. If the item is a panel, it will return itself. Otherwise it
+    will return the closest ancestor that is a panel.
 
     \sa isPanel(), ItemIsPanel
 */
@@ -1798,7 +1800,7 @@ QGraphicsItem *QGraphicsItem::panel() const
 {
     if (d_ptr->flags & ItemIsPanel)
         return const_cast<QGraphicsItem *>(this);
-    return d_ptr->parent ? d_ptr->parent->panel() : 0;
+    return d_ptr->parent ? d_ptr->parent->panel() : nullptr;
 }
 
 /*!
@@ -2397,7 +2399,7 @@ bool QGraphicsItem::isVisible() const
 /*!
     \since 4.4
     Returns \c true if the item is visible to \a parent; otherwise, false is
-    returned. \a parent can be 0, in which case this function will return
+    returned. \a parent can be \nullptr, in which case this function will return
     whether the item is visible to the scene or not.
 
     An item may not be visible to its ancestors even if isVisible() is true. It
@@ -2925,7 +2927,7 @@ void QGraphicsItem::setOpacity(qreal opacity)
 }
 
 /*!
-    Returns a pointer to this item's effect if it has one; otherwise 0.
+    Returns a pointer to this item's effect if it has one; otherwise \nullptr.
 
     \since 4.6
 */
@@ -2939,7 +2941,7 @@ QGraphicsEffect *QGraphicsItem::graphicsEffect() const
     Sets \a effect as the item's effect. If there already is an effect installed
     on this item, QGraphicsItem will delete the existing effect before installing
     the new \a effect. You can delete an existing effect by calling
-    setGraphicsEffect(0).
+    setGraphicsEffect(\nullptr).
 
     If \a effect is the installed effect on a different item, setGraphicsEffect() will remove
     the effect from the item and install it on this item.
@@ -3577,7 +3579,7 @@ void QGraphicsItemPrivate::clearFocusHelper(bool giveFocusToParent, bool hiddenB
 /*!
     \since 4.6
 
-    Returns this item's focus proxy, or 0 if this item has no
+    Returns this item's focus proxy, or \nullptr if this item has no
     focus proxy.
 
     \sa setFocusProxy(), setFocus(), hasFocus()
@@ -3640,7 +3642,7 @@ void QGraphicsItem::setFocusProxy(QGraphicsItem *item)
 
     If this item, a child or descendant of this item currently has input
     focus, this function will return a pointer to that item. If
-    no descendant has input focus, 0 is returned.
+    no descendant has input focus, \nullptr is returned.
 
     \sa hasFocus(), setFocus(), QWidget::focusWidget()
 */
@@ -3995,6 +3997,7 @@ void QGraphicsItem::ensureVisible(const QRectF &rect, int xmargin, int ymargin)
     ensureVisible(QRectF(\a x, \a y, \a w, \a h), \a xmargin, \a ymargin).
 */
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -4010,6 +4013,7 @@ QMatrix QGraphicsItem::matrix() const
 {
     return transform().toAffine();
 }
+#endif
 
 /*!
     \since 4.3
@@ -4320,6 +4324,7 @@ void QGraphicsItem::setTransformOriginPoint(const QPointF &origin)
 */
 
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -4332,7 +4337,7 @@ QMatrix QGraphicsItem::sceneMatrix() const
     d_ptr->ensureSceneTransform();
     return d_ptr->sceneTransform.toAffine();
 }
-
+#endif
 
 /*!
     \since 4.3
@@ -4544,6 +4549,7 @@ QTransform QGraphicsItem::itemTransform(const QGraphicsItem *other, bool *ok) co
     return x;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -4582,6 +4588,7 @@ void QGraphicsItem::setMatrix(const QMatrix &matrix, bool combine)
     // Send post-notification.
     itemChange(ItemTransformHasChanged, QVariant::fromValue<QTransform>(newTransform));
 }
+#endif
 
 /*!
     \since 4.3
@@ -4636,6 +4643,7 @@ void QGraphicsItem::setTransform(const QTransform &matrix, bool combine)
     d_ptr->sendScenePosChange();
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -4645,6 +4653,7 @@ void QGraphicsItem::resetMatrix()
 {
     resetTransform();
 }
+#endif
 
 /*!
     \since 4.3
@@ -4666,9 +4675,7 @@ void QGraphicsItem::resetTransform()
 
     Use
 
-    \code
-    item->setTransform(QTransform().rotate(angle), true);
-    \endcode
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 20
 
     instead.
 
@@ -4689,9 +4696,7 @@ void QGraphicsItem::resetTransform()
 
     Use
 
-    \code
-    setTransform(QTransform::fromScale(sx, sy), true);
-    \endcode
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 21
 
     instead.
 
@@ -4712,9 +4717,7 @@ void QGraphicsItem::resetTransform()
 
     Use
 
-    \code
-    setTransform(QTransform().shear(sh, sv), true);
-    \endcode
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 22
 
     instead.
 
@@ -4730,9 +4733,7 @@ void QGraphicsItem::resetTransform()
     Use setPos() or setTransformOriginPoint() instead. For identical
     behavior, use
 
-    \code
-    setTransform(QTransform::fromTranslate(dx, dy), true);
-    \endcode
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 23
 
     Translates the current item transformation by (\a dx, \a dy).
 
@@ -5798,7 +5799,7 @@ void QGraphicsItemPrivate::clearSubFocus(QGraphicsItem *rootItem, QGraphicsItem
 /*!
     \internal
 
-    Sets the focusProxy pointer to 0 for all items that have this item as their
+    Sets the focusProxy pointer to \nullptr for all items that have this item as their
     focusProxy.
 */
 void QGraphicsItemPrivate::resetFocusProxy()
@@ -6009,7 +6010,7 @@ void QGraphicsItem::scroll(qreal dx, qreal dy, const QRectF &rect)
     Maps the point \a point, which is in this item's coordinate system, to \a
     item's coordinate system, and returns the mapped coordinate.
 
-    If \a item is 0, this function returns the same as mapToScene().
+    If \a item is \nullptr, this function returns the same as mapToScene().
 
     \sa itemTransform(), mapToParent(), mapToScene(), transform(), mapFromItem(), {The Graphics
     View Coordinate System}
@@ -6079,7 +6080,7 @@ QPointF QGraphicsItem::mapToScene(const QPointF &point) const
     Maps the rectangle \a rect, which is in this item's coordinate system, to
     \a item's coordinate system, and returns the mapped rectangle as a polygon.
 
-    If \a item is 0, this function returns the same as mapToScene().
+    If \a item is \nullptr, this function returns the same as mapToScene().
 
     \sa itemTransform(), mapToParent(), mapToScene(), mapFromItem(), {The
     Graphics View Coordinate System}
@@ -6150,7 +6151,7 @@ QPolygonF QGraphicsItem::mapToScene(const QRectF &rect) const
     \a item's coordinate system, and returns the mapped rectangle as a new
     rectangle (i.e., the bounding rectangle of the resulting polygon).
 
-    If \a item is 0, this function returns the same as mapRectToScene().
+    If \a item is \nullptr, this function returns the same as mapRectToScene().
 
     \sa itemTransform(), mapToParent(), mapToScene(), mapFromItem(), {The
     Graphics View Coordinate System}
@@ -6225,7 +6226,7 @@ QRectF QGraphicsItem::mapRectToScene(const QRectF &rect) const
     this item's coordinate system, and returns the mapped rectangle as a new
     rectangle (i.e., the bounding rectangle of the resulting polygon).
 
-    If \a item is 0, this function returns the same as mapRectFromScene().
+    If \a item is \nullptr, this function returns the same as mapRectFromScene().
 
     \sa itemTransform(), mapToParent(), mapToScene(), mapFromItem(), {The
     Graphics View Coordinate System}
@@ -6298,7 +6299,7 @@ QRectF QGraphicsItem::mapRectFromScene(const QRectF &rect) const
     Maps the polygon \a polygon, which is in this item's coordinate system, to
     \a item's coordinate system, and returns the mapped polygon.
 
-    If \a item is 0, this function returns the same as mapToScene().
+    If \a item is \nullptr, this function returns the same as mapToScene().
 
     \sa itemTransform(), mapToParent(), mapToScene(), mapFromItem(), {The
     Graphics View Coordinate System}
@@ -6345,7 +6346,7 @@ QPolygonF QGraphicsItem::mapToScene(const QPolygonF &polygon) const
     Maps the path \a path, which is in this item's coordinate system, to
     \a item's coordinate system, and returns the mapped path.
 
-    If \a item is 0, this function returns the same as mapToScene().
+    If \a item is \nullptr, this function returns the same as mapToScene().
 
     \sa itemTransform(), mapToParent(), mapToScene(), mapFromItem(), {The
     Graphics View Coordinate System}
@@ -6392,7 +6393,7 @@ QPainterPath QGraphicsItem::mapToScene(const QPainterPath &path) const
     Maps the point \a point, which is in \a item's coordinate system, to this
     item's coordinate system, and returns the mapped coordinate.
 
-    If \a item is 0, this function returns the same as mapFromScene().
+    If \a item is \nullptr, this function returns the same as mapFromScene().
 
     \sa itemTransform(), mapFromParent(), mapFromScene(), transform(), mapToItem(), {The Graphics
     View Coordinate System}
@@ -6464,7 +6465,7 @@ QPointF QGraphicsItem::mapFromScene(const QPointF &point) const
     this item's coordinate system, and returns the mapped rectangle as a
     polygon.
 
-    If \a item is 0, this function returns the same as mapFromScene()
+    If \a item is \nullptr, this function returns the same as mapFromScene()
 
     \sa itemTransform(), mapToItem(), mapFromParent(), transform(), {The Graphics View Coordinate
     System}
@@ -6532,7 +6533,7 @@ QPolygonF QGraphicsItem::mapFromScene(const QRectF &rect) const
     Maps the polygon \a polygon, which is in \a item's coordinate system, to
     this item's coordinate system, and returns the mapped polygon.
 
-    If \a item is 0, this function returns the same as mapFromScene().
+    If \a item is \nullptr, this function returns the same as mapFromScene().
 
     \sa itemTransform(), mapToItem(), mapFromParent(), transform(), {The
     Graphics View Coordinate System}
@@ -6577,7 +6578,7 @@ QPolygonF QGraphicsItem::mapFromScene(const QPolygonF &polygon) const
     Maps the path \a path, which is in \a item's coordinate system, to
     this item's coordinate system, and returns the mapped path.
 
-    If \a item is 0, this function returns the same as mapFromScene().
+    If \a item is \nullptr, this function returns the same as mapFromScene().
 
     \sa itemTransform(), mapFromParent(), mapFromScene(), mapToItem(), {The
     Graphics View Coordinate System}
@@ -6641,15 +6642,15 @@ bool QGraphicsItem::isAncestorOf(const QGraphicsItem *child) const
 /*!
     \since 4.4
 
-    Returns the closest common ancestor item of this item and \a other, or 0
-    if either \a other is 0, or there is no common ancestor.
+    Returns the closest common ancestor item of this item and \a other,
+    or \nullptr if either \a other is \nullptr, or there is no common ancestor.
 
     \sa isAncestorOf()
 */
 QGraphicsItem *QGraphicsItem::commonAncestorItem(const QGraphicsItem *other) const
 {
     if (!other)
-        return 0;
+        return nullptr;
     if (other == this)
         return const_cast<QGraphicsItem *>(this);
     const QGraphicsItem *thisw = this;
@@ -6734,7 +6735,7 @@ void QGraphicsItem::setData(int key, const QVariant &value)
     \since 4.2
 
     Returns the given \a item cast to type T if \a item is of type T;
-    otherwise, 0 is returned.
+    otherwise, \nullptr is returned.
 
     \note To make this function work correctly with custom items, reimplement
     the \l{QGraphicsItem::}{type()} function for each custom QGraphicsItem
@@ -10577,14 +10578,11 @@ void QGraphicsTextItemPrivate::_q_update(QRectF rect)
 */
 void QGraphicsTextItemPrivate::_q_updateBoundingRect(const QSizeF &size)
 {
-    if (!control) return; // can't happen
-    const QSizeF pageSize = control->document()->pageSize();
-    // paged items have a constant (page) size
-    if (size == boundingRect.size() || pageSize.height() != -1)
-        return;
-    qq->prepareGeometryChange();
-    boundingRect.setSize(size);
-    qq->update();
+    if (size != boundingRect.size()) {
+        qq->prepareGeometryChange();
+        boundingRect.setSize(size);
+        qq->update();
+    }
 }
 
 /*!
diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h
index c228e765d8..7dd4441ae9 100644
--- a/src/widgets/graphicsview/qgraphicsitem.h
+++ b/src/widgets/graphicsview/qgraphicsitem.h
@@ -283,10 +283,16 @@ public:
     inline void ensureVisible(qreal x, qreal y, qreal w, qreal h, int xmargin = 50, int ymargin = 50);
 
     // Local transformation
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use transform() instead")
     QMatrix matrix() const;
+    QT_DEPRECATED_X("Use sceneTransform() instead")
     QMatrix sceneMatrix() const;
+    QT_DEPRECATED_X("Use setTransform() instead")
     void setMatrix(const QMatrix &matrix, bool combine = false);
+    QT_DEPRECATED_X("Use resetTransform() instead")
     void resetMatrix();
+#endif
     QTransform transform() const;
     QTransform sceneTransform() const;
     QTransform deviceTransform(const QTransform &viewportTransform) const;
@@ -487,7 +493,9 @@ private:
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsItem::GraphicsItemFlags)
+#ifndef Q_CLANG_QDOC
 Q_DECLARE_INTERFACE(QGraphicsItem, "org.qt-project.Qt.QGraphicsItem")
+#endif
 
 inline void QGraphicsItem::setPos(qreal ax, qreal ay)
 { setPos(QPointF(ax, ay)); }
diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h
index d586a22544..a2c3774f65 100644
--- a/src/widgets/graphicsview/qgraphicsitem_p.h
+++ b/src/widgets/graphicsview/qgraphicsitem_p.h
@@ -78,13 +78,13 @@ public:
     typedef void (*ClearFunction)(QDeclarativeListProperty<T> *);
 
     QDeclarativeListProperty()
-        : object(0), data(0), append(0), count(0), at(0), clear(0), dummy1(0), dummy2(0) {}
+        : object(nullptr), data(nullptr), append(nullptr), count(nullptr), at(nullptr), clear(nullptr), dummy1(nullptr), dummy2(nullptr) {}
     QDeclarativeListProperty(QObject *o, QList<T *> &list)
         : object(o), data(&list), append(qlist_append), count(qlist_count), at(qlist_at),
-          clear(qlist_clear), dummy1(0), dummy2(0) {}
+          clear(qlist_clear), dummy1(nullptr), dummy2(nullptr) {}
     QDeclarativeListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = 0, AtFunction t = 0,
                     ClearFunction r = 0)
-        : object(o), data(d), append(a), count(c), at(t), clear(r), dummy1(0), dummy2(0) {}
+        : object(o), data(d), append(a), count(c), at(t), clear(r), dummy1(nullptr), dummy2(nullptr) {}
 
     bool operator==(const QDeclarativeListProperty &o) const {
         return object == o.object &&
@@ -198,8 +198,8 @@ public:
             || (ancestorFlags & AncestorIgnoresTransformations);
     }
 
-    void combineTransformToParent(QTransform *x, const QTransform *viewTransform = 0) const;
-    void combineTransformFromParent(QTransform *x, const QTransform *viewTransform = 0) const;
+    void combineTransformToParent(QTransform *x, const QTransform *viewTransform = nullptr) const;
+    void combineTransformFromParent(QTransform *x, const QTransform *viewTransform = nullptr) const;
     virtual void updateSceneTransformFromParent();
 
     static bool movableAncestorIsSelected(const QGraphicsItem *item);
@@ -232,7 +232,7 @@ public:
     void childrenBoundingRectHelper(QTransform *x, QRectF *rect, QGraphicsItem *topMostEffectItem);
     void initStyleOption(QStyleOptionGraphicsItem *option, const QTransform &worldTransform,
                          const QRegion &exposedRegion, bool allItems = false) const;
-    QRectF effectiveBoundingRect(QGraphicsItem *topMostEffectItem = 0) const;
+    QRectF effectiveBoundingRect(QGraphicsItem *topMostEffectItem = nullptr) const;
     QRectF sceneEffectiveBoundingRect() const;
 
     QRectF effectiveBoundingRect(const QRectF &rect) const;
@@ -408,8 +408,8 @@ public:
 
     void setFocusHelper(Qt::FocusReason focusReason, bool climb, bool focusFromHide);
     void clearFocusHelper(bool giveFocusToParent, bool hiddenByParentPanel);
-    void setSubFocus(QGraphicsItem *rootItem = 0, QGraphicsItem *stopItem = 0);
-    void clearSubFocus(QGraphicsItem *rootItem = 0, QGraphicsItem *stopItem = 0);
+    void setSubFocus(QGraphicsItem *rootItem = nullptr, QGraphicsItem *stopItem = nullptr);
+    void clearSubFocus(QGraphicsItem *rootItem = nullptr, QGraphicsItem *stopItem = nullptr);
     void resetFocusProxy();
     virtual void subFocusItemChange();
     virtual void focusScopeItemChange(bool isSubFocusItem);
@@ -541,7 +541,7 @@ struct QGraphicsItemPrivate::TransformData
         onlyTransform(true)
     { }
 
-    QTransform computedFullTransform(QTransform *postmultiplyTransform = 0) const
+    QTransform computedFullTransform(QTransform *postmultiplyTransform = nullptr) const
     {
         if (onlyTransform) {
             if (!postmultiplyTransform || postmultiplyTransform->isIdentity())
@@ -595,12 +595,12 @@ class QGraphicsItemEffectSourcePrivate : public QGraphicsEffectSourcePrivate
 {
 public:
     QGraphicsItemEffectSourcePrivate(QGraphicsItem *i)
-        : QGraphicsEffectSourcePrivate(), item(i), info(0)
+        : QGraphicsEffectSourcePrivate(), item(i), info(nullptr)
     {}
 
     void detach() override
     {
-        item->d_ptr->graphicsEffect = 0;
+        item->d_ptr->graphicsEffect = nullptr;
         item->prepareGeometryChange();
     }
 
@@ -608,7 +608,7 @@ public:
     { return item; }
 
     const QWidget *widget() const override
-    { return 0; }
+    { return nullptr; }
 
     void update() override {
         item->d_ptr->updateDueToGraphicsEffect = true;
@@ -628,7 +628,7 @@ public:
     }
 
     const QStyleOption *styleOption() const override
-    { return info ? info->option : 0; }
+    { return info ? info->option : nullptr; }
 
     QRect deviceRect() const override
     {
@@ -644,7 +644,7 @@ public:
     QPixmap pixmap(Qt::CoordinateSystem system,
                    QPoint *offset,
                    QGraphicsEffect::PixmapPadMode mode) const override;
-    QRect paddedEffectRect(Qt::CoordinateSystem system, QGraphicsEffect::PixmapPadMode mode, const QRectF &sourceRect, bool *unpadded = 0) const;
+    QRect paddedEffectRect(Qt::CoordinateSystem system, QGraphicsEffect::PixmapPadMode mode, const QRectF &sourceRect, bool *unpadded = nullptr) const;
 
     QGraphicsItem *item;
     QGraphicsItemPaintInfo *info;
diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.cpp b/src/widgets/graphicsview/qgraphicsitemanimation.cpp
index 572ec141bc..ad77e2f260 100644
--- a/src/widgets/graphicsview/qgraphicsitemanimation.cpp
+++ b/src/widgets/graphicsview/qgraphicsitemanimation.cpp
@@ -115,7 +115,7 @@ public:
     QGraphicsItem *item;
 
     QPointF startPos;
-    QMatrix startMatrix;
+    QTransform startTransform;
 
     qreal step;
 
@@ -294,23 +294,38 @@ QList<QPair<qreal, QPointF> > QGraphicsItemAnimation::posList() const
     return list;
 }
 
+#if QT_DEPRECATED_SINCE(5, 14)
 /*!
   Returns the matrix used to transform the item at the specified \a step value.
+
+  \obsolete Use transformAt() instead
 */
 QMatrix QGraphicsItemAnimation::matrixAt(qreal step) const
 {
     check_step_valid(step, "matrixAt");
+    return transformAt(step).toAffine();
+}
+#endif
+
+/*!
+  Returns the transform used for the item at the specified \a step value.
+
+  \since 5.14
+*/
+QTransform QGraphicsItemAnimation::transformAt(qreal step) const
+{
+    check_step_valid(step, "transformAt");
 
-    QMatrix matrix;
+    QTransform transform;
     if (!d->rotation.isEmpty())
-        matrix.rotate(rotationAt(step));
+        transform.rotate(rotationAt(step));
     if (!d->verticalScale.isEmpty())
-        matrix.scale(horizontalScaleAt(step), verticalScaleAt(step));
+        transform.scale(horizontalScaleAt(step), verticalScaleAt(step));
     if (!d->verticalShear.isEmpty())
-        matrix.shear(horizontalShearAt(step), verticalShearAt(step));
+        transform.shear(horizontalShearAt(step), verticalShearAt(step));
     if (!d->xTranslation.isEmpty())
-        matrix.translate(xTranslationAt(step), yTranslationAt(step));
-    return matrix;
+        transform.translate(xTranslationAt(step), yTranslationAt(step));
+    return transform;
 }
 
 /*!
@@ -542,13 +557,14 @@ void QGraphicsItemAnimation::setStep(qreal step)
             || !d->horizontalShear.isEmpty()
             || !d->xTranslation.isEmpty()
             || !d->yTranslation.isEmpty()) {
-            d->item->setMatrix(d->startMatrix * matrixAt(step));
+            d->item->setTransform(d->startTransform * transformAt(step));
         }
     }
 
     afterAnimationStep(step);
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     Resets the item to its starting position and transformation.
 
@@ -561,8 +577,9 @@ void QGraphicsItemAnimation::reset()
     if (!d->item)
         return;
     d->startPos = d->item->pos();
-    d->startMatrix = d->item->matrix();
+    d->startTransform = d->item->transform();
 }
+#endif
 
 /*!
   \fn void QGraphicsItemAnimation::beforeAnimationStep(qreal step)
diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.h b/src/widgets/graphicsview/qgraphicsitemanimation.h
index 7417d7729c..3051fb2e2b 100644
--- a/src/widgets/graphicsview/qgraphicsitemanimation.h
+++ b/src/widgets/graphicsview/qgraphicsitemanimation.h
@@ -51,6 +51,7 @@ class QGraphicsItem;
 class QMatrix;
 class QPointF;
 class QTimeLine;
+class QTransform;
 template <class T1, class T2> struct QPair;
 
 class QGraphicsItemAnimationPrivate;
@@ -71,7 +72,11 @@ public:
     QList<QPair<qreal, QPointF> > posList() const;
     void setPosAt(qreal step, const QPointF &pos);
 
+#if QT_DEPRECATED_SINCE(5, 14)
+    QT_DEPRECATED_X("Use transformAt() instead")
     QMatrix matrixAt(qreal step) const;
+#endif
+    QTransform transformAt(qreal step) const;
 
     qreal rotationAt(qreal step) const;
     QList<QPair<qreal, qreal> > rotationList() const;
@@ -96,7 +101,10 @@ public:
 
 public Q_SLOTS:
     void setStep(qreal x);
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use setStep(0) instead")
     void reset();
+#endif
 
 protected:
     virtual void beforeAnimationStep(qreal step);
diff --git a/src/widgets/graphicsview/qgraphicslayout.h b/src/widgets/graphicsview/qgraphicslayout.h
index 28b335ceaa..efcafa5e6a 100644
--- a/src/widgets/graphicsview/qgraphicslayout.h
+++ b/src/widgets/graphicsview/qgraphicslayout.h
@@ -83,7 +83,9 @@ private:
     friend class QGraphicsWidget;
 };
 
+#ifndef Q_CLANG_QDOC
 Q_DECLARE_INTERFACE(QGraphicsLayout, "org.qt-project.Qt.QGraphicsLayout")
+#endif
 
 QT_END_NAMESPACE
 
diff --git a/src/widgets/graphicsview/qgraphicslayout_p.h b/src/widgets/graphicsview/qgraphicslayout_p.h
index 302ad1e116..0d91151e22 100644
--- a/src/widgets/graphicsview/qgraphicslayout_p.h
+++ b/src/widgets/graphicsview/qgraphicslayout_p.h
@@ -91,7 +91,7 @@ public:
         m_defaultSpacing[1] = style->pixelMetric(QStyle::PM_LayoutVerticalSpacing);
     }
 
-    inline void invalidate() { m_valid = false; m_style = 0; m_widget = 0; }
+    inline void invalidate() { m_valid = false; m_style = nullptr; m_widget = nullptr; }
 
     inline QStyle *style() const { return m_style; }
     inline QWidget *widget() const { return m_widget; }
@@ -130,7 +130,7 @@ class Q_AUTOTEST_EXPORT QGraphicsLayoutPrivate : public QGraphicsLayoutItemPriva
     Q_DECLARE_PUBLIC(QGraphicsLayout)
 
 public:
-    QGraphicsLayoutPrivate() : QGraphicsLayoutItemPrivate(0, true), left(-1.0), top(-1.0), right(-1.0), bottom(-1.0),
+    QGraphicsLayoutPrivate() : QGraphicsLayoutItemPrivate(nullptr, true), left(-1.0), top(-1.0), right(-1.0), bottom(-1.0),
         activated(true) { }
 
     void reparentChildItems(QGraphicsItem *newParent);
diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.cpp b/src/widgets/graphicsview/qgraphicslayoutitem.cpp
index 9951fc0383..1192bad51e 100644
--- a/src/widgets/graphicsview/qgraphicslayoutitem.cpp
+++ b/src/widgets/graphicsview/qgraphicslayoutitem.cpp
@@ -193,7 +193,7 @@ QSizeF *QGraphicsLayoutItemPrivate::effectiveSizeHints(const QSizeF &constraint)
 /*!
     \internal
 
-    Returns the parent item of this layout, or 0 if this layout is
+    Returns the parent item of this layout, or \nullptr if this layout is
     not installed on any widget.
 
     If this is the item that the layout is installed on, it will return "itself".
@@ -214,7 +214,7 @@ QGraphicsItem *QGraphicsLayoutItemPrivate::parentItem() const
     while (parent && parent->isLayout()) {
         parent = parent->parentLayoutItem();
     }
-    return parent ? parent->graphicsItem() : 0;
+    return parent ? parent->graphicsItem() : nullptr;
 }
 
 /*!
@@ -368,8 +368,8 @@ bool QGraphicsLayoutItemPrivate::hasWidthForHeight() const
     passing a QGraphicsLayoutItem pointer to QGraphicsLayoutItem's
     protected constructor, or by calling setParentLayoutItem(). The
     parentLayoutItem() function returns a pointer to the item's layoutItem
-    parent. If the item's parent is 0 or if the parent does not inherit
-    from QGraphicsItem, the parentLayoutItem() function then returns 0.
+    parent. If the item's parent is \nullptr or if the parent does not inherit
+    from QGraphicsItem, the parentLayoutItem() function then returns \nullptr.
     isLayout() returns \c true if the QGraphicsLayoutItem subclass is itself a
     layout, or false otherwise.
 
@@ -737,7 +737,7 @@ QRectF QGraphicsLayoutItem::geometry() const
     This virtual function provides the \a left, \a top, \a right and \a bottom
     contents margins for this QGraphicsLayoutItem. The default implementation
     assumes all contents margins are 0. The parameters point to values stored
-    in qreals. If any of the pointers is 0, that value will not be updated.
+    in qreals. If any of the pointers is \nullptr, that value will not be updated.
 
     \sa QGraphicsWidget::setContentsMargins()
 */
@@ -826,8 +826,8 @@ void QGraphicsLayoutItem::updateGeometry()
 }
 
 /*!
-    Returns the parent of this QGraphicsLayoutItem, or 0 if there is no parent,
-    or if the parent does not inherit from QGraphicsLayoutItem
+    Returns the parent of this QGraphicsLayoutItem, or \nullptr if there is
+    no parent, or if the parent does not inherit from QGraphicsLayoutItem
     (QGraphicsLayoutItem is often used through multiple inheritance with
     QObject-derived classes).
 
@@ -917,7 +917,7 @@ QGraphicsItem *QGraphicsLayoutItem::graphicsItem() const
  * advantage of the automatic reparenting capabilities of QGraphicsLayout it
  * should set this value.
  * Note that if you delete \a item and not delete the layout item, you are
- * responsible of calling setGraphicsItem(0) in order to avoid having a
+ * responsible of calling setGraphicsItem(\nullptr) in order to avoid having a
  * dangling pointer.
  *
  * \sa graphicsItem()
diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.h b/src/widgets/graphicsview/qgraphicslayoutitem.h
index 44f430034b..86a0a87361 100644
--- a/src/widgets/graphicsview/qgraphicslayoutitem.h
+++ b/src/widgets/graphicsview/qgraphicslayoutitem.h
@@ -116,7 +116,9 @@ private:
     friend class QGraphicsLayout;
 };
 
+#ifndef Q_CLANG_QDOC
 Q_DECLARE_INTERFACE(QGraphicsLayoutItem, "org.qt-project.Qt.QGraphicsLayoutItem")
+#endif
 
 inline void QGraphicsLayoutItem::setMinimumSize(qreal aw, qreal ah)
 { setMinimumSize(QSizeF(aw, ah)); }
diff --git a/src/widgets/graphicsview/qgraphicslayoutstyleinfo.cpp b/src/widgets/graphicsview/qgraphicslayoutstyleinfo.cpp
index af969b346d..da2510a8cb 100644
--- a/src/widgets/graphicsview/qgraphicslayoutstyleinfo.cpp
+++ b/src/widgets/graphicsview/qgraphicslayoutstyleinfo.cpp
@@ -50,15 +50,13 @@ QT_BEGIN_NAMESPACE
 QGraphicsLayoutStyleInfo::QGraphicsLayoutStyleInfo(const QGraphicsLayoutPrivate *layout)
     : m_layout(layout), m_style(0)
 {
-    m_widget = new QWidget; // pixelMetric might need a widget ptr
-    if (m_widget)
-        m_styleOption.initFrom(m_widget);
+    m_widget.reset(new QWidget); // pixelMetric might need a widget ptr
+    m_styleOption.initFrom(m_widget.get());
     m_isWindow = m_styleOption.state & QStyle::State_Window;
 }
 
 QGraphicsLayoutStyleInfo::~QGraphicsLayoutStyleInfo()
 {
-    delete m_widget;
 }
 
 qreal QGraphicsLayoutStyleInfo::combinedLayoutSpacing(QLayoutPolicy::ControlTypes controls1,
@@ -93,7 +91,7 @@ qreal QGraphicsLayoutStyleInfo::windowMargin(Qt::Orientation orientation) const
                                 const_cast<QStyleOption*>(&m_styleOption), widget());
 }
 
-QWidget *QGraphicsLayoutStyleInfo::widget() const { return m_widget; }
+QWidget *QGraphicsLayoutStyleInfo::widget() const { return m_widget.get(); }
 
 QStyle *QGraphicsLayoutStyleInfo::style() const
 {
diff --git a/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h b/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h
index 7886de432c..9807efb26e 100644
--- a/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h
+++ b/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h
@@ -54,6 +54,8 @@
 #include <QtGui/private/qabstractlayoutstyleinfo_p.h>
 #include <QtWidgets/qstyleoption.h>
 
+#include <memory>
+
 QT_REQUIRE_CONFIG(graphicsview);
 
 QT_BEGIN_NAMESPACE
@@ -82,7 +84,7 @@ public:
 
     virtual void invalidate() override
     {
-        m_style = 0;
+        m_style = nullptr;
         QAbstractLayoutStyleInfo::invalidate();
     }
 
@@ -93,7 +95,7 @@ private:
     const QGraphicsLayoutPrivate *m_layout;
     mutable QStyle *m_style;
     QStyleOption m_styleOption;
-    QWidget *m_widget;
+    std::unique_ptr<QWidget> m_widget;
 };
 
 QT_END_NAMESPACE
diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.cpp b/src/widgets/graphicsview/qgraphicsproxywidget.cpp
index 177dbc4871..e9f092020f 100644
--- a/src/widgets/graphicsview/qgraphicsproxywidget.cpp
+++ b/src/widgets/graphicsview/qgraphicsproxywidget.cpp
@@ -556,7 +556,7 @@ QGraphicsProxyWidget::~QGraphicsProxyWidget()
     exclusively either inside or outside of Graphics View. You cannot embed a
     widget as long as it is is visible elsewhere in the UI, at the same time.
 
-    \a widget must be a top-level widget whose parent is 0.
+    \a widget must be a top-level widget whose parent is \nullptr.
 
     When the widget is embedded, its state (e.g., visible, enabled, geometry,
     size hints) is copied into the proxy widget. If the embedded widget is
@@ -607,20 +607,20 @@ void QGraphicsProxyWidgetPrivate::setWidget_helper(QWidget *newWidget, bool auto
         for (QGraphicsItem *child : childItems) {
             if (child->d_ptr->isProxyWidget()) {
                 QGraphicsProxyWidget *childProxy = static_cast<QGraphicsProxyWidget *>(child);
-                QWidget * parent = childProxy->widget();
-                while (parent->parentWidget() != 0) {
+                QWidget *parent = childProxy->widget();
+                while (parent && parent->parentWidget()) {
                     if (parent == widget)
                         break;
                     parent = parent->parentWidget();
                 }
                 if (!childProxy->widget() || parent != widget)
                     continue;
-                childProxy->setWidget(0);
+                childProxy->setWidget(nullptr);
                 delete childProxy;
             }
         }
 
-        widget = 0;
+        widget = nullptr;
 #ifndef QT_NO_CURSOR
         q->unsetCursor();
 #endif
@@ -739,7 +739,7 @@ QWidget *QGraphicsProxyWidget::widget() const
     Returns the rectangle for \a widget, which must be a descendant of
     widget(), or widget() itself, in this proxy item's local coordinates.
 
-    If no widget is embedded, \a widget is 0, or \a widget is not a
+    If no widget is embedded, \a widget is \nullptr, or \a widget is not a
     descendant of the embedded widget, this function returns an empty QRectF.
 
     \sa widget()
diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp
index bba992144d..19d9f25307 100644
--- a/src/widgets/graphicsview/qgraphicsscene.cpp
+++ b/src/widgets/graphicsview/qgraphicsscene.cpp
@@ -1923,12 +1923,13 @@ void QGraphicsScene::setBspTreeDepth(int depth)
 
     QGraphicsSceneBspTreeIndex *bspTree = qobject_cast<QGraphicsSceneBspTreeIndex *>(d->index);
     if (!bspTree) {
-        qWarning("QGraphicsScene::setBspTreeDepth: can not apply if indexing method is not BSP");
+        qWarning("QGraphicsScene::setBspTreeDepth: cannot apply if indexing method is not BSP");
         return;
     }
     bspTree->setBspTreeDepth(depth);
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \property QGraphicsScene::sortCacheEnabled
     \brief whether sort caching is enabled
@@ -1949,6 +1950,7 @@ void QGraphicsScene::setSortCacheEnabled(bool enabled)
         return;
     d->sortCacheEnabled = enabled;
 }
+#endif
 
 /*!
     Calculates and returns the bounding rect of all items on the scene. This
@@ -2144,8 +2146,8 @@ QList<QGraphicsItem *> QGraphicsScene::collidingItems(const QGraphicsItem *item,
     \overload
     \obsolete
 
-    Returns the topmost visible item at the specified \a position, or 0 if
-    there are no items at this position.
+    Returns the topmost visible item at the specified \a position, or
+    \nullptr if there are no items at this position.
 
     This function is deprecated and returns incorrect results if the scene
     contains items that ignore transformations. Use the overload that takes
@@ -2159,7 +2161,7 @@ QList<QGraphicsItem *> QGraphicsScene::collidingItems(const QGraphicsItem *item,
 /*!
     \since 4.6
 
-    Returns the topmost visible item at the specified \a position, or 0
+    Returns the topmost visible item at the specified \a position, or \nullptr
     if there are no items at this position.
 
     \a deviceTransform is the transformation that applies to the view, and needs to
@@ -2173,7 +2175,7 @@ QGraphicsItem *QGraphicsScene::itemAt(const QPointF &position, const QTransform
 {
     const QList<QGraphicsItem *> itemsAtPoint = items(position, Qt::IntersectsItemShape,
                                                       Qt::DescendingOrder, deviceTransform);
-    return itemsAtPoint.isEmpty() ? 0 : itemsAtPoint.first();
+    return itemsAtPoint.isEmpty() ? nullptr : itemsAtPoint.first();
 }
 
 /*!
@@ -2182,7 +2184,7 @@ QGraphicsItem *QGraphicsScene::itemAt(const QPointF &position, const QTransform
     \since 4.6
 
     Returns the topmost visible item at the position specified by (\a x, \a
-    y), or 0 if there are no items at this position.
+    y), or \nullptr if there are no items at this position.
 
     \a deviceTransform is the transformation that applies to the view, and needs to
     be provided if the scene contains items that ignore transformations.
@@ -2199,7 +2201,7 @@ QGraphicsItem *QGraphicsScene::itemAt(const QPointF &position, const QTransform
     \obsolete
 
     Returns the topmost visible item at the position specified by (\a x, \a
-    y), or 0 if there are no items at this position.
+    y), or \nullptr if there are no items at this position.
 
     This convenience function is equivalent to calling \c
     {itemAt(QPointF(x, y))}.
@@ -2941,9 +2943,9 @@ void QGraphicsScene::removeItem(QGraphicsItem *item)
 
 /*!
     When the scene is active, this functions returns the scene's current focus
-    item, or 0 if no item currently has focus. When the scene is inactive, this
-    functions returns the item that will gain input focus when the scene becomes
-    active.
+    item, or \nullptr if no item currently has focus. When the scene is inactive,
+    this functions returns the item that will gain input focus when the scene
+    becomes active.
 
     The focus item receives keyboard input when the scene receives a
     key event.
@@ -2961,12 +2963,12 @@ QGraphicsItem *QGraphicsScene::focusItem() const
     focusReason, after removing focus from any previous item that may have had
     focus.
 
-    If \a item is 0, or if it either does not accept focus (i.e., it does not
+    If \a item is \nullptr, or if it either does not accept focus (i.e., it does not
     have the QGraphicsItem::ItemIsFocusable flag enabled), or is not visible
     or not enabled, this function only removes focus from any previous
     focusitem.
 
-    If item is not 0, and the scene does not currently have focus (i.e.,
+    If item is not \nullptr, and the scene does not currently have focus (i.e.,
     hasFocus() returns \c false), this function will call setFocus()
     automatically.
 
@@ -3062,9 +3064,9 @@ bool QGraphicsScene::stickyFocus() const
 }
 
 /*!
-    Returns the current mouse grabber item, or 0 if no item is currently
-    grabbing the mouse. The mouse grabber item is the item that receives all
-    mouse events sent to the scene.
+    Returns the current mouse grabber item, or \nullptr if no item is
+    currently grabbing the mouse. The mouse grabber item is the item
+    that receives all mouse events sent to the scene.
 
     An item becomes a mouse grabber when it receives and accepts a
     mouse press event, and it stays the mouse grabber until either of
@@ -3322,6 +3324,9 @@ void QGraphicsScene::advance()
     \l{QWidget::}{enterEvent()} and \l{QWidget::}{leaveEvent()}. Use this
     function to obtain those events instead.
 
+    Returns \c true if \a event has been recognized and processed; otherwise,
+    returns \c false.
+
     \sa contextMenuEvent(), keyPressEvent(), keyReleaseEvent(),
     mousePressEvent(), mouseMoveEvent(), mouseReleaseEvent(),
     mouseDoubleClickEvent(), focusInEvent(), focusOutEvent()
@@ -5547,11 +5552,11 @@ bool QGraphicsScene::focusNextPrevChild(bool next)
 
     \a oldFocusItem is a pointer to the item that previously had focus, or
     0 if no item had focus before the signal was emitted. \a newFocusItem
-    is a pointer to the item that gained input focus, or 0 if focus was lost.
+    is a pointer to the item that gained input focus, or \nullptr if focus was lost.
     \a reason is the reason for the focus change (e.g., if the scene was
     deactivated while an input field had focus, \a oldFocusItem would point
-    to the input field item, \a newFocusItem would be 0, and \a reason would be
-    Qt::ActiveWindowFocusReason.
+    to the input field item, \a newFocusItem would be \nullptr, and \a reason
+    would be Qt::ActiveWindowFocusReason.
 */
 
 /*!
@@ -5582,7 +5587,7 @@ QStyle *QGraphicsScene::style() const
     the style for all widgets in the scene that do not have a style explicitly
     assigned to them.
 
-    If \a style is 0, QGraphicsScene will revert to QApplication::style().
+    If \a style is \nullptr, QGraphicsScene will revert to QApplication::style().
 
     \sa style()
 */
@@ -5703,7 +5708,8 @@ bool QGraphicsScene::isActive() const
 
 /*!
     \since 4.6
-    Returns the current active panel, or 0 if no panel is currently active.
+    Returns the current active panel, or \nullptr if no panel is
+    currently active.
 
     \sa QGraphicsScene::setActivePanel()
 */
@@ -5720,7 +5726,7 @@ QGraphicsItem *QGraphicsScene::activePanel() const
     deactivate any currently active panel.
 
     If the scene is currently inactive, \a item remains inactive until the
-    scene becomes active (or, ir \a item is 0, no item will be activated).
+    scene becomes active (or, ir \a item is \nullptr, no item will be activated).
 
     \sa activePanel(), isActive(), QGraphicsItem::isActive()
 */
@@ -5733,8 +5739,8 @@ void QGraphicsScene::setActivePanel(QGraphicsItem *item)
 /*!
     \since 4.4
 
-    Returns the current active window, or 0 if no window is currently
-    active.
+    Returns the current active window, or \nullptr if no window is
+    currently  active.
 
     \sa QGraphicsScene::setActiveWindow()
 */
@@ -5743,7 +5749,7 @@ QGraphicsWidget *QGraphicsScene::activeWindow() const
     Q_D(const QGraphicsScene);
     if (d->activePanel && d->activePanel->isWindow())
         return static_cast<QGraphicsWidget *>(d->activePanel);
-    return 0;
+    return nullptr;
 }
 
 /*!
diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h
index 287e551db7..3cc00ead08 100644
--- a/src/widgets/graphicsview/qgraphicsscene.h
+++ b/src/widgets/graphicsview/qgraphicsscene.h
@@ -103,7 +103,9 @@ class Q_WIDGETS_EXPORT QGraphicsScene : public QObject
     Q_PROPERTY(int bspTreeDepth READ bspTreeDepth WRITE setBspTreeDepth)
     Q_PROPERTY(QPalette palette READ palette WRITE setPalette)
     Q_PROPERTY(QFont font READ font WRITE setFont)
+#if QT_DEPRECATED_SINCE(5, 13)
     Q_PROPERTY(bool sortCacheEnabled READ isSortCacheEnabled WRITE setSortCacheEnabled)
+#endif
     Q_PROPERTY(bool stickyFocus READ stickyFocus WRITE setStickyFocus)
     Q_PROPERTY(qreal minimumRenderSize READ minimumRenderSize WRITE setMinimumRenderSize)
     Q_PROPERTY(bool focusOnTouch READ focusOnTouch WRITE setFocusOnTouch)
@@ -141,8 +143,10 @@ public:
     ItemIndexMethod itemIndexMethod() const;
     void setItemIndexMethod(ItemIndexMethod method);
 
-    bool isSortCacheEnabled() const;
-    void setSortCacheEnabled(bool enabled);
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED bool isSortCacheEnabled() const;
+    QT_DEPRECATED void setSortCacheEnabled(bool enabled);
+#endif
 
     int bspTreeDepth() const;
     void setBspTreeDepth(int depth);
diff --git a/src/widgets/graphicsview/qgraphicsscene_p.h b/src/widgets/graphicsview/qgraphicsscene_p.h
index a2d13436fc..7934359cee 100644
--- a/src/widgets/graphicsview/qgraphicsscene_p.h
+++ b/src/widgets/graphicsview/qgraphicsscene_p.h
@@ -226,7 +226,7 @@ public:
 
     void drawSubtreeRecursive(QGraphicsItem *item, QPainter *painter, const QTransform *const,
                               QRegion *exposedRegion, QWidget *widget, qreal parentOpacity = qreal(1.0),
-                              const QTransform *const effectTransform = 0);
+                              const QTransform *const effectTransform = nullptr);
     void draw(QGraphicsItem *, QPainter *, const QTransform *const, const QTransform *const,
               QRegion *, QWidget *, qreal, const QTransform *const, bool, bool);
 
@@ -312,9 +312,9 @@ public:
     void gestureTargetsAtHotSpots(const QSet<QGesture *> &gestures,
                            Qt::GestureFlag flag,
                            QHash<QGraphicsObject *, QSet<QGesture *> > *targets,
-                           QSet<QGraphicsObject *> *itemsSet = 0,
-                           QSet<QGesture *> *normal = 0,
-                           QSet<QGesture *> *conflicts = 0);
+                           QSet<QGraphicsObject *> *itemsSet = nullptr,
+                           QSet<QGesture *> *normal = nullptr,
+                           QSet<QGesture *> *conflicts = nullptr);
     void cancelGesturesForChildren(QGesture *original);
     void grabGesture(QGraphicsItem *, Qt::GestureType gesture);
     void ungrabGesture(QGraphicsItem *, Qt::GestureType gesture);
diff --git a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h
index b6387a2c56..7e0e525a6b 100644
--- a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h
+++ b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h
@@ -74,7 +74,7 @@ class Q_AUTOTEST_EXPORT QGraphicsSceneBspTreeIndex : public QGraphicsSceneIndex
     Q_OBJECT
     Q_PROPERTY(int bspTreeDepth READ bspTreeDepth WRITE setBspTreeDepth)
 public:
-    QGraphicsSceneBspTreeIndex(QGraphicsScene *scene = 0);
+    QGraphicsSceneBspTreeIndex(QGraphicsScene *scene = nullptr);
     ~QGraphicsSceneBspTreeIndex();
 
     QList<QGraphicsItem *> estimateItems(const QRectF &rect, Qt::SortOrder order) const override;
@@ -99,7 +99,7 @@ protected:
 
 private :
     Q_DECLARE_PRIVATE(QGraphicsSceneBspTreeIndex)
-    Q_DISABLE_COPY(QGraphicsSceneBspTreeIndex)
+    Q_DISABLE_COPY_MOVE(QGraphicsSceneBspTreeIndex)
     Q_PRIVATE_SLOT(d_func(), void _q_updateSortCache())
     Q_PRIVATE_SLOT(d_func(), void _q_updateIndex())
 
diff --git a/src/widgets/graphicsview/qgraphicssceneevent.cpp b/src/widgets/graphicsview/qgraphicssceneevent.cpp
index 398ef1aaf5..5077a39d67 100644
--- a/src/widgets/graphicsview/qgraphicssceneevent.cpp
+++ b/src/widgets/graphicsview/qgraphicssceneevent.cpp
@@ -319,8 +319,8 @@ QGraphicsSceneEvent::~QGraphicsSceneEvent()
 }
 
 /*!
-    Returns the widget where the event originated, or 0 if the event
-    originates from another application.
+    Returns the widget where the event originated, or \nullptr if the
+    event originates from another application.
 */
 QWidget *QGraphicsSceneEvent::widget() const
 {
diff --git a/src/widgets/graphicsview/qgraphicssceneindex_p.h b/src/widgets/graphicsview/qgraphicssceneindex_p.h
index bdc57bd9ea..b494c52671 100644
--- a/src/widgets/graphicsview/qgraphicssceneindex_p.h
+++ b/src/widgets/graphicsview/qgraphicssceneindex_p.h
@@ -77,7 +77,7 @@ class Q_AUTOTEST_EXPORT QGraphicsSceneIndex : public QObject
     Q_OBJECT
 
 public:
-    QGraphicsSceneIndex(QGraphicsScene *scene = 0);
+    QGraphicsSceneIndex(QGraphicsScene *scene = nullptr);
     virtual ~QGraphicsSceneIndex();
 
     QGraphicsScene *scene() const;
@@ -115,7 +115,7 @@ protected:
     friend class QGraphicsItemPrivate;
     friend class QGraphicsSceneBspTreeIndex;
 private:
-    Q_DISABLE_COPY(QGraphicsSceneIndex)
+    Q_DISABLE_COPY_MOVE(QGraphicsSceneIndex)
     Q_DECLARE_PRIVATE(QGraphicsSceneIndex)
 };
 
@@ -151,7 +151,7 @@ inline void QGraphicsSceneIndexPrivate::items_helper(const QRectF &rect, QGraphi
     if (order == Qt::DescendingOrder) {
         const int n = items->size();
         for (int i = 0; i < n / 2; ++i)
-            items->swap(i, n - i - 1);
+            items->swapItemsAt(i, n - i - 1);
     }
 }
 
diff --git a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h
index 07d5d80ef1..ead52c1fb0 100644
--- a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h
+++ b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h
@@ -67,7 +67,7 @@ class Q_AUTOTEST_EXPORT QGraphicsSceneLinearIndex : public QGraphicsSceneIndex
     Q_OBJECT
 
 public:
-    QGraphicsSceneLinearIndex(QGraphicsScene *scene = 0) : QGraphicsSceneIndex(scene), m_numSortedElements(0)
+    QGraphicsSceneLinearIndex(QGraphicsScene *scene = nullptr) : QGraphicsSceneIndex(scene), m_numSortedElements(0)
     { }
 
     QList<QGraphicsItem *> items(Qt::SortOrder order = Qt::DescendingOrder) const override
diff --git a/src/widgets/graphicsview/qgraphicstransform_p.h b/src/widgets/graphicsview/qgraphicstransform_p.h
index e54ee9fb3c..05e12c3e64 100644
--- a/src/widgets/graphicsview/qgraphicstransform_p.h
+++ b/src/widgets/graphicsview/qgraphicstransform_p.h
@@ -66,7 +66,7 @@ public:
     Q_DECLARE_PUBLIC(QGraphicsTransform)
 
     QGraphicsTransformPrivate()
-        : QObjectPrivate(), item(0) {}
+        : QObjectPrivate(), item(nullptr) {}
     ~QGraphicsTransformPrivate();
 
     QGraphicsItem *item;
diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp
index 24647dd74c..5fe520132f 100644
--- a/src/widgets/graphicsview/qgraphicsview.cpp
+++ b/src/widgets/graphicsview/qgraphicsview.cpp
@@ -1676,7 +1676,7 @@ void QGraphicsView::setInteractive(bool allowed)
 
 /*!
     Returns a pointer to the scene that is currently visualized in the
-    view. If no scene is currently visualized, 0 is returned.
+    view. If no scene is currently visualized, \nullptr is returned.
 
     \sa setScene()
 */
diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp
index a4534c73dd..ad3be5766d 100644
--- a/src/widgets/graphicsview/qgraphicswidget.cpp
+++ b/src/widgets/graphicsview/qgraphicswidget.cpp
@@ -159,7 +159,7 @@ QT_BEGIN_NAMESPACE
     manage the relationships between parent and child items. These functions
     control the stacking order of items as well as their ownership.
 
-    \note The QObject::parent() should always return 0 for QGraphicsWidgets,
+    \note The QObject::parent() should always return \nullptr for QGraphicsWidgets,
     but this policy is not strictly defined.
 
     \sa QGraphicsProxyWidget, QGraphicsItem, {Widgets and Layouts}
@@ -518,7 +518,7 @@ void QGraphicsWidget::setContentsMargins(qreal left, qreal top, qreal right, qre
 /*!
     Gets the widget's contents margins. The margins are stored in \a left, \a
     top, \a right and \a bottom, as pointers to qreals. Each argument can
-    be \e {omitted} by passing 0.
+    be \e {omitted} by passing \nullptr.
 
     \sa setContentsMargins()
 */
@@ -573,7 +573,7 @@ void QGraphicsWidget::setWindowFrameMargins(qreal left, qreal top, qreal right,
 /*!
     Gets the widget's window frame margins. The margins are stored in \a left,
     \a top, \a right and \a bottom as pointers to qreals. Each argument can
-    be \e {omitted} by passing 0.
+    be \e {omitted} by passing \nullptr.
 
     \sa setWindowFrameMargins(), windowFrameRect()
 */
@@ -780,7 +780,7 @@ QSizeF QGraphicsWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) c
     \brief The layout of the widget
 
     Any existing layout manager is deleted before the new layout is assigned. If
-     \a layout is 0, the widget is left without a layout. Existing subwidgets'
+     \a layout is \nullptr, the widget is left without a layout. Existing subwidgets'
     geometries will remain unaffected.
 
     QGraphicsWidget takes ownership of \a layout.
@@ -792,7 +792,7 @@ QSizeF QGraphicsWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) c
     explicitly managed by \a layout remain unaffected by the layout after
     it has been assigned to this widget.
 
-    If no layout is currently managing this widget, layout() will return 0.
+    If no layout is currently managing this widget, layout() will return \nullptr.
 
 */
 
@@ -803,8 +803,8 @@ QSizeF QGraphicsWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) c
 */
 
 /*!
-    Returns this widget's layout, or 0 if no layout is currently managing this
-    widget.
+    Returns this widget's layout, or \nullptr if no layout is currently
+    managing this widget.
 
     \sa setLayout()
 */
@@ -818,7 +818,7 @@ QGraphicsLayout *QGraphicsWidget::layout() const
     \fn void QGraphicsWidget::setLayout(QGraphicsLayout *layout)
 
     Sets the layout for this widget to \a layout. Any existing layout manager
-    is deleted before the new layout is assigned. If \a layout is 0, the
+    is deleted before the new layout is assigned. If \a layout is \nullptr, the
     widget is left without a layout. Existing subwidgets' geometries will
     remain unaffected.
 
@@ -937,11 +937,11 @@ QStyle *QGraphicsWidget::style() const
     Sets the widget's style to \a style. QGraphicsWidget does \e not take
     ownership of \a style.
 
-    If no style is assigned, or \a style is 0, the widget will use
+    If no style is assigned, or \a style is \nullptr, the widget will use
     QGraphicsScene::style() (if this has been set). Otherwise the widget will
     use QApplication::style().
 
-    This function sets the Qt::WA_SetStyle attribute if \a style is not 0;
+    This function sets the Qt::WA_SetStyle attribute if \a style is not \nullptr;
     otherwise it clears the attribute.
 
     \sa style()
@@ -1232,6 +1232,9 @@ QVariant QGraphicsWidget::propertyChange(const QString &propertyName, const QVar
     event() or in any of the convenience functions; you should not have to
     reimplement this function in a subclass of QGraphicsWidget.
 
+    Returns \c true if \a event has been recognized and processed; otherwise,
+    returns \c false.
+
     \sa QGraphicsItem::sceneEvent()
 */
 bool QGraphicsWidget::sceneEvent(QEvent *event)
@@ -1871,7 +1874,7 @@ void QGraphicsWidget::setFocusPolicy(Qt::FocusPolicy policy)
 /*!
     If this widget, a child or descendant of this widget currently has input
     focus, this function will return a pointer to that widget. If
-    no descendant widget has input focus, 0 is returned.
+    no descendant widget has input focus, \nullptr is returned.
 
     \sa QGraphicsItem::focusItem(), QWidget::focusWidget()
 */
@@ -1880,7 +1883,7 @@ QGraphicsWidget *QGraphicsWidget::focusWidget() const
     Q_D(const QGraphicsWidget);
     if (d->subFocusItem && d->subFocusItem->d_ptr->isWidget)
         return static_cast<QGraphicsWidget *>(d->subFocusItem);
-    return 0;
+    return nullptr;
 }
 
 #ifndef QT_NO_SHORTCUT
@@ -2022,7 +2025,7 @@ void QGraphicsWidget::addActions(QList<QAction *> actions)
     \since 4.5
 
     Inserts the action \a action to this widget's list of actions,
-    before the action \a before. It appends the action if \a before is 0 or
+    before the action \a before. It appends the action if \a before is \nullptr or
     \a before is not a valid action for this widget.
 
     A QGraphicsWidget should only have one of each action.
@@ -2062,7 +2065,7 @@ void QGraphicsWidget::insertAction(QAction *before, QAction *action)
     \since 4.5
 
     Inserts the actions \a actions to this widget's list of actions,
-    before the action \a before. It appends the action if \a before is 0 or
+    before the action \a before. It appends the action if \a before is \nullptr or
     \a before is not a valid action for this widget.
 
     A QGraphicsWidget can have at most one of each action.
@@ -2131,9 +2134,9 @@ QList<QAction *> QGraphicsWidget::actions() const
 
     \snippet code/src_gui_graphicsview_qgraphicswidget.cpp 2
 
-    If \a first is 0, this indicates that \a second should be the first widget
+    If \a first is \nullptr, this indicates that \a second should be the first widget
     to receive input focus should the scene gain Tab focus (i.e., the user
-    hits Tab so that focus passes into the scene). If \a second is 0, this
+    hits Tab so that focus passes into the scene). If \a second is \nullptr, this
     indicates that \a first should be the first widget to gain focus if the
     scene gained BackTab focus.
 
@@ -2306,7 +2309,7 @@ void QGraphicsWidget::paintWindowFrame(QPainter *painter, const QStyleOptionGrap
     QStyleHintReturnMask mask;
     bool setMask = style()->styleHint(QStyle::SH_WindowFrame_Mask, &bar, widget, &mask) && !mask.region.isEmpty();
     bool hasBorder = !style()->styleHint(QStyle::SH_TitleBar_NoBorder, &bar, widget);
-    int frameWidth = style()->pixelMetric(QStyle::PM_MDIFrameWidth, &bar, widget);
+    int frameWidth = style()->pixelMetric(QStyle::PM_MdiSubWindowFrameWidth, &bar, widget);
     if (setMask) {
         painter->save();
         painter->setClipRegion(mask.region, Qt::IntersectClip);
diff --git a/src/widgets/graphicsview/qgraphicswidget_p.h b/src/widgets/graphicsview/qgraphicswidget_p.h
index 505a2a24c0..821f8c73f1 100644
--- a/src/widgets/graphicsview/qgraphicswidget_p.h
+++ b/src/widgets/graphicsview/qgraphicswidget_p.h
@@ -82,7 +82,7 @@ public:
     mutable qreal *margins;
     void ensureMargins() const;
 
-    void fixFocusChainBeforeReparenting(QGraphicsWidget *newParent, QGraphicsScene *oldScene, QGraphicsScene *newScene = 0);
+    void fixFocusChainBeforeReparenting(QGraphicsWidget *newParent, QGraphicsScene *oldScene, QGraphicsScene *newScene = nullptr);
     void setLayout_helper(QGraphicsLayout *l);
 
     // Layouts
diff --git a/src/widgets/graphicsview/qsimplex_p.h b/src/widgets/graphicsview/qsimplex_p.h
index 2342da2437..a69cef6115 100644
--- a/src/widgets/graphicsview/qsimplex_p.h
+++ b/src/widgets/graphicsview/qsimplex_p.h
@@ -82,7 +82,7 @@ struct QSimplexVariable
 */
 struct QSimplexConstraint
 {
-    QSimplexConstraint() : constant(0), ratio(Equal), artificial(0) {}
+    QSimplexConstraint() : constant(0), ratio(Equal), artificial(nullptr) {}
 
     enum Ratio {
         LessOrEqual = 0,
@@ -150,7 +150,7 @@ struct QSimplexConstraint
 
 class QSimplex
 {
-    Q_DISABLE_COPY(QSimplex)
+    Q_DISABLE_COPY_MOVE(QSimplex)
 public:
     QSimplex();
     ~QSimplex();
diff --git a/src/widgets/itemviews/qabstractitemdelegate.cpp b/src/widgets/itemviews/qabstractitemdelegate.cpp
index 7bc0ece4b3..448e775a71 100644
--- a/src/widgets/itemviews/qabstractitemdelegate.cpp
+++ b/src/widgets/itemviews/qabstractitemdelegate.cpp
@@ -88,7 +88,7 @@ QT_BEGIN_NAMESPACE
     and is part of Qt's \l{Model/View Programming}{model/view framework}.
 
     To render an item in a custom way, you must implement paint() and
-    sizeHint(). The QItemDelegate class provides default implementations for
+    sizeHint(). The QStyledItemDelegate class provides default implementations for
     these functions; if you do not need custom rendering, subclass that
     class instead.
 
@@ -115,7 +115,7 @@ QT_BEGIN_NAMESPACE
     The second approach is to handle user events directly by reimplementing
     editorEvent().
 
-    \sa {model-view-programming}{Model/View Programming}, QItemDelegate,
+    \sa {model-view-programming}{Model/View Programming}, QStyledItemDelegate,
         {Pixelator Example}, QStyledItemDelegate, QStyle
 */
 
@@ -240,7 +240,7 @@ QAbstractItemDelegate::~QAbstractItemDelegate()
     model being used. The editor's parent widget is specified by \a parent,
     and the item options by \a option.
 
-    The base implementation returns 0. If you want custom editing you
+    The base implementation returns \nullptr. If you want custom editing you
     will need to reimplement this function.
 
     The returned editor widget should have Qt::StrongFocus;
@@ -345,6 +345,7 @@ bool QAbstractItemDelegate::editorEvent(QEvent *,
     return false;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -364,6 +365,7 @@ QString QAbstractItemDelegate::elidedText(const QFontMetrics &fontMetrics, int w
 {
     return fontMetrics.elidedText(text, mode, width);
 }
+#endif
 
 /*!
     \since 4.3
diff --git a/src/widgets/itemviews/qabstractitemdelegate.h b/src/widgets/itemviews/qabstractitemdelegate.h
index 575728e806..5696e55691 100644
--- a/src/widgets/itemviews/qabstractitemdelegate.h
+++ b/src/widgets/itemviews/qabstractitemdelegate.h
@@ -103,8 +103,11 @@ public:
                              const QStyleOptionViewItem &option,
                              const QModelIndex &index);
 
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use QFontMetrics::elidedText() instead")
     static QString elidedText(const QFontMetrics &fontMetrics, int width,
                               Qt::TextElideMode mode, const QString &text);
+#endif
 
     virtual bool helpEvent(QHelpEvent *event,
                            QAbstractItemView *view,
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index 02eae33a12..95631ffa5f 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -940,8 +940,8 @@ void QAbstractItemView::setItemDelegateForRow(int row, QAbstractItemDelegate *de
    \since 4.2
 
    Returns the item delegate used by this view and model for the given \a row,
-   or 0 if no delegate has been assigned. You can call itemDelegate() to get a
-   pointer to the current delegate for a given index.
+   or \nullptr if no delegate has been assigned. You can call itemDelegate()
+   to get a pointer to the current delegate for a given index.
 
    \sa setItemDelegateForRow(), itemDelegateForColumn(), setItemDelegate()
 */
@@ -1689,6 +1689,9 @@ bool QAbstractItemView::event(QEvent *event)
     This? mode, if the given \a event is a QEvent::ToolTip,or a
     QEvent::WhatsThis. It passes all other
     events on to its base class viewportEvent() handler.
+
+    Returns \c true if \a event has been recognized and processed; otherwise,
+    returns \c false.
 */
 bool QAbstractItemView::viewportEvent(QEvent *event)
 {
@@ -1912,7 +1915,7 @@ void QAbstractItemView::mouseReleaseEvent(QMouseEvent *event)
     bool click = (index == d->pressedIndex && index.isValid());
     bool selectedClicked = click && (event->button() == Qt::LeftButton) && d->pressedAlreadySelected;
     EditTrigger trigger = (selectedClicked ? SelectedClicked : NoEditTriggers);
-    bool edited = edit(index, trigger, event);
+    const bool edited = click ? edit(index, trigger, event) : false;
 
     d->ctrlDragSelectionFlag = QItemSelectionModel::NoUpdate;
 
@@ -2438,8 +2441,14 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event)
         break;
     case Qt::Key_Space:
     case Qt::Key_Select:
-        if (!edit(currentIndex(), AnyKeyPressed, event) && d->selectionModel)
-            d->selectionModel->select(currentIndex(), selectionCommand(currentIndex(), event));
+        if (!edit(currentIndex(), AnyKeyPressed, event)) {
+            if (d->selectionModel)
+                d->selectionModel->select(currentIndex(), selectionCommand(currentIndex(), event));
+            if (event->key() == Qt::Key_Space) {
+                keyboardSearch(event->text());
+                event->accept();
+            }
+        }
 #ifdef QT_KEYPAD_NAVIGATION
         if ( event->key()==Qt::Key_Select ) {
             // Also do Key_Enter action.
@@ -2915,6 +2924,7 @@ void QAbstractItemView::editorDestroyed(QObject *editor)
         setState(NoState);
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
     Sets the horizontal scroll bar's steps per item to \a steps.
@@ -2972,6 +2982,7 @@ int QAbstractItemView::verticalStepsPerItem() const
 {
     return 1;
 }
+#endif
 
 /*!
     Moves to and selects the item best matching the string \a search.
@@ -3205,7 +3216,7 @@ bool QAbstractItemView::isPersistentEditorOpen(const QModelIndex &index) const
     This function should only be used to display static content within the
     visible area corresponding to an item of data. If you want to display
     custom dynamic content or implement a custom editor widget, subclass
-    QItemDelegate instead.
+    QStyledItemDelegate instead.
 
     \sa {Delegate Classes}
 */
diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h
index 981582c166..be8fa07c94 100644
--- a/src/widgets/itemviews/qabstractitemview.h
+++ b/src/widgets/itemviews/qabstractitemview.h
@@ -272,10 +272,12 @@ Q_SIGNALS:
 protected:
     QAbstractItemView(QAbstractItemViewPrivate &, QWidget *parent = nullptr);
 
-    void setHorizontalStepsPerItem(int steps);
-    int horizontalStepsPerItem() const;
-    void setVerticalStepsPerItem(int steps);
-    int verticalStepsPerItem() const;
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED void setHorizontalStepsPerItem(int steps);
+    QT_DEPRECATED int horizontalStepsPerItem() const;
+    QT_DEPRECATED void setVerticalStepsPerItem(int steps);
+    QT_DEPRECATED int verticalStepsPerItem() const;
+#endif
 
     enum CursorAction { MoveUp, MoveDown, MoveLeft, MoveRight,
                         MoveHome, MoveEnd, MovePageUp, MovePageDown,
diff --git a/src/widgets/itemviews/qcolumnview.cpp b/src/widgets/itemviews/qcolumnview.cpp
index 5100d2a427..a4eed2d885 100644
--- a/src/widgets/itemviews/qcolumnview.cpp
+++ b/src/widgets/itemviews/qcolumnview.cpp
@@ -103,12 +103,12 @@ void QColumnViewPrivate::initialize()
 {
     Q_Q(QColumnView);
     q->setTextElideMode(Qt::ElideMiddle);
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     QObject::connect(&currentAnimation, SIGNAL(finished()), q, SLOT(_q_changeCurrentColumn()));
     currentAnimation.setTargetObject(hbar);
     currentAnimation.setPropertyName("value");
     currentAnimation.setEasingCurve(QEasingCurve::InOutQuad);
-#endif //QT_NO_ANIMATION
+#endif // animation
     delete itemDelegate;
     q->setItemDelegate(new QColumnViewDelegate(q));
 }
@@ -258,12 +258,12 @@ void QColumnView::scrollTo(const QModelIndex &index, ScrollHint hint)
     if (!index.isValid() || d->columns.isEmpty())
         return;
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     if (d->currentAnimation.state() == QPropertyAnimation::Running)
         return;
 
     d->currentAnimation.stop();
-#endif //QT_NO_ANIMATION
+#endif // animation
 
     // Fill up what is needed to get to index
     d->closeColumns(index, true);
@@ -326,13 +326,13 @@ void QColumnView::scrollTo(const QModelIndex &index, ScrollHint hint)
         }
     }
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     if (const int animationDuration = style()->styleHint(QStyle::SH_Widget_Animation_Duration, 0, this)) {
         d->currentAnimation.setDuration(animationDuration);
         d->currentAnimation.setEndValue(newScrollbarValue);
         d->currentAnimation.start();
     } else
-#endif //QT_NO_ANIMATION
+#endif // animation
     {
         horizontalScrollBar()->setValue(newScrollbarValue);
     }
@@ -402,10 +402,10 @@ void QColumnView::resizeEvent(QResizeEvent *event)
 void QColumnViewPrivate::updateScrollbars()
 {
     Q_Q(QColumnView);
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     if (currentAnimation.state() == QPropertyAnimation::Running)
         return;
-#endif //QT_NO_ANIMATION
+#endif // animation
 
     // find the total horizontal length of the laid out columns
     int horizontalLength = 0;
@@ -801,7 +801,7 @@ void QColumnView::initializeColumn(QAbstractItemView *column) const
 }
 
 /*!
-    Returns the preview widget, or 0 if there is none.
+    Returns the preview widget, or \nullptr if there is none.
 
     \sa setPreviewWidget(), updatePreviewWidget()
 */
diff --git a/src/widgets/itemviews/qcolumnview_p.h b/src/widgets/itemviews/qcolumnview_p.h
index 850ab02747..c60579255e 100644
--- a/src/widgets/itemviews/qcolumnview_p.h
+++ b/src/widgets/itemviews/qcolumnview_p.h
@@ -57,7 +57,9 @@
 #include <private/qabstractitemview_p.h>
 
 #include <QtCore/qabstractitemmodel.h>
+#if QT_CONFIG(animation)
 #include <QtCore/qpropertyanimation.h>
+#endif
 #include <QtWidgets/qabstractitemdelegate.h>
 #include <QtWidgets/qabstractitemview.h>
 #include <QtWidgets/qitemdelegate.h>
@@ -72,7 +74,7 @@ QT_BEGIN_NAMESPACE
 class QColumnViewPreviewColumn : public QAbstractItemView {
 
 public:
-    explicit QColumnViewPreviewColumn(QWidget *parent) : QAbstractItemView(parent), previewWidget(0) {
+    explicit QColumnViewPreviewColumn(QWidget *parent) : QAbstractItemView(parent), previewWidget(nullptr) {
     }
 
     void setPreviewWidget(QWidget *widget) {
@@ -169,7 +171,7 @@ public:
     QVector<int> columnSizes; // used during init and corner moving
     bool showResizeGrips;
     int offset;
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     QPropertyAnimation currentAnimation;
 #endif
     QWidget *previewWidget;
@@ -179,11 +181,12 @@ public:
 /*!
  * This is a delegate that will paint the triangle
  */
+// ### Qt6: QStyledItemDelegate
 class QColumnViewDelegate : public QItemDelegate
 {
 
 public:
-    explicit QColumnViewDelegate(QObject *parent = 0) : QItemDelegate(parent) {}
+    explicit QColumnViewDelegate(QObject *parent = nullptr) : QItemDelegate(parent) {}
     ~QColumnViewDelegate() {}
 
     void paint(QPainter *painter,
diff --git a/src/widgets/itemviews/qcolumnviewgrip_p.h b/src/widgets/itemviews/qcolumnviewgrip_p.h
index 7e2793074b..4311edbeb4 100644
--- a/src/widgets/itemviews/qcolumnviewgrip_p.h
+++ b/src/widgets/itemviews/qcolumnviewgrip_p.h
@@ -68,12 +68,12 @@ Q_SIGNALS:
     void gripMoved(int offset);
 
 public:
-    explicit QColumnViewGrip(QWidget *parent = 0);
+    explicit QColumnViewGrip(QWidget *parent = nullptr);
     ~QColumnViewGrip();
     int moveGrip(int offset);
 
 protected:
-    QColumnViewGrip(QColumnViewGripPrivate &, QWidget *parent = 0, Qt::WindowFlags f = 0);
+    QColumnViewGrip(QColumnViewGripPrivate &, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
     void paintEvent(QPaintEvent *event) override;
     void mouseDoubleClickEvent(QMouseEvent *event) override;
     void mouseMoveEvent(QMouseEvent *event) override;
@@ -82,7 +82,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QColumnViewGrip)
-    Q_DISABLE_COPY(QColumnViewGrip)
+    Q_DISABLE_COPY_MOVE(QColumnViewGrip)
 };
 
 class QColumnViewGripPrivate : public QWidgetPrivate
diff --git a/src/widgets/itemviews/qdatawidgetmapper.cpp b/src/widgets/itemviews/qdatawidgetmapper.cpp
index 1f0dbff7a9..125ee73194 100644
--- a/src/widgets/itemviews/qdatawidgetmapper.cpp
+++ b/src/widgets/itemviews/qdatawidgetmapper.cpp
@@ -324,6 +324,7 @@ void QDataWidgetMapperPrivate::_q_modelDestroyed()
 QDataWidgetMapper::QDataWidgetMapper(QObject *parent)
     : QObject(*new QDataWidgetMapperPrivate, parent)
 {
+    // ### Qt6: QStyledItemDelegate
     setItemDelegate(new QItemDelegate(this));
 }
 
diff --git a/src/widgets/itemviews/qdirmodel.cpp b/src/widgets/itemviews/qdirmodel.cpp
index 78fc623fb5..b94c31fb42 100644
--- a/src/widgets/itemviews/qdirmodel.cpp
+++ b/src/widgets/itemviews/qdirmodel.cpp
@@ -1252,11 +1252,10 @@ void QDirModelPrivate::restorePersistentIndexes()
     for (const SavedPersistent &sp : qAsConst(savedPersistent)) {
         QPersistentModelIndexData *data = sp.data;
         QModelIndex idx = q->index(sp.path, sp.column);
-        if (idx != data->index || data->model == 0) {
+        if (idx != data->index || data->index.model() == nullptr) {
             //data->model may be equal to 0 if the model is getting destroyed
             persistent.indexes.remove(data->index);
             data->index = idx;
-            data->model = q;
             if (idx.isValid())
                 persistent.indexes.insert(idx, data);
         }
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index b7de69d63a..62abf56751 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -2321,9 +2321,10 @@ void QHeaderView::initializeSections()
         if (stretchLastSection())   // we've already gotten the size hint
             d->maybeRestorePrevLastSectionAndStretchLast();
 
-        //make sure we update the hidden sections
+        // make sure we update the hidden sections
+        // simulate remove from newCount to oldCount
         if (newCount < oldCount)
-            d->updateHiddenSections(0, newCount-1);
+            d->updateHiddenSections(newCount, oldCount);
     }
 }
 
@@ -3116,9 +3117,25 @@ void QHeaderView::scrollContentsBy(int dx, int dy)
     \reimp
     \internal
 */
-void QHeaderView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &)
+void QHeaderView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles)
 {
     Q_D(QHeaderView);
+    if (!roles.isEmpty()) {
+        const auto doesRoleAffectSize = [](int role) -> bool {
+            switch (role) {
+            case Qt::DisplayRole:
+            case Qt::DecorationRole:
+            case Qt::SizeHintRole:
+            case Qt::FontRole:
+                return true;
+            default:
+                // who knows what a subclass or custom style might do
+                return role >= Qt::UserRole;
+            }
+        };
+        if (std::none_of(roles.begin(), roles.end(), doesRoleAffectSize))
+            return;
+    }
     d->invalidateCachedSizeHint();
     if (d->hasAutoResizeSections()) {
         bool resizeRequired = d->globalResizeMode == ResizeToContents;
diff --git a/src/widgets/itemviews/qheaderview_p.h b/src/widgets/itemviews/qheaderview_p.h
index d9fc1baec5..766adef36d 100644
--- a/src/widgets/itemviews/qheaderview_p.h
+++ b/src/widgets/itemviews/qheaderview_p.h
@@ -102,7 +102,7 @@ public:
           lastSectionLogicalIdx(-1), // Only trust when we stretch last section
           sectionIndicatorOffset(0),
 #if QT_CONFIG(label)
-          sectionIndicator(0),
+          sectionIndicator(nullptr),
 #endif
           globalResizeMode(QHeaderView::Interactive),
           sectionStartposRecalc(true),
diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp
index 9c65d5fddd..460764f1b8 100644
--- a/src/widgets/itemviews/qitemdelegate.cpp
+++ b/src/widgets/itemviews/qitemdelegate.cpp
@@ -266,7 +266,7 @@ QSizeF QItemDelegatePrivate::doTextLayout(int lineWidth) const
     \row    \li \l Qt::AccessibleDescriptionRole \li QString
     \row    \li \l Qt::AccessibleTextRole \li QString
     \endomit
-    \row    \li \l Qt::BackgroundRole \li QBrush
+    \row    \li \l Qt::BackgroundRole \li QBrush (\since 4.2)
     \row    \li \l Qt::BackgroundColorRole \li QColor (obsolete; use Qt::BackgroundRole instead)
     \row    \li \l Qt::CheckStateRole \li Qt::CheckState
     \row    \li \l Qt::DecorationRole \li QIcon, QPixmap and QColor
@@ -278,7 +278,7 @@ QSizeF QItemDelegatePrivate::doTextLayout(int lineWidth) const
     \row    \li \l Qt::StatusTipRole \li
     \endomit
     \row    \li \l Qt::TextAlignmentRole \li Qt::Alignment
-    \row    \li \l Qt::ForegroundRole \li QBrush
+    \row    \li \l Qt::ForegroundRole \li QBrush (\since 4.2)
     \row    \li \l Qt::TextColorRole \li QColor (obsolete; use Qt::ForegroundRole instead)
     \omit
     \row    \li \l Qt::ToolTipRole
@@ -724,8 +724,8 @@ void QItemDelegate::drawDecoration(QPainter *painter, const QStyleOptionViewItem
     QPoint p = QStyle::alignedRect(option.direction, option.decorationAlignment,
                                    pixmap.size(), rect).topLeft();
     if (option.state & QStyle::State_Selected) {
-        QPixmap *pm = selected(pixmap, option.palette, option.state & QStyle::State_Enabled);
-        painter->drawPixmap(p, *pm);
+        const QPixmap pm = selectedPixmap(pixmap, option.palette, option.state & QStyle::State_Enabled);
+        painter->drawPixmap(p, pm);
     } else {
         painter->drawPixmap(p, pixmap);
     }
@@ -789,7 +789,7 @@ void QItemDelegate::drawCheck(QPainter *painter,
 
     const QWidget *widget = d->widget(option);
     QStyle *style = widget ? widget->style() : QApplication::style();
-    style->drawPrimitive(QStyle::PE_IndicatorViewItemCheck, &opt, painter, widget);
+    style->drawPrimitive(QStyle::PE_IndicatorItemViewItemCheck, &opt, painter, widget);
 }
 
 /*!
@@ -1001,17 +1001,32 @@ static QString qPixmapSerial(quint64 i, bool enabled)
     return QString((const QChar *)ptr, int(&arr[sizeof(arr) / sizeof(ushort)] - ptr));
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
+QPixmap *QItemDelegate::selected(const QPixmap &pixmap, const QPalette &palette, bool enabled) const
+{
+    const QString key = qPixmapSerial(pixmap.cacheKey(), enabled);
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
+    QPixmap *pm = QPixmapCache::find(key);
+    if (pm)
+        return pm;
+    selectedPixmap(pixmap, palette, enabled);
+    return QPixmapCache::find(key);
+QT_WARNING_POP
+}
+#endif
+
 /*!
   \internal
   Returns the selected version of the given \a pixmap using the given \a palette.
   The \a enabled argument decides whether the normal or disabled highlight color of
   the palette is used.
 */
-QPixmap *QItemDelegate::selected(const QPixmap &pixmap, const QPalette &palette, bool enabled) const
+QPixmap QItemDelegate::selectedPixmap(const QPixmap &pixmap, const QPalette &palette, bool enabled)
 {
-    QString key = qPixmapSerial(pixmap.cacheKey(), enabled);
-    QPixmap *pm = QPixmapCache::find(key);
-    if (!pm) {
+    const QString key = qPixmapSerial(pixmap.cacheKey(), enabled);
+    QPixmap pm;
+    if (!QPixmapCache::find(key, &pm)) {
         QImage img = pixmap.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied);
 
         QColor color = palette.color(enabled ? QPalette::Normal : QPalette::Disabled,
@@ -1023,13 +1038,12 @@ QPixmap *QItemDelegate::selected(const QPixmap &pixmap, const QPalette &palette,
         painter.fillRect(0, 0, img.width(), img.height(), color);
         painter.end();
 
-        QPixmap selected = QPixmap(QPixmap::fromImage(img));
-        int n = (img.sizeInBytes() >> 10) + 1;
+        pm = QPixmap(QPixmap::fromImage(img));
+        const int n = (img.sizeInBytes() >> 10) + 1;
         if (QPixmapCache::cacheLimit() < n)
             QPixmapCache::setCacheLimit(n);
 
-        QPixmapCache::insert(key, selected);
-        pm = QPixmapCache::find(key);
+        QPixmapCache::insert(key, pm);
     }
     return pm;
 }
diff --git a/src/widgets/itemviews/qitemdelegate.h b/src/widgets/itemviews/qitemdelegate.h
index 539dec4374..e504615fb2 100644
--- a/src/widgets/itemviews/qitemdelegate.h
+++ b/src/widgets/itemviews/qitemdelegate.h
@@ -113,7 +113,12 @@ protected:
                                     const QStyleOptionViewItem &option) const;
 
     QPixmap decoration(const QStyleOptionViewItem &option, const QVariant &variant) const;
+
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use selectedPixmap() instead")
     QPixmap *selected(const QPixmap &pixmap, const QPalette &palette, bool enabled) const;
+#endif
+    static QPixmap selectedPixmap(const QPixmap &pixmap, const QPalette &palette, bool enabled);
 
     QRect doCheck(const QStyleOptionViewItem &option, const QRect &bounding,
                 const QVariant &variant) const;
diff --git a/src/widgets/itemviews/qitemeditorfactory.cpp b/src/widgets/itemviews/qitemeditorfactory.cpp
index 0986da9707..2d49dd4421 100644
--- a/src/widgets/itemviews/qitemeditorfactory.cpp
+++ b/src/widgets/itemviews/qitemeditorfactory.cpp
@@ -122,7 +122,7 @@ Q_SIGNALS:
     \inmodule QtWidgets
 
     When editing data in an item view, editors are created and
-    displayed by a delegate. QItemDelegate, which is the delegate by
+    displayed by a delegate. QStyledItemDelegate, which is the delegate by
     default installed on Qt's item views, uses a QItemEditorFactory to
     create editors for it. A default unique instance provided by
     QItemEditorFactory is used by all item delegates.  If you set a
@@ -156,7 +156,7 @@ Q_SIGNALS:
 
     Additional editors can be registered with the registerEditor() function.
 
-    \sa QItemDelegate, {Model/View Programming}, {Color Editor Factory Example}
+    \sa QStyledItemDelegate, {Model/View Programming}, {Color Editor Factory Example}
 */
 
 /*!
@@ -244,6 +244,7 @@ QWidget *QDefaultItemEditorFactory::createEditor(int userType, QWidget *parent)
     case QVariant::Bool: {
         QBooleanComboBox *cb = new QBooleanComboBox(parent);
         cb->setFrame(false);
+        cb->setSizePolicy(QSizePolicy::Ignored, cb->sizePolicy().verticalPolicy());
         return cb; }
 #endif
 #if QT_CONFIG(spinbox)
@@ -252,12 +253,14 @@ QWidget *QDefaultItemEditorFactory::createEditor(int userType, QWidget *parent)
         sb->setFrame(false);
         sb->setMinimum(0);
         sb->setMaximum(INT_MAX);
+        sb->setSizePolicy(QSizePolicy::Ignored, sb->sizePolicy().verticalPolicy());
         return sb; }
     case QVariant::Int: {
         QSpinBox *sb = new QSpinBox(parent);
         sb->setFrame(false);
         sb->setMinimum(INT_MIN);
         sb->setMaximum(INT_MAX);
+        sb->setSizePolicy(QSizePolicy::Ignored, sb->sizePolicy().verticalPolicy());
         return sb; }
 #endif
 #if QT_CONFIG(datetimeedit)
@@ -284,6 +287,7 @@ QWidget *QDefaultItemEditorFactory::createEditor(int userType, QWidget *parent)
         sb->setFrame(false);
         sb->setMinimum(-DBL_MAX);
         sb->setMaximum(DBL_MAX);
+        sb->setSizePolicy(QSizePolicy::Ignored, sb->sizePolicy().verticalPolicy());
         return sb; }
 #endif
 #if QT_CONFIG(lineedit)
@@ -375,7 +379,7 @@ void QItemEditorFactory::setDefaultFactory(QItemEditorFactory *factory)
     QItemEditorCreatorBase objects are specialized widget factories that
     provide editor widgets for one particular QVariant data type. They
     are used by QItemEditorFactory to create editors for
-    \l{QItemDelegate}s. Creator bases must be registered with
+    \l{QStyledItemDelegate}s. Creator bases must be registered with
     QItemEditorFactory::registerEditor().
 
     An editor should provide a user property for the data it edits.
@@ -457,7 +461,7 @@ QItemEditorCreatorBase::~QItemEditorCreatorBase()
     \snippet code/src_gui_itemviews_qitemeditorfactory.cpp 1
 
     The constructor takes the name of the property that contains the
-    editing data. QItemDelegate can then access the property by name
+    editing data. QStyledItemDelegate can then access the property by name
     when it sets and retrieves editing data. Only use this class if
     your editor does not define a user property (using the USER
     keyword in the Q_PROPERTY macro).  If the widget has a user
@@ -472,7 +476,7 @@ QItemEditorCreatorBase::~QItemEditorCreatorBase()
 
     Constructs an editor creator object using \a valuePropertyName
     as the name of the property to be used for editing. The
-    property name is used by QItemDelegate when setting and
+    property name is used by QStyledItemDelegate when setting and
     getting editor data.
 
     Note that the \a valuePropertyName is only used if the editor
@@ -508,11 +512,11 @@ QItemEditorCreatorBase::~QItemEditorCreatorBase()
     \snippet code/src_gui_itemviews_qitemeditorfactory.cpp 2
 
     Setting the \c editorFactory created above in an item delegate via
-    QItemDelegate::setItemEditorFactory() makes sure that all values of type
+    QStyledItemDelegate::setItemEditorFactory() makes sure that all values of type
     QVariant::DateTime will be edited in \c{MyFancyDateTimeEdit}.
 
     The editor must provide a user property that will contain the
-    editing data. The property is used by \l{QItemDelegate}s to set
+    editing data. The property is used by \l{QStyledItemDelegate}s to set
     and retrieve the data (using Qt's \l{Meta-Object
     System}{meta-object system}). You set the user property with
     the USER keyword:
@@ -520,7 +524,7 @@ QItemEditorCreatorBase::~QItemEditorCreatorBase()
     \snippet code/src_gui_itemviews_qitemeditorfactory.cpp 3
 
     \sa QItemEditorCreatorBase, QItemEditorCreator,
-        QItemEditorFactory, QItemDelegate, {Color Editor Factory Example}
+        QItemEditorFactory, QStyledItemDelegate, {Color Editor Factory Example}
 */
 
 /*!
diff --git a/src/widgets/itemviews/qitemeditorfactory.h b/src/widgets/itemviews/qitemeditorfactory.h
index f2610ad3de..118f6e45e8 100644
--- a/src/widgets/itemviews/qitemeditorfactory.h
+++ b/src/widgets/itemviews/qitemeditorfactory.h
@@ -66,8 +66,8 @@ class QItemEditorCreator : public QItemEditorCreatorBase
 {
 public:
     inline explicit QItemEditorCreator(const QByteArray &valuePropertyName);
-    inline QWidget *createWidget(QWidget *parent) const { return new T(parent); }
-    inline QByteArray valuePropertyName() const { return propertyName; }
+    inline QWidget *createWidget(QWidget *parent) const override { return new T(parent); }
+    inline QByteArray valuePropertyName() const override { return propertyName; }
 
 private:
     QByteArray propertyName;
diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp
index fdac332367..641b15f85b 100644
--- a/src/widgets/itemviews/qlistview.cpp
+++ b/src/widgets/itemviews/qlistview.cpp
@@ -982,18 +982,9 @@ void QListView::paintEvent(QPaintEvent *e)
         ? qMax(viewport()->size().width(), d->contentsSize().width()) - 2 * d->spacing()
         : qMax(viewport()->size().height(), d->contentsSize().height()) - 2 * d->spacing();
 
-    const int rowCount = d->commonListView->rowCount();
     QVector<QModelIndex>::const_iterator end = toBeRendered.constEnd();
     for (QVector<QModelIndex>::const_iterator it = toBeRendered.constBegin(); it != end; ++it) {
         Q_ASSERT((*it).isValid());
-        if (rowCount == 1)
-            option.viewItemPosition = QStyleOptionViewItem::OnlyOne;
-        else if ((*it).row() == 0)
-            option.viewItemPosition = QStyleOptionViewItem::Beginning;
-        else if ((*it).row() == rowCount - 1)
-            option.viewItemPosition = QStyleOptionViewItem::End;
-        else
-            option.viewItemPosition = QStyleOptionViewItem::Middle;
         option.rect = visualRect(*it);
 
         if (flow() == TopToBottom)
@@ -1109,19 +1100,45 @@ QModelIndex QListView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifie
     Q_D(QListView);
     Q_UNUSED(modifiers);
 
-    QModelIndex current = currentIndex();
-    if (!current.isValid()) {
+    auto findAvailableRowBackward = [d](int row) {
+        while (row >= 0 && d->isHiddenOrDisabled(row))
+            --row;
+        return row;
+    };
+
+    auto findAvailableRowForward = [d](int row) {
         int rowCount = d->model->rowCount(d->root);
         if (!rowCount)
-            return QModelIndex();
-        int row = 0;
+            return -1;
         while (row < rowCount && d->isHiddenOrDisabled(row))
             ++row;
         if (row >= rowCount)
+            return -1;
+        return row;
+    };
+
+    QModelIndex current = currentIndex();
+    if (!current.isValid()) {
+        int row = findAvailableRowForward(0);
+        if (row == -1)
             return QModelIndex();
         return d->model->index(row, d->column, d->root);
     }
 
+    if ((d->flow == LeftToRight && cursorAction == MoveLeft) ||
+            (d->flow == TopToBottom && (cursorAction == MoveUp || cursorAction == MovePrevious))) {
+        const int row = findAvailableRowBackward(current.row() - 1);
+        if (row == -1)
+            return current;
+        return d->model->index(row, d->column, d->root);
+    } else if ((d->flow == LeftToRight && cursorAction == MoveRight) ||
+               (d->flow == TopToBottom && (cursorAction == MoveDown || cursorAction == MoveNext))) {
+        const int row = findAvailableRowForward(current.row() + 1);
+        if (row == -1)
+            return current;
+        return d->model->index(row, d->column, d->root);
+    }
+
     const QRect initialRect = rectForIndex(current);
     QRect rect = initialRect;
     if (rect.isEmpty()) {
@@ -1298,8 +1315,8 @@ void QListView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFl
             if (tl.isValid() && br.isValid()
                 && d->isIndexEnabled(tl)
                 && d->isIndexEnabled(br)) {
-                QRect first = rectForIndex(tl);
-                QRect last = rectForIndex(br);
+                QRect first = d->cellRectForIndex(tl);
+                QRect last = d->cellRectForIndex(br);
                 QRect middle;
                 if (d->flow == LeftToRight) {
                     QRect &top = first;
diff --git a/src/widgets/itemviews/qlistview_p.h b/src/widgets/itemviews/qlistview_p.h
index 3f997ef7e3..86331bb862 100644
--- a/src/widgets/itemviews/qlistview_p.h
+++ b/src/widgets/itemviews/qlistview_p.h
@@ -248,7 +248,7 @@ private:
 class QIconModeViewBase : public QCommonListViewBase
 {
 public:
-    QIconModeViewBase(QListView *q, QListViewPrivate *d) : QCommonListViewBase(q, d), interSectingVector(0) {}
+    QIconModeViewBase(QListView *q, QListViewPrivate *d) : QCommonListViewBase(q, d), interSectingVector(nullptr) {}
 
     QBspTree tree;
     QVector<QListViewItem> items;
@@ -333,14 +333,31 @@ public:
     inline QModelIndex listViewItemToIndex(const QListViewItem &item) const
         { return model->index(commonListView->itemIndex(item), column, root); }
 
+    inline bool hasRectForIndex(const QModelIndex &index) const
+    {
+        return isIndexValid(index) && index.parent() == root && index.column() == column && !isHidden(index.row());
+    }
+
     QRect rectForIndex(const QModelIndex &index) const
     {
-        if (!isIndexValid(index) || index.parent() != root || index.column() != column || isHidden(index.row()))
+        if (!hasRectForIndex(index))
             return QRect();
         executePostedLayout();
         return viewItemRect(indexToListViewItem(index));
     }
 
+    QRect cellRectForIndex(const QModelIndex &index)
+    {
+        if (!hasRectForIndex(index))
+            return QRect();
+        executePostedLayout();
+        auto oldItemAlignment = itemAlignment;
+        itemAlignment = Qt::Alignment();
+        const QRect rect = rectForIndex(index);
+        itemAlignment = oldItemAlignment;
+        return rect;
+    }
+
     void viewUpdateGeometries() { q_func()->updateGeometries(); }
 
 
diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp
index 895622616e..a9899983c2 100644
--- a/src/widgets/itemviews/qlistwidget.cpp
+++ b/src/widgets/itemviews/qlistwidget.cpp
@@ -583,24 +583,6 @@ Qt::DropActions QListModel::supportedDropActions() const
 */
 
 /*!
-    \fn void QListWidgetItem::setSelected(bool select)
-    \since 4.2
-
-    Sets the selected state of the item to \a select.
-
-    \sa isSelected()
-*/
-
-/*!
-    \fn bool QListWidgetItem::isSelected() const
-    \since 4.2
-
-    Returns \c true if the item is selected; otherwise returns \c false.
-
-    \sa setSelected()
-*/
-
-/*!
     \fn void QListWidgetItem::setHidden(bool hide)
     \since 4.2
 
@@ -634,14 +616,14 @@ Qt::DropActions QListModel::supportedDropActions() const
 
     \sa type()
 */
-QListWidgetItem::QListWidgetItem(QListWidget *view, int type)
-    : rtti(type), view(view), d(new QListWidgetItemPrivate(this)),
+QListWidgetItem::QListWidgetItem(QListWidget *listview, int type)
+    : rtti(type), view(listview), d(new QListWidgetItemPrivate(this)),
       itemFlags(Qt::ItemIsSelectable
                 |Qt::ItemIsUserCheckable
                 |Qt::ItemIsEnabled
                 |Qt::ItemIsDragEnabled)
 {
-    if (QListModel *model = (view ? qobject_cast<QListModel*>(view->model()) : 0))
+    if (QListModel *model = listModel())
         model->insert(model->rowCount(), this);
 }
 
@@ -661,16 +643,18 @@ QListWidgetItem::QListWidgetItem(QListWidget *view, int type)
 
     \sa type()
 */
-QListWidgetItem::QListWidgetItem(const QString &text, QListWidget *view, int type)
-    : rtti(type), view(0), d(new QListWidgetItemPrivate(this)),
+QListWidgetItem::QListWidgetItem(const QString &text, QListWidget *listview, int type)
+    : rtti(type), view(listview), d(new QListWidgetItemPrivate(this)),
       itemFlags(Qt::ItemIsSelectable
                 |Qt::ItemIsUserCheckable
                 |Qt::ItemIsEnabled
                 |Qt::ItemIsDragEnabled)
 {
-    setData(Qt::DisplayRole, text);
-    this->view = view;
-    if (QListModel *model = (view ? qobject_cast<QListModel*>(view->model()) : 0))
+    {
+        QSignalBlocker b(view);
+        setData(Qt::DisplayRole, text);
+    }
+    if (QListModel *model = listModel())
         model->insert(model->rowCount(), this);
 }
 
@@ -692,17 +676,19 @@ QListWidgetItem::QListWidgetItem(const QString &text, QListWidget *view, int typ
     \sa type()
 */
 QListWidgetItem::QListWidgetItem(const QIcon &icon,const QString &text,
-                                 QListWidget *view, int type)
-    : rtti(type), view(0), d(new QListWidgetItemPrivate(this)),
+                                 QListWidget *listview, int type)
+    : rtti(type), view(listview), d(new QListWidgetItemPrivate(this)),
       itemFlags(Qt::ItemIsSelectable
                 |Qt::ItemIsUserCheckable
                 |Qt::ItemIsEnabled
                 |Qt::ItemIsDragEnabled)
 {
-    setData(Qt::DisplayRole, text);
-    setData(Qt::DecorationRole, icon);
-    this->view = view;
-    if (QListModel *model = (view ? qobject_cast<QListModel*>(view->model()) : 0))
+    {
+        QSignalBlocker b(view);
+        setData(Qt::DisplayRole, text);
+        setData(Qt::DecorationRole, icon);
+    }
+    if (QListModel *model = listModel())
         model->insert(model->rowCount(), this);
 }
 
@@ -711,7 +697,7 @@ QListWidgetItem::QListWidgetItem(const QIcon &icon,const QString &text,
 */
 QListWidgetItem::~QListWidgetItem()
 {
-    if (QListModel *model = (view ? qobject_cast<QListModel*>(view->model()) : 0))
+    if (QListModel *model = listModel())
         model->remove(this);
     delete d;
 }
@@ -748,7 +734,7 @@ void QListWidgetItem::setData(int role, const QVariant &value)
     }
     if (!found)
         d->values.append(QWidgetItemData(role, value));
-    if (QListModel *model = (view ? qobject_cast<QListModel*>(view->model()) : nullptr)) {
+    if (QListModel *model = listModel()) {
         const QVector<int> roles((role == Qt::DisplayRole) ?
                                     QVector<int>({Qt::DisplayRole, Qt::EditRole}) :
                                     QVector<int>({role}));
@@ -815,7 +801,7 @@ void QListWidgetItem::write(QDataStream &out) const
     \sa data(), flags()
 */
 QListWidgetItem::QListWidgetItem(const QListWidgetItem &other)
-    : rtti(Type), view(0),
+    : rtti(Type), view(nullptr),
       d(new QListWidgetItemPrivate(this)),
       itemFlags(other.itemFlags)
 {
@@ -837,6 +823,15 @@ QListWidgetItem &QListWidgetItem::operator=(const QListWidgetItem &other)
     return *this;
 }
 
+/*!
+   \internal
+   returns the QListModel if a view is set
+ */
+QListModel *QListWidgetItem::listModel() const
+{
+    return (view ? qobject_cast<QListModel*>(view->model()) : nullptr);
+}
+
 #ifndef QT_NO_DATASTREAM
 
 /*!
@@ -989,6 +984,50 @@ QDataStream &operator>>(QDataStream &in, QListWidgetItem &item)
 */
 
 /*!
+    \fn void QListWidgetItem::setSelected(bool select)
+    \since 4.2
+
+    Sets the selected state of the item to \a select.
+
+    \sa isSelected()
+*/
+void QListWidgetItem::setSelected(bool select)
+{
+    const QListModel *model = listModel();
+    if (!model || !view->selectionModel())
+        return;
+    const QAbstractItemView::SelectionMode selectionMode = view->selectionMode();
+    if (selectionMode == QAbstractItemView::NoSelection)
+        return;
+    const QModelIndex index = model->index(this);
+    if (selectionMode == QAbstractItemView::SingleSelection)
+        view->selectionModel()->select(index, select
+                                       ? QItemSelectionModel::ClearAndSelect
+                                       : QItemSelectionModel::Deselect);
+    else
+        view->selectionModel()->select(index, select
+                                       ? QItemSelectionModel::Select
+                                       : QItemSelectionModel::Deselect);
+}
+
+/*!
+    \fn bool QListWidgetItem::isSelected() const
+    \since 4.2
+
+    Returns \c true if the item is selected; otherwise returns \c false.
+
+    \sa setSelected()
+*/
+bool QListWidgetItem::isSelected() const
+{
+    const QListModel *model = listModel();
+    if (!model || !view->selectionModel())
+        return false;
+    const QModelIndex index = model->index(this);
+    return view->selectionModel()->isSelected(index);
+}
+
+/*!
     \fn void QListWidgetItem::setFlags(Qt::ItemFlags flags)
 
     Sets the item flags for the list item to \a flags.
@@ -998,7 +1037,7 @@ QDataStream &operator>>(QDataStream &in, QListWidgetItem &item)
 void QListWidgetItem::setFlags(Qt::ItemFlags aflags)
 {
     itemFlags = aflags;
-    if (QListModel *model = (view ? qobject_cast<QListModel*>(view->model()) : 0))
+    if (QListModel *model = listModel())
         model->itemChanged(this);
 }
 
@@ -1415,7 +1454,7 @@ void QListWidget::setSelectionModel(QItemSelectionModel *selectionModel)
 
 /*!
     Returns the item that occupies the given \a row in the list if one has been
-    set; otherwise returns 0.
+    set; otherwise returns \nullptr.
 
     \sa row()
 */
@@ -1482,7 +1521,7 @@ void QListWidget::insertItems(int row, const QStringList &labels)
 
 /*!
     Removes and returns the item from the given \a row in the list widget;
-    otherwise returns 0.
+    otherwise returns \nullptr.
 
     Items removed from a list widget will not be managed by Qt, and will need
     to be deleted manually.
@@ -1718,7 +1757,7 @@ QWidget *QListWidget::itemWidget(QListWidgetItem *item) const
 
     This function should only be used to display static content in the place of
     a list widget item. If you want to display custom dynamic content or
-    implement a custom editor widget, use QListView and subclass QItemDelegate
+    implement a custom editor widget, use QListView and subclass QStyledItemDelegate
     instead.
 
     \sa itemWidget(), removeItemWidget(), {Delegate Classes}
@@ -1730,6 +1769,7 @@ void QListWidget::setItemWidget(QListWidgetItem *item, QWidget *widget)
     QAbstractItemView::setIndexWidget(index, widget);
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     Returns \c true if \a item is selected; otherwise returns \c false.
 
@@ -1739,9 +1779,7 @@ void QListWidget::setItemWidget(QListWidgetItem *item, QWidget *widget)
 */
 bool QListWidget::isItemSelected(const QListWidgetItem *item) const
 {
-    Q_D(const QListWidget);
-    QModelIndex index = d->listModel()->index(const_cast<QListWidgetItem*>(item));
-    return selectionModel()->isSelected(index);
+    return ((item && item->listWidget() == this) ? item->isSelected() : false);
 }
 
 /*!
@@ -1754,20 +1792,10 @@ bool QListWidget::isItemSelected(const QListWidgetItem *item) const
 */
 void QListWidget::setItemSelected(const QListWidgetItem *item, bool select)
 {
-    Q_D(QListWidget);
-    QModelIndex index = d->listModel()->index(const_cast<QListWidgetItem*>(item));
-
-    if (d->selectionMode == SingleSelection) {
-        selectionModel()->select(index, select
-                                 ? QItemSelectionModel::ClearAndSelect
-                                 : QItemSelectionModel::Deselect);
-    } else if (d->selectionMode != NoSelection) {
-        selectionModel()->select(index, select
-                                 ? QItemSelectionModel::Select
-                                 : QItemSelectionModel::Deselect);
-    }
-
+    if (item && item->listWidget() == this)
+        const_cast<QListWidgetItem*>(item)->setSelected(select);
 }
+#endif
 
 /*!
     Returns a list of all selected items in the list widget.
@@ -1803,6 +1831,7 @@ QList<QListWidgetItem*> QListWidget::findItems(const QString &text, Qt::MatchFla
     return items;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     Returns \c true if the \a item is explicitly hidden; otherwise returns \c false.
 
@@ -1826,6 +1855,7 @@ void QListWidget::setItemHidden(const QListWidgetItem *item, bool hide)
 {
     setRowHidden(row(item), hide);
 }
+#endif
 
 /*!
     Scrolls the view if necessary to ensure that the \a item is visible.
diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h
index d3b27d201a..c102b144df 100644
--- a/src/widgets/itemviews/qlistwidget.h
+++ b/src/widgets/itemviews/qlistwidget.h
@@ -61,10 +61,10 @@ class Q_WIDGETS_EXPORT QListWidgetItem
     friend class QListWidget;
 public:
     enum ItemType { Type = 0, UserType = 1000 };
-    explicit QListWidgetItem(QListWidget *view = nullptr, int type = Type);
-    explicit QListWidgetItem(const QString &text, QListWidget *view = nullptr, int type = Type);
+    explicit QListWidgetItem(QListWidget *listview = nullptr, int type = Type);
+    explicit QListWidgetItem(const QString &text, QListWidget *listview = nullptr, int type = Type);
     explicit QListWidgetItem(const QIcon &icon, const QString &text,
-                             QListWidget *view = nullptr, int type = Type);
+                             QListWidget *listview = nullptr, int type = Type);
     QListWidgetItem(const QListWidgetItem &other);
     virtual ~QListWidgetItem();
 
@@ -72,8 +72,8 @@ public:
 
     inline QListWidget *listWidget() const { return view; }
 
-    inline void setSelected(bool select);
-    inline bool isSelected() const;
+    void setSelected(bool select);
+    bool isSelected() const;
 
     inline void setHidden(bool hide);
     inline bool isHidden() const;
@@ -118,10 +118,11 @@ public:
     QT_DEPRECATED_X ("Use QListWidgetItem::background() instead")
     inline QColor backgroundColor() const
         { return qvariant_cast<QColor>(data(Qt::BackgroundRole)); }
+#endif
+    // no QT_DEPRECATED_SINCE because it is a virtual function
     QT_DEPRECATED_X ("Use QListWidgetItem::setBackground() instead")
     virtual void setBackgroundColor(const QColor &color)
         { setData(Qt::BackgroundRole, color); }
-#endif
 
     inline QBrush background() const
         { return qvariant_cast<QBrush>(data(Qt::BackgroundRole)); }
@@ -166,6 +167,7 @@ public:
     inline int type() const { return rtti; }
 
 private:
+    QListModel *listModel() const;
     int rtti;
     QVector<void *> dummy;
     QListWidget *view;
@@ -254,13 +256,21 @@ public:
     void setItemWidget(QListWidgetItem *item, QWidget *widget);
     inline void removeItemWidget(QListWidgetItem *item);
 
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X ("Use QListWidgetItem::isSelected() instead")
     bool isItemSelected(const QListWidgetItem *item) const;
+    QT_DEPRECATED_X ("Use QListWidgetItem::setSelected() instead")
     void setItemSelected(const QListWidgetItem *item, bool select);
+#endif
     QList<QListWidgetItem*> selectedItems() const;
     QList<QListWidgetItem*> findItems(const QString &text, Qt::MatchFlags flags) const;
 
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X ("Use QListWidgetItem::isHidden() instead")
     bool isItemHidden(const QListWidgetItem *item) const;
+    QT_DEPRECATED_X ("Use QListWidgetItem::setHidden() instead")
     void setItemHidden(const QListWidgetItem *item, bool hide);
+#endif
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 protected:
 #endif
@@ -339,17 +349,11 @@ inline void QListWidget::addItem(QListWidgetItem *aitem)
 inline QListWidgetItem *QListWidget::itemAt(int ax, int ay) const
 { return itemAt(QPoint(ax, ay)); }
 
-inline void QListWidgetItem::setSelected(bool aselect)
-{ if (view) view->setItemSelected(this, aselect); }
-
-inline bool QListWidgetItem::isSelected() const
-{ return (view ? view->isItemSelected(this) : false); }
-
 inline void QListWidgetItem::setHidden(bool ahide)
-{ if (view) view->setItemHidden(this, ahide); }
+{ if (view) view->setRowHidden(view->row(this), ahide); }
 
 inline bool QListWidgetItem::isHidden() const
-{ return (view ? view->isItemHidden(this) : false); }
+{ return (view ? view->isRowHidden(view->row(this)) : false); }
 
 QT_END_NAMESPACE
 
diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp
index 0f7566e8ec..22067851cb 100644
--- a/src/widgets/itemviews/qstyleditemdelegate.cpp
+++ b/src/widgets/itemviews/qstyleditemdelegate.cpp
@@ -139,7 +139,7 @@ public:
     \row    \li \l Qt::AccessibleDescriptionRole \li QString
     \row    \li \l Qt::AccessibleTextRole \li QString
     \endomit
-    \row    \li \l Qt::BackgroundRole \li QBrush
+    \row    \li \l Qt::BackgroundRole \li QBrush (\since 4.2)
     \row    \li \l Qt::BackgroundColorRole \li QColor (obsolete; use Qt::BackgroundRole instead)
     \row    \li \l Qt::CheckStateRole \li Qt::CheckState
     \row    \li \l Qt::DecorationRole \li QIcon, QPixmap, QImage and QColor
@@ -151,7 +151,7 @@ public:
     \row    \li \l Qt::StatusTipRole \li
     \endomit
     \row    \li \l Qt::TextAlignmentRole \li Qt::Alignment
-    \row    \li \l Qt::ForegroundRole \li QBrush
+    \row    \li \l Qt::ForegroundRole \li QBrush (\since 4.2)
     \row    \li \l Qt::TextColorRole \li QColor (obsolete; use Qt::ForegroundRole instead)
     \omit
     \row    \li \l Qt::ToolTipRole
diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp
index 32bbef07e9..d4a6433c4d 100644
--- a/src/widgets/itemviews/qtableview.cpp
+++ b/src/widgets/itemviews/qtableview.cpp
@@ -138,20 +138,21 @@ void QSpanCollection::updateSpan(QSpanCollection::Span *span, int old_height)
 }
 
 /** \internal
- * \return a spans that spans over cell x,y  (column,row)  or 0 if there is none.
+ * \return a spans that spans over cell x,y  (column,row)
+ * or \nullptr if there is none.
  */
 QSpanCollection::Span *QSpanCollection::spanAt(int x, int y) const
 {
     Index::const_iterator it_y = index.lowerBound(-y);
     if (it_y == index.end())
-        return 0;
+        return nullptr;
     SubIndex::const_iterator it_x = (*it_y).lowerBound(-x);
     if (it_x == (*it_y).end())
-        return 0;
+        return nullptr;
     Span *span = *it_x;
     if (span->right() >= x && span->bottom() >= y)
         return span;
-    return 0;
+    return nullptr;
 }
 
 
@@ -766,6 +767,66 @@ bool QTableViewPrivate::spanContainsSection(const QHeaderView *header, int logic
 
 /*!
   \internal
+  Searches for the next cell which is available for e.g. keyboard navigation
+  The search is done by row
+*/
+int QTableViewPrivate::nextActiveVisualRow(int rowToStart, int column, int limit,
+                                           SearchDirection searchDirection) const
+{
+    const int lc = logicalColumn(column);
+    int visualRow = rowToStart;
+    const auto isCellActive = [this](int vr, int lc)
+    {
+        const int lr = logicalRow(vr);
+        return !isRowHidden(lr) && isCellEnabled(lr, lc);
+    };
+    switch (searchDirection) {
+    case SearchDirection::Increasing:
+        if (visualRow < limit) {
+            while (!isCellActive(visualRow, lc)) {
+                if (++visualRow == limit)
+                    return rowToStart;
+            }
+        }
+        break;
+    case SearchDirection::Decreasing:
+        while (visualRow > limit && !isCellActive(visualRow, lc))
+            --visualRow;
+        break;
+    }
+    return visualRow;
+}
+
+/*!
+  \internal
+  Searches for the next cell which is available for e.g. keyboard navigation
+  The search is done by column
+*/
+int QTableViewPrivate::nextActiveVisualColumn(int row, int columnToStart, int limit,
+                                              SearchDirection searchDirection) const
+{
+    const int lr = logicalRow(row);
+    int visualColumn = columnToStart;
+    const auto isCellActive = [this](int lr, int vc)
+    {
+        const int lc = logicalColumn(vc);
+        return !isColumnHidden(lc) && isCellEnabled(lr, lc);
+    };
+    switch (searchDirection) {
+    case SearchDirection::Increasing:
+        while (visualColumn < limit && !isCellActive(lr, visualColumn))
+            ++visualColumn;
+        break;
+    case SearchDirection::Decreasing:
+        while (visualColumn > limit && !isCellActive(lr, visualColumn))
+            --visualColumn;
+        break;
+    }
+    return visualColumn;
+}
+
+/*!
+  \internal
   Returns the visual rect for the given \a span.
 */
 QRect QTableViewPrivate::visualSpanRect(const QSpanCollection::Span &span) const
@@ -904,6 +965,15 @@ void QTableViewPrivate::_q_updateSpanRemovedColumns(const QModelIndex &parent, i
 
 /*!
   \internal
+  Sort the model when the header sort indicator changed
+*/
+void QTableViewPrivate::_q_sortIndicatorChanged(int column, Qt::SortOrder order)
+{
+    model->sort(column, order);
+}
+
+/*!
+  \internal
   Draws a table cell.
 */
 void QTableViewPrivate::drawCell(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index)
@@ -1039,7 +1109,7 @@ int QTableViewPrivate::heightHintForIndex(const QModelIndex &index, int hint, QS
     \l showGrid property.
 
     The items shown in a table view, like those in the other item views, are
-    rendered and edited using standard \l{QItemDelegate}{delegates}. However,
+    rendered and edited using standard \l{QStyledItemDelegate}{delegates}. However,
     for some tasks it is sometimes useful to be able to insert widgets in a
     table instead. Widgets are set for particular indexes with the
     \l{QAbstractItemView::}{setIndexWidget()} function, and
@@ -1511,29 +1581,6 @@ void QTableView::paintEvent(QPaintEvent *event)
                     colp +=  columnWidth(col) - gridSize;
                 painter.drawLine(colp, dirtyArea.top(), colp, dirtyArea.bottom());
             }
-
-            //draw the top & left grid lines if the headers are not visible.
-            //We do update this line when subsequent scroll happen (see scrollContentsBy)
-            if (horizontalHeader->isHidden() && top == 0) {
-                const int row = verticalHeader->logicalIndex(top);
-                if (!verticalHeader->isSectionHidden(row)) {
-                    const int rowY = rowViewportPosition(row) + offset.y();
-                    if (rowY == dirtyArea.top())
-                        painter.drawLine(dirtyArea.left(), rowY, dirtyArea.right(), rowY);
-                }
-            }
-            if (verticalHeader->isHidden() && left == 0) {
-                const int col = horizontalHeader->logicalIndex(left);
-                if (!horizontalHeader->isSectionHidden(col)) {
-                    int colX = columnViewportPosition(col) + offset.x();
-                    if (!isLeftToRight())
-                        colX += columnWidth(left) - 1;
-                    if (isLeftToRight() && colX == dirtyArea.left())
-                        painter.drawLine(colX, dirtyArea.top(), colX, dirtyArea.bottom());
-                    if (!isLeftToRight() && colX == dirtyArea.right())
-                        painter.drawLine(colX, dirtyArea.top(), colX, dirtyArea.bottom());
-                }
-            }
             painter.setPen(old);
         }
     }
@@ -1798,35 +1845,34 @@ QModelIndex QTableView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifi
         break;
     }
     case MoveHome:
-        visualColumn = 0;
-        while (visualColumn < right && d->isVisualColumnHiddenOrDisabled(visualRow, visualColumn))
-            ++visualColumn;
-        if (modifiers & Qt::ControlModifier) {
-            visualRow = 0;
-            while (visualRow < bottom && d->isVisualRowHiddenOrDisabled(visualRow, visualColumn))
-                ++visualRow;
-        }
+        visualColumn = d->nextActiveVisualColumn(visualRow, 0, right,
+                                                 QTableViewPrivate::SearchDirection::Increasing);
+        if (modifiers & Qt::ControlModifier)
+            visualRow = d->nextActiveVisualRow(0, visualColumn, bottom,
+                                               QTableViewPrivate::SearchDirection::Increasing);
         break;
     case MoveEnd:
-        visualColumn = right;
+        visualColumn = d->nextActiveVisualColumn(visualRow, right, -1,
+                                                 QTableViewPrivate::SearchDirection::Decreasing);
         if (modifiers & Qt::ControlModifier)
-            visualRow = bottom;
+            visualRow = d->nextActiveVisualRow(bottom, visualColumn, -1,
+                                               QTableViewPrivate::SearchDirection::Decreasing);
         break;
     case MovePageUp: {
-        int newRow = rowAt(visualRect(current).bottom() - d->viewport->height());
-        if (newRow == -1) {
-            int visualRow = 0;
-            while (visualRow < bottom && isRowHidden(d->logicalRow(visualRow)))
-                ++visualRow;
-            newRow = d->logicalRow(visualRow);
-        }
-        return d->model->index(newRow, current.column(), d->root);
+        int newLogicalRow = rowAt(visualRect(current).bottom() - d->viewport->height());
+        int visualRow = (newLogicalRow == -1 ? 0 : d->visualRow(newLogicalRow));
+        visualRow = d->nextActiveVisualRow(visualRow, current.column(), bottom,
+                                           QTableViewPrivate::SearchDirection::Increasing);
+        newLogicalRow = d->logicalRow(visualRow);
+        return d->model->index(newLogicalRow, current.column(), d->root);
     }
     case MovePageDown: {
-        int newRow = rowAt(visualRect(current).top() + d->viewport->height());
-        if (newRow == -1)
-            newRow = d->logicalRow(bottom);
-        return d->model->index(newRow, current.column(), d->root);
+        int newLogicalRow = rowAt(visualRect(current).top() + d->viewport->height());
+        int visualRow = (newLogicalRow == -1 ? bottom : d->visualRow(newLogicalRow));
+        visualRow = d->nextActiveVisualRow(visualRow, current.column(), -1,
+                                           QTableViewPrivate::SearchDirection::Decreasing);
+        newLogicalRow = d->logicalRow(visualRow);
+        return d->model->index(newLogicalRow, current.column(), d->root);
     }}
 
     d->visualCursor = QPoint(visualColumn, visualRow);
@@ -2573,25 +2619,27 @@ void QTableView::setColumnHidden(int column, bool hide)
 void QTableView::setSortingEnabled(bool enable)
 {
     Q_D(QTableView);
-    d->sortingEnabled = enable;
     horizontalHeader()->setSortIndicatorShown(enable);
     if (enable) {
         disconnect(d->horizontalHeader, SIGNAL(sectionEntered(int)),
                    this, SLOT(_q_selectColumn(int)));
         disconnect(horizontalHeader(), SIGNAL(sectionPressed(int)),
                    this, SLOT(selectColumn(int)));
-        connect(horizontalHeader(), SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)),
-                this, SLOT(sortByColumn(int)), Qt::UniqueConnection);
+        //sortByColumn has to be called before we connect or set the sortingEnabled flag
+        // because otherwise it will not call sort on the model.
         sortByColumn(horizontalHeader()->sortIndicatorSection(),
                      horizontalHeader()->sortIndicatorOrder());
+        connect(horizontalHeader(), SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)),
+                this, SLOT(_q_sortIndicatorChanged(int,Qt::SortOrder)), Qt::UniqueConnection);
     } else {
         connect(d->horizontalHeader, SIGNAL(sectionEntered(int)),
                 this, SLOT(_q_selectColumn(int)), Qt::UniqueConnection);
         connect(horizontalHeader(), SIGNAL(sectionPressed(int)),
                 this, SLOT(selectColumn(int)), Qt::UniqueConnection);
         disconnect(horizontalHeader(), SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)),
-                   this, SLOT(sortByColumn(int)));
+                   this, SLOT(_q_sortIndicatorChanged(int,Qt::SortOrder)));
     }
+    d->sortingEnabled = enable;
 }
 
 bool QTableView::isSortingEnabled() const
@@ -3120,19 +3168,21 @@ void QTableView::resizeColumnsToContents()
     d->horizontalHeader->resizeSections(QHeaderView::ResizeToContents);
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
   \obsolete
   \overload
 
+  This function is deprecated. Use
+  sortByColumn(int column, Qt::SortOrder order) instead.
   Sorts the model by the values in the given \a column.
 */
 void QTableView::sortByColumn(int column)
 {
     Q_D(QTableView);
-    if (column == -1)
-        return;
-    d->model->sort(column, d->horizontalHeader->sortIndicatorOrder());
+    sortByColumn(column, d->horizontalHeader->sortIndicatorOrder());
 }
+#endif
 
 /*!
   \since 4.2
@@ -3144,8 +3194,14 @@ void QTableView::sortByColumn(int column)
 void QTableView::sortByColumn(int column, Qt::SortOrder order)
 {
     Q_D(QTableView);
+    if (column < 0)
+        return;
+    // If sorting is enabled it will emit a signal connected to
+    // _q_sortIndicatorChanged, which then actually sorts
     d->horizontalHeader->setSortIndicator(column, order);
-    sortByColumn(column);
+    // If sorting is not enabled, force to sort now
+    if (!d->sortingEnabled)
+        d->model->sort(column, order);
 }
 
 /*!
diff --git a/src/widgets/itemviews/qtableview.h b/src/widgets/itemviews/qtableview.h
index 60c2f34103..3275c09f88 100644
--- a/src/widgets/itemviews/qtableview.h
+++ b/src/widgets/itemviews/qtableview.h
@@ -118,7 +118,6 @@ public:
     int columnSpan(int row, int column) const;
     void clearSpans();
 
-    void sortByColumn(int column, Qt::SortOrder order);
 
 public Q_SLOTS:
     void selectRow(int row);
@@ -131,7 +130,11 @@ public Q_SLOTS:
     void resizeRowsToContents();
     void resizeColumnToContents(int column);
     void resizeColumnsToContents();
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X ("Use QTableView::sortByColumn(int column, Qt::SortOrder order) instead")
     void sortByColumn(int column);
+#endif
+    void sortByColumn(int column, Qt::SortOrder order);
     void setShowGrid(bool show);
 
 protected Q_SLOTS:
@@ -188,6 +191,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_updateSpanInsertedColumns(QModelIndex,int,int))
     Q_PRIVATE_SLOT(d_func(), void _q_updateSpanRemovedRows(QModelIndex,int,int))
     Q_PRIVATE_SLOT(d_func(), void _q_updateSpanRemovedColumns(QModelIndex,int,int))
+    Q_PRIVATE_SLOT(d_func(), void _q_sortIndicatorChanged(int column, Qt::SortOrder order))
 };
 
 QT_END_NAMESPACE
diff --git a/src/widgets/itemviews/qtableview_p.h b/src/widgets/itemviews/qtableview_p.h
index 805787597c..f629dfcd09 100644
--- a/src/widgets/itemviews/qtableview_p.h
+++ b/src/widgets/itemviews/qtableview_p.h
@@ -137,7 +137,7 @@ public:
         : showGrid(true), gridStyle(Qt::SolidLine),
           rowSectionAnchor(-1), columnSectionAnchor(-1),
           columnResizeTimerID(0), rowResizeTimerID(0),
-          horizontalHeader(0), verticalHeader(0),
+          horizontalHeader(nullptr), verticalHeader(nullptr),
           sortingEnabled(false), geometryRecursionBlock(false),
           visualCursor(QPoint())
  {
@@ -234,16 +234,16 @@ public:
     inline bool isCellEnabled(int row, int column) const {
         return isIndexEnabled(model->index(row, column, root));
     }
-    inline bool isVisualRowHiddenOrDisabled(int row, int column) const {
-        int r = logicalRow(row);
-        int c = logicalColumn(column);
-        return isRowHidden(r) || !isCellEnabled(r, c);
-    }
-    inline bool isVisualColumnHiddenOrDisabled(int row, int column) const {
-        int r = logicalRow(row);
-        int c = logicalColumn(column);
-        return isColumnHidden(c) || !isCellEnabled(r, c);
-    }
+
+    enum class SearchDirection
+    {
+        Increasing,
+        Decreasing
+    };
+    int nextActiveVisualRow(int rowToStart, int column, int limit,
+                            SearchDirection searchDirection) const;
+    int nextActiveVisualColumn(int row, int columnToStart, int limit,
+                               SearchDirection searchDirection) const;
 
     QRect visualSpanRect(const QSpanCollection::Span &span) const;
 
@@ -257,6 +257,7 @@ public:
     void _q_updateSpanInsertedColumns(const QModelIndex &parent, int start, int end);
     void _q_updateSpanRemovedRows(const QModelIndex &parent, int start, int end);
     void _q_updateSpanRemovedColumns(const QModelIndex &parent, int start, int end);
+    void _q_sortIndicatorChanged(int column, Qt::SortOrder order);
 };
 
 QT_END_NAMESPACE
diff --git a/src/widgets/itemviews/qtablewidget.cpp b/src/widgets/itemviews/qtablewidget.cpp
index 169cc5a17c..ec4897a7ae 100644
--- a/src/widgets/itemviews/qtablewidget.cpp
+++ b/src/widgets/itemviews/qtablewidget.cpp
@@ -225,7 +225,7 @@ QTableWidgetItem *QTableModel::takeItem(int row, int column)
         itm->view = 0;
         itm->d->id = -1;
         tableItems[i] = 0;
-        QModelIndex ind = index(itm);
+        const QModelIndex ind = index(row, column);
         emit dataChanged(ind, ind);
     }
     return itm;
@@ -1055,24 +1055,6 @@ QTableWidgetSelectionRange::~QTableWidgetSelectionRange()
 */
 
 /*!
-  \fn void QTableWidgetItem::setSelected(bool select)
-  \since 4.2
-
-  Sets the selected state of the item to \a select.
-
-  \sa isSelected()
-*/
-
-/*!
-  \fn bool QTableWidgetItem::isSelected() const
-  \since 4.2
-
-  Returns \c true if the item is selected, otherwise returns \c false.
-
-  \sa setSelected()
-*/
-
-/*!
   \fn QSize QTableWidgetItem::sizeHint() const
   \since 4.1
 
@@ -1109,6 +1091,44 @@ QTableWidgetSelectionRange::~QTableWidgetSelectionRange()
 */
 
 /*!
+  \fn bool QTableWidgetItem::isSelected() const
+  \since 4.2
+
+  Returns \c true if the item is selected, otherwise returns \c false.
+
+  \sa setSelected()
+*/
+bool QTableWidgetItem::isSelected() const
+{
+    if (!view || !view->selectionModel())
+        return false;
+    const QTableModel *model = qobject_cast<const QTableModel*>(view->model());
+    if (!model)
+        return false;
+    const QModelIndex index = model->index(this);
+    return view->selectionModel()->isSelected(index);
+}
+
+/*!
+  \fn void QTableWidgetItem::setSelected(bool select)
+  \since 4.2
+
+  Sets the selected state of the item to \a select.
+
+  \sa isSelected()
+*/
+void QTableWidgetItem::setSelected(bool select)
+{
+    if (!view || !view->selectionModel())
+        return;
+    const QTableModel *model = qobject_cast<const QTableModel*>(view->model());
+    if (!model)
+        return;
+    const QModelIndex index = model->index(this);
+    view->selectionModel()->select(index, select ? QItemSelectionModel::Select : QItemSelectionModel::Deselect);
+}
+
+/*!
     \fn Qt::ItemFlags QTableWidgetItem::flags() const
 
     Returns the flags used to describe the item. These determine whether
@@ -1128,7 +1148,7 @@ QTableWidgetSelectionRange::~QTableWidgetSelectionRange()
 void QTableWidgetItem::setFlags(Qt::ItemFlags aflags)
 {
     itemFlags = aflags;
-    if (QTableModel *model = (view ? qobject_cast<QTableModel*>(view->model()) : 0))
+    if (QTableModel *model = tableModel())
         model->itemChanged(this);
 }
 
@@ -1319,7 +1339,7 @@ void QTableWidgetItem::setFlags(Qt::ItemFlags aflags)
     \sa type()
 */
 QTableWidgetItem::QTableWidgetItem(int type)
-    :  rtti(type), view(0), d(new QTableWidgetItemPrivate(this)),
+    :  rtti(type), view(nullptr), d(new QTableWidgetItemPrivate(this)),
       itemFlags(Qt::ItemIsEditable
                 |Qt::ItemIsSelectable
                 |Qt::ItemIsUserCheckable
@@ -1335,7 +1355,7 @@ QTableWidgetItem::QTableWidgetItem(int type)
     \sa type()
 */
 QTableWidgetItem::QTableWidgetItem(const QString &text, int type)
-    :  rtti(type), view(0), d(new QTableWidgetItemPrivate(this)),
+    :  rtti(type), view(nullptr), d(new QTableWidgetItemPrivate(this)),
       itemFlags(Qt::ItemIsEditable
                 |Qt::ItemIsSelectable
                 |Qt::ItemIsUserCheckable
@@ -1352,7 +1372,7 @@ QTableWidgetItem::QTableWidgetItem(const QString &text, int type)
     \sa type()
 */
 QTableWidgetItem::QTableWidgetItem(const QIcon &icon, const QString &text, int type)
-    :  rtti(type), view(0), d(new QTableWidgetItemPrivate(this)),
+    :  rtti(type), view(nullptr), d(new QTableWidgetItemPrivate(this)),
        itemFlags(Qt::ItemIsEditable
                 |Qt::ItemIsSelectable
                 |Qt::ItemIsUserCheckable
@@ -1369,9 +1389,8 @@ QTableWidgetItem::QTableWidgetItem(const QIcon &icon, const QString &text, int t
 */
 QTableWidgetItem::~QTableWidgetItem()
 {
-    if (QTableModel *model = (view ? qobject_cast<QTableModel*>(view->model()) : 0))
+    if (QTableModel *model = tableModel())
         model->removeItem(this);
-    view = 0;
     delete d;
 }
 
@@ -1407,7 +1426,7 @@ void QTableWidgetItem::setData(int role, const QVariant &value)
     }
     if (!found)
         values.append(QWidgetItemData(role, value));
-    if (QTableModel *model = (view ? qobject_cast<QTableModel*>(view->model()) : nullptr))
+    if (QTableModel *model = tableModel())
     {
         const QVector<int> roles((role == Qt::DisplayRole) ?
                                     QVector<int>({Qt::DisplayRole, Qt::EditRole}) :
@@ -1462,6 +1481,16 @@ void QTableWidgetItem::write(QDataStream &out) const
 }
 
 /*!
+  \internal
+  returns the QTableModel if a view is set
+*/
+QTableModel *QTableWidgetItem::tableModel() const
+{
+    return (view ? qobject_cast<QTableModel*>(view->model()) : nullptr);
+}
+
+
+/*!
     \relates QTableWidgetItem
 
     Reads a table widget item from stream \a in into \a item.
@@ -1504,7 +1533,7 @@ QDataStream &operator<<(QDataStream &out, const QTableWidgetItem &item)
     \sa data(), flags()
 */
 QTableWidgetItem::QTableWidgetItem(const QTableWidgetItem &other)
-    : rtti(Type), values(other.values), view(0),
+    : rtti(Type), values(other.values), view(nullptr),
       d(new QTableWidgetItemPrivate(this)),
       itemFlags(other.itemFlags)
 {
@@ -1831,7 +1860,7 @@ void QTableWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
     \fn QTableWidgetItem *QTableWidget::itemAt(int ax, int ay) const
 
     Returns the item at the position equivalent to QPoint(\a{ax}, \a{ay}) in
-    the table widget's coordinate system, or returns 0 if the specified point
+    the table widget's coordinate system, or returns \nullptr if the specified point
     is not covered by an item in the table widget.
 
     \sa item()
@@ -1954,7 +1983,7 @@ int QTableWidget::column(const QTableWidgetItem *item) const
 
 /*!
     Returns the item for the given \a row and \a column if one has been set; otherwise
-    returns 0.
+    returns \nullptr.
 
     \sa setItem()
 */
@@ -2047,7 +2076,7 @@ QTableWidgetItem *QTableWidget::takeVerticalHeaderItem(int row)
 
 /*!
     Returns the horizontal header item for column, \a column, if one has been
-    set; otherwise returns 0.
+    set; otherwise returns \nullptr.
 */
 QTableWidgetItem *QTableWidget::horizontalHeaderItem(int column) const
 {
@@ -2323,6 +2352,7 @@ void QTableWidget::setCellWidget(int row, int column, QWidget *widget)
     QAbstractItemView::setIndexWidget(index, widget);
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
   Returns \c true if the \a item is selected, otherwise returns \c false.
 
@@ -2333,9 +2363,7 @@ void QTableWidget::setCellWidget(int row, int column, QWidget *widget)
 
 bool QTableWidget::isItemSelected(const QTableWidgetItem *item) const
 {
-    Q_D(const QTableWidget);
-    QModelIndex index = d->tableModel()->index(item);
-    return selectionModel()->isSelected(index);
+    return ((item && item->tableWidget() == this) ? item->isSelected() : false);
 }
 
 /*!
@@ -2347,10 +2375,10 @@ bool QTableWidget::isItemSelected(const QTableWidgetItem *item) const
 */
 void QTableWidget::setItemSelected(const QTableWidgetItem *item, bool select)
 {
-    Q_D(QTableWidget);
-    QModelIndex index = d->tableModel()->index(item);
-    selectionModel()->select(index, select ? QItemSelectionModel::Select : QItemSelectionModel::Deselect);
+    if (item && item->tableWidget() == this)
+        const_cast<QTableWidgetItem*>(item)->setSelected(select);
 }
+#endif
 
 /*!
   Selects or deselects the \a range depending on \a select.
@@ -2453,7 +2481,7 @@ int QTableWidget::visualColumn(int logicalColumn) const
 /*!
   \fn QTableWidgetItem *QTableWidget::itemAt(const QPoint &point) const
 
-  Returns a pointer to the item at the given \a point, or returns 0 if
+  Returns a pointer to the item at the given \a point, or returns \nullptr if
   \a point is not covered by an item in the table widget.
 
   \sa item()
diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h
index be629264f8..d93032f3f0 100644
--- a/src/widgets/itemviews/qtablewidget.h
+++ b/src/widgets/itemviews/qtablewidget.h
@@ -92,8 +92,8 @@ public:
     inline int row() const;
     inline int column() const;
 
-    inline void setSelected(bool select);
-    inline bool isSelected() const;
+    void setSelected(bool select);
+    bool isSelected() const;
 
     inline Qt::ItemFlags flags() const { return itemFlags; }
     void setFlags(Qt::ItemFlags flags);
@@ -183,6 +183,9 @@ public:
     inline int type() const { return rtti; }
 
 private:
+    QTableModel *tableModel() const;
+
+private:
     int rtti;
     QVector<QWidgetItemData> values;
     QTableWidget *view;
@@ -276,8 +279,12 @@ public:
     void setCellWidget(int row, int column, QWidget *widget);
     inline void removeCellWidget(int row, int column);
 
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X ("Use QTableWidgetItem::isSelected() instead")
     bool isItemSelected(const QTableWidgetItem *item) const;
+    QT_DEPRECATED_X ("Use QTableWidgetItem::setSelected() instead")
     void setItemSelected(const QTableWidgetItem *item, bool select);
+#endif
     void setRangeSelected(const QTableWidgetSelectionRange &range, bool select);
 
     QList<QTableWidgetSelectionRange> selectedRanges() const;
@@ -383,12 +390,6 @@ inline int QTableWidgetItem::row() const
 inline int QTableWidgetItem::column() const
 { return (view ? view->column(this) : -1); }
 
-inline void QTableWidgetItem::setSelected(bool aselect)
-{ if (view) view->setItemSelected(this, aselect); }
-
-inline bool QTableWidgetItem::isSelected() const
-{ return (view ? view->isItemSelected(this) : false); }
-
 QT_END_NAMESPACE
 
 #endif // QTABLEWIDGET_H
diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp
index b65cf5af2b..3fad6ca3df 100644
--- a/src/widgets/itemviews/qtreeview.cpp
+++ b/src/widgets/itemviews/qtreeview.cpp
@@ -1319,12 +1319,12 @@ void QTreeView::paintEvent(QPaintEvent *event)
     Q_D(QTreeView);
     d->executePostedLayout();
     QPainter painter(viewport());
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     if (d->isAnimating()) {
         drawTree(&painter, event->region() - d->animatedOperation.rect());
         d->drawAnimatedOperation(&painter);
     } else
-#endif //QT_NO_ANIMATION
+#endif // animation
     {
         drawTree(&painter, event->region());
 #if QT_CONFIG(draganddrop)
@@ -1766,7 +1766,7 @@ void QTreeView::drawRow(QPainter *painter, const QStyleOptionViewItem &option,
         QPalette::ColorGroup cg = (option.state & QStyle::State_Enabled)
                                   ? QPalette::Normal : QPalette::Disabled;
         o.backgroundColor = option.palette.color(cg, d->selectionModel->isSelected(index)
-                                                 ? QPalette::Highlight : QPalette::Background);
+                                                 ? QPalette::Highlight : QPalette::Window);
         int x = 0;
         if (!option.showDecorationSelected)
             x = header->sectionPosition(0) + d->indentationForItem(d->current);
@@ -1985,21 +1985,7 @@ void QTreeView::keyPressEvent(QKeyEvent *event)
     if (d->isIndexValid(current) && d->model && d->itemsExpandable) {
         switch (event->key()) {
         case Qt::Key_Asterisk: {
-            // do layouting only once after expanding is done
-            d->doDelayedItemsLayout();
-            QStack<QModelIndex> parents;
-            parents.push(current);
-            while (!parents.isEmpty()) {
-                QModelIndex parent = parents.pop();
-                for (int row = 0; row < d->model->rowCount(parent); ++row) {
-                    QModelIndex child = d->model->index(row, 0, parent);
-                    if (!d->isIndexValid(child))
-                        break;
-                    parents.push(child);
-                    expand(child);
-                }
-            }
-            expand(current);
+            expandRecursively(current);
             break; }
         case Qt::Key_Plus:
             expand(current);
@@ -2315,9 +2301,9 @@ QModelIndex QTreeView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifie
     case MovePageDown:
         return d->modelIndex(d->pageDown(vi), current.column());
     case MoveHome:
-        return d->model->index(0, current.column(), d->root);
+        return d->modelIndex(d->itemForKeyHome(), current.column());
     case MoveEnd:
-        return d->modelIndex(d->viewItems.count() - 1, current.column());
+        return d->modelIndex(d->itemForKeyEnd(), current.column());
     }
     return current;
 }
@@ -2612,10 +2598,13 @@ void QTreeView::resizeColumnToContents(int column)
     d->header->resizeSection(column, qMax(contents, header));
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
   \obsolete
   \overload
 
+  This function is deprecated. Use
+  sortByColumn(int column, Qt::SortOrder order) instead.
   Sorts the model by the values in the given \a column.
 */
 void QTreeView::sortByColumn(int column)
@@ -2623,6 +2612,7 @@ void QTreeView::sortByColumn(int column)
     Q_D(QTreeView);
     sortByColumn(column, d->header->sortIndicatorOrder());
 }
+#endif
 
 /*!
   \since 4.2
@@ -2638,10 +2628,12 @@ void QTreeView::sortByColumn(int column)
 void QTreeView::sortByColumn(int column, Qt::SortOrder order)
 {
     Q_D(QTreeView);
-
-    //If sorting is enabled  will emit a signal connected to _q_sortIndicatorChanged, which then actually sorts
+    if (column < 0)
+        return;
+    // If sorting is enabled it will emit a signal connected to
+    // _q_sortIndicatorChanged, which then actually sorts
     d->header->setSortIndicator(column, order);
-    //If sorting is not enabled, force to sort now.
+    // If sorting is not enabled, force to sort now
     if (!d->sortingEnabled)
         d->model->sort(column, order);
 }
@@ -2694,7 +2686,7 @@ QSize QTreeView::viewportSizeHint() const
   \since 4.2
   Expands all expandable items.
 
-  Warning: if the model contains a large number of items,
+  \warning: if the model contains a large number of items,
   this function will take some time to execute.
 
   \sa collapseAll(), expand(), collapse(), setExpanded()
@@ -2710,6 +2702,50 @@ void QTreeView::expandAll()
 }
 
 /*!
+  \since 5.13
+  Expands the item at the given \a index and all its children to the
+  given \a depth. The \a depth is relative to the given \a index.
+  A \a depth of -1 will expand all children, a \a depth of 0 will
+  only expand the given \a index.
+
+  \warning: if the model contains a large number of items,
+  this function will take some time to execute.
+
+  \sa expandAll()
+*/
+void QTreeView::expandRecursively(const QModelIndex &index, int depth)
+{
+    Q_D(QTreeView);
+
+    if (depth < -1)
+        return;
+    // do layouting only once after expanding is done
+    d->doDelayedItemsLayout();
+    expand(index);
+    if (depth == 0)
+        return;
+    QStack<QPair<QModelIndex, int>> parents;
+    parents.push({index, 0});
+    while (!parents.isEmpty()) {
+        const QPair<QModelIndex, int> elem = parents.pop();
+        const QModelIndex &parent = elem.first;
+        const int curDepth = elem.second;
+        const int rowCount = d->model->rowCount(parent);
+        for (int row = 0; row < rowCount; ++row) {
+            const QModelIndex child = d->model->index(row, 0, parent);
+            if (!d->isIndexValid(child))
+                break;
+            if (depth == -1 || curDepth + 1 < depth)
+                parents.push({child, curDepth + 1});
+            if (d->isIndexExpanded(child))
+                continue;
+            if (d->storeExpanded(child))
+                emit expanded(child);
+        }
+    }
+}
+
+/*!
   \since 4.2
 
   Collapses all expanded items.
@@ -3036,10 +3072,10 @@ void QTreeViewPrivate::initialize()
     header->setStretchLastSection(true);
     header->setDefaultAlignment(Qt::AlignLeft|Qt::AlignVCenter);
     q->setHeader(header);
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     animationsEnabled = q->style()->styleHint(QStyle::SH_Widget_Animation_Duration, 0, q) > 0;
     QObject::connect(&animatedOperation, SIGNAL(finished()), q, SLOT(_q_endAnimatedOperation()));
-#endif //QT_NO_ANIMATION
+#endif // animation
 }
 
 void QTreeViewPrivate::expand(int item, bool emitSignal)
@@ -3052,10 +3088,10 @@ void QTreeViewPrivate::expand(int item, bool emitSignal)
     if (index.flags() & Qt::ItemNeverHasChildren)
         return;
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     if (emitSignal && animationsEnabled)
         prepareAnimatedOperation(item, QVariantAnimation::Forward);
-#endif //QT_NO_ANIMATION
+#endif // animation
      //if already animating, stateBeforeAnimation is set to the correct value
     if (state != QAbstractItemView::AnimatingState)
         stateBeforeAnimation = state;
@@ -3069,10 +3105,10 @@ void QTreeViewPrivate::expand(int item, bool emitSignal)
         model->fetchMore(index);
     if (emitSignal) {
         emit q->expanded(index);
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
         if (animationsEnabled)
             beginAnimatedOperation();
-#endif //QT_NO_ANIMATION
+#endif // animation
     }
 }
 
@@ -3127,10 +3163,10 @@ void QTreeViewPrivate::collapse(int item, bool emitSignal)
     if (it == expandedIndexes.end() || viewItems.at(item).expanded == false)
         return; // nothing to do
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     if (emitSignal && animationsEnabled)
         prepareAnimatedOperation(item, QVariantAnimation::Backward);
-#endif //QT_NO_ANIMATION
+#endif // animation
 
     //if already animating, stateBeforeAnimation is set to the correct value
     if (state != QAbstractItemView::AnimatingState)
@@ -3148,14 +3184,14 @@ void QTreeViewPrivate::collapse(int item, bool emitSignal)
 
     if (emitSignal) {
         emit q->collapsed(modelIndex);
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
         if (animationsEnabled)
             beginAnimatedOperation();
-#endif //QT_NO_ANIMATION
+#endif // animation
     }
 }
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
 void QTreeViewPrivate::prepareAnimatedOperation(int item, QVariantAnimation::Direction direction)
 {
     animatedOperation.item = item;
@@ -3260,7 +3296,7 @@ void QTreeViewPrivate::_q_endAnimatedOperation()
     q->updateGeometries();
     viewport->update();
 }
-#endif //QT_NO_ANIMATION
+#endif // animation
 
 void QTreeViewPrivate::_q_modelAboutToBeReset()
 {
@@ -3386,7 +3422,11 @@ int QTreeViewPrivate::pageUp(int i) const
     int index = itemAtCoordinate(coordinateForItem(i) - viewport->height());
     while (isItemHiddenOrDisabled(index))
         index--;
-    return index == -1 ? 0 : index;
+    if (index == -1)
+        index = 0;
+    while (isItemHiddenOrDisabled(index))
+        index++;
+    return index >= viewItems.count() ? 0 : index;
 }
 
 int QTreeViewPrivate::pageDown(int i) const
@@ -3394,6 +3434,26 @@ int QTreeViewPrivate::pageDown(int i) const
     int index = itemAtCoordinate(coordinateForItem(i) + viewport->height());
     while (isItemHiddenOrDisabled(index))
         index++;
+    if (index == -1 || index >= viewItems.count())
+        index = viewItems.count() - 1;
+    while (isItemHiddenOrDisabled(index))
+        index--;
+    return index == -1 ? viewItems.count() - 1 : index;
+}
+
+int QTreeViewPrivate::itemForKeyHome() const
+{
+    int index = 0;
+    while (isItemHiddenOrDisabled(index))
+        index++;
+    return index >= viewItems.count() ? 0 : index;
+}
+
+int QTreeViewPrivate::itemForKeyEnd() const
+{
+    int index = viewItems.count() - 1;
+    while (isItemHiddenOrDisabled(index))
+        index--;
     return index == -1 ? viewItems.count() - 1 : index;
 }
 
diff --git a/src/widgets/itemviews/qtreeview.h b/src/widgets/itemviews/qtreeview.h
index 09ce0e3fff..e9cc1beedb 100644
--- a/src/widgets/itemviews/qtreeview.h
+++ b/src/widgets/itemviews/qtreeview.h
@@ -143,7 +143,6 @@ public:
     void doItemsLayout() override;
     void reset() override;
 
-    void sortByColumn(int column, Qt::SortOrder order);
 
     void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>()) override;
     void selectAll() override;
@@ -158,8 +157,13 @@ public Q_SLOTS:
     void expand(const QModelIndex &index);
     void collapse(const QModelIndex &index);
     void resizeColumnToContents(int column);
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X ("Use QTreeeView::sortByColumn(int column, Qt::SortOrder order) instead")
     void sortByColumn(int column);
+#endif
+    void sortByColumn(int column, Qt::SortOrder order);
     void expandAll();
+    void expandRecursively(const QModelIndex &index, int depth = -1);
     void collapseAll();
     void expandToDepth(int depth);
 
@@ -230,9 +234,9 @@ private:
 
     Q_DECLARE_PRIVATE(QTreeView)
     Q_DISABLE_COPY(QTreeView)
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     Q_PRIVATE_SLOT(d_func(), void _q_endAnimatedOperation())
-#endif //QT_NO_ANIMATION
+#endif // animation
     Q_PRIVATE_SLOT(d_func(), void _q_modelAboutToBeReset())
     Q_PRIVATE_SLOT(d_func(), void _q_sortIndicatorChanged(int column, Qt::SortOrder order))
 };
diff --git a/src/widgets/itemviews/qtreeview_p.h b/src/widgets/itemviews/qtreeview_p.h
index 8b217036a2..836d8f0c2d 100644
--- a/src/widgets/itemviews/qtreeview_p.h
+++ b/src/widgets/itemviews/qtreeview_p.h
@@ -53,7 +53,9 @@
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "private/qabstractitemview_p.h"
+#if QT_CONFIG(animation)
 #include <QtCore/qvariantanimation.h>
+#endif
 #include <QtCore/qabstractitemmodel.h>
 #include <QtCore/qvector.h>
 
@@ -85,7 +87,7 @@ public:
 
     QTreeViewPrivate()
         : QAbstractItemViewPrivate(),
-          header(0), indent(20), lastViewedItem(0), defaultItemHeight(-1),
+          header(nullptr), indent(20), lastViewedItem(0), defaultItemHeight(-1),
           uniformRowHeights(false), rootDecoration(true),
           itemsExpandable(true), sortingEnabled(false),
           expandsOnDoubleClick(true),
@@ -105,7 +107,7 @@ public:
     QItemViewPaintPairs draggablePaintPairs(const QModelIndexList &indexes, QRect *r) const override;
     void adjustViewOptionsForIndex(QStyleOptionViewItem *option, const QModelIndex &current) const override;
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     struct AnimatedOperation : public QVariantAnimation
     {
         int item;
@@ -123,7 +125,7 @@ public:
     void drawAnimatedOperation(QPainter *painter) const;
     QPixmap renderTreeToPixmapForAnimation(const QRect &rect) const;
     void _q_endAnimatedOperation();
-#endif //QT_NO_ANIMATION
+#endif // animation
 
     void expand(int item, bool emitSignal);
     void collapse(int item, bool emitSignal);
@@ -138,6 +140,8 @@ public:
 
     int pageUp(int item) const;
     int pageDown(int item) const;
+    int itemForKeyHome() const;
+    int itemForKeyEnd() const;
 
     int itemHeight(int item) const;
     int indentationForItem(int item) const;
@@ -153,7 +157,7 @@ public:
     bool checkViewItems() const;
 #endif
 
-    int firstVisibleItem(int *offset = 0) const;
+    int firstVisibleItem(int *offset = nullptr) const;
     int lastVisibleItem(int firstVisual = -1, int offset = -1) const;
     int columnAt(int x) const;
     bool hasVisibleChildren( const QModelIndex& parent) const;
diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp
index 4768869843..29cc199526 100644
--- a/src/widgets/itemviews/qtreewidget.cpp
+++ b/src/widgets/itemviews/qtreewidget.cpp
@@ -1009,8 +1009,18 @@ void QTreeModel::timerEvent(QTimerEvent *ev)
   Sets the selected state of the item to \a select.
 
   \sa isSelected()
-
 */
+void QTreeWidgetItem::setSelected(bool select)
+{
+    const QTreeModel *model = treeModel();
+    if (!model || !view->selectionModel())
+        return;
+    const QModelIndex index = model->index(this, 0);
+    view->selectionModel()->select(index, (select ? QItemSelectionModel::Select
+                                                  : QItemSelectionModel::Deselect)
+                                   | QItemSelectionModel::Rows);
+    d->selected = select;
+}
 
 /*!
   \fn bool QTreeWidgetItem::isSelected() const
@@ -1020,6 +1030,10 @@ void QTreeModel::timerEvent(QTimerEvent *ev)
 
   \sa setSelected()
 */
+bool QTreeWidgetItem::isSelected() const
+{
+    return d->selected;
+}
 
 /*!
   \fn void QTreeWidgetItem::setHidden(bool hide)
@@ -1033,12 +1047,18 @@ void QTreeModel::timerEvent(QTimerEvent *ev)
   \sa isHidden()
 */
 
-void QTreeWidgetItem::setHidden(bool ahide)
+void QTreeWidgetItem::setHidden(bool hide)
 {
-    if (view) {
-        view->setItemHidden(this, ahide);
-        d->hidden = ahide;
+    const QTreeModel *model = treeModel();
+    if (!model)
+        return;
+    if (this == model->headerItem) {
+        view->header()->setHidden(hide);
+    } else {
+        const QModelIndex index = view->d_func()->index(this);
+        view->setRowHidden(index.row(), index.parent(), hide);
     }
+    d->hidden = hide;
 }
 
 /*!
@@ -1052,7 +1072,15 @@ void QTreeWidgetItem::setHidden(bool ahide)
 
 bool QTreeWidgetItem::isHidden() const
 {
-    return (view ? d->hidden : false);
+    const QTreeModel *model = treeModel();
+    if (!model)
+        return false;
+    if (this == model->headerItem)
+        return view->header()->isHidden();
+    if (view->d_func()->hiddenIndexes.isEmpty())
+        return false;
+    QTreeModel::SkipSorting skipSorting(model);
+    return view->d_func()->isRowHidden(view->d_func()->index(this));
 }
 
 /*!
@@ -1064,6 +1092,14 @@ bool QTreeWidgetItem::isHidden() const
 
   \sa isExpanded()
 */
+void QTreeWidgetItem::setExpanded(bool expand)
+{
+    const QTreeModel *model = treeModel();
+    if (!model)
+        return;
+    QTreeModel::SkipSorting skipSorting(model);
+    view->setExpanded(view->d_func()->index(this), expand);
+}
 
 /*!
   \fn bool QTreeWidgetItem::isExpanded() const
@@ -1073,6 +1109,14 @@ bool QTreeWidgetItem::isHidden() const
 
   \sa setExpanded()
 */
+bool QTreeWidgetItem::isExpanded() const
+{
+    const QTreeModel *model = treeModel();
+    if (!model)
+        return false;
+    QTreeModel::SkipSorting skipSorting(model);
+    return view->isExpanded(view->d_func()->index(this));
+}
 
 /*!
   \fn void QTreeWidgetItem::setFirstColumnSpanned(bool span)
@@ -1083,6 +1127,14 @@ bool QTreeWidgetItem::isHidden() const
 
   \sa isFirstColumnSpanned()
 */
+void QTreeWidgetItem::setFirstColumnSpanned(bool span)
+{
+    const QTreeModel *model = treeModel();
+    if (!model || this == model->headerItem)
+        return; // We can't set the header items to spanning
+    const QModelIndex index = model->index(this, 0);
+    view->setFirstColumnSpanned(index.row(), index.parent(), span);
+}
 
 /*!
   \fn bool QTreeWidgetItem::isFirstColumnSpanned() const
@@ -1092,6 +1144,14 @@ bool QTreeWidgetItem::isHidden() const
 
   \sa setFirstColumnSpanned()
 */
+bool QTreeWidgetItem::isFirstColumnSpanned() const
+{
+    const QTreeModel *model = treeModel();
+    if (!model || this == model->headerItem)
+        return false;
+    const QModelIndex index = model->index(this, 0);
+    return view->isFirstColumnSpanned(index.row(), index.parent());
+}
 
 /*!
     \fn QString QTreeWidgetItem::text(int column) const
@@ -1346,7 +1406,7 @@ bool QTreeWidgetItem::isHidden() const
     \sa type()
 */
 QTreeWidgetItem::QTreeWidgetItem(int type)
-    : rtti(type), view(0), d(new QTreeWidgetItemPrivate(this)), par(0),
+    : rtti(type), view(nullptr), d(new QTreeWidgetItemPrivate(this)), par(nullptr),
       itemFlags(Qt::ItemIsSelectable
                 |Qt::ItemIsUserCheckable
                 |Qt::ItemIsEnabled
@@ -1365,7 +1425,7 @@ QTreeWidgetItem::QTreeWidgetItem(int type)
     \sa type()
 */
 QTreeWidgetItem::QTreeWidgetItem(const QStringList &strings, int type)
-    : rtti(type), view(0), d(new QTreeWidgetItemPrivate(this)), par(0),
+    : rtti(type), view(nullptr), d(new QTreeWidgetItemPrivate(this)), par(nullptr),
       itemFlags(Qt::ItemIsSelectable
                 |Qt::ItemIsUserCheckable
                 |Qt::ItemIsEnabled
@@ -1385,16 +1445,16 @@ QTreeWidgetItem::QTreeWidgetItem(const QStringList &strings, int type)
     \sa type()
 */
 
-QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *view, int type)
-    : rtti(type), view(0), d(new QTreeWidgetItemPrivate(this)), par(0),
+QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *treeview, int type)
+    : rtti(type), view(nullptr), d(new QTreeWidgetItemPrivate(this)), par(nullptr),
       itemFlags(Qt::ItemIsSelectable
                 |Qt::ItemIsUserCheckable
                 |Qt::ItemIsEnabled
                 |Qt::ItemIsDragEnabled
                 |Qt::ItemIsDropEnabled)
 {
-    if (view && view->model()) {
-        QTreeModel *model = qobject_cast<QTreeModel*>(view->model());
+    // do not set this->view here otherwise insertChild() will fail
+    if (QTreeModel *model = treeModel(treeview)) {
         model->rootItem->addChild(this);
         values.reserve(model->headerItem->columnCount());
     }
@@ -1410,8 +1470,8 @@ QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *view, int type)
   \sa type()
 */
 
-QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *view, const QStringList &strings, int type)
-    : rtti(type), view(0), d(new QTreeWidgetItemPrivate(this)), par(0),
+QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *treeview, const QStringList &strings, int type)
+    : rtti(type), view(nullptr), d(new QTreeWidgetItemPrivate(this)), par(nullptr),
       itemFlags(Qt::ItemIsSelectable
                 |Qt::ItemIsUserCheckable
                 |Qt::ItemIsEnabled
@@ -1420,8 +1480,8 @@ QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *view, const QStringList &strings,
 {
     for (int i = 0; i < strings.count(); ++i)
         setText(i, strings.at(i));
-    if (view && view->model()) {
-        QTreeModel *model = qobject_cast<QTreeModel*>(view->model());
+    // do not set this->view here otherwise insertChild() will fail
+    if (QTreeModel *model = treeModel(treeview)) {
         model->rootItem->addChild(this);
         values.reserve(model->headerItem->columnCount());
     }
@@ -1435,21 +1495,19 @@ QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *view, const QStringList &strings,
 
     \sa type()
 */
-QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *view, QTreeWidgetItem *after, int type)
-    : rtti(type), view(0), d(new QTreeWidgetItemPrivate(this)), par(0),
+QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *treeview, QTreeWidgetItem *after, int type)
+    : rtti(type), view(nullptr), d(new QTreeWidgetItemPrivate(this)), par(nullptr),
       itemFlags(Qt::ItemIsSelectable
                 |Qt::ItemIsUserCheckable
                 |Qt::ItemIsEnabled
                 |Qt::ItemIsDragEnabled
                 |Qt::ItemIsDropEnabled)
 {
-    if (view) {
-        QTreeModel *model = qobject_cast<QTreeModel*>(view->model());
-        if (model) {
-            int i = model->rootItem->children.indexOf(after) + 1;
-            model->rootItem->insertChild(i, this);
-            values.reserve(model->headerItem->columnCount());
-        }
+    // do not set this->view here otherwise insertChild() will fail
+    if (QTreeModel *model = treeModel(treeview)) {
+        int i = model->rootItem->children.indexOf(after) + 1;
+        model->rootItem->insertChild(i, this);
+        values.reserve(model->headerItem->columnCount());
     }
 }
 
@@ -1459,7 +1517,7 @@ QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *view, QTreeWidgetItem *after, int
     \sa type()
 */
 QTreeWidgetItem::QTreeWidgetItem(QTreeWidgetItem *parent, int type)
-    : rtti(type), view(0), d(new QTreeWidgetItemPrivate(this)), par(0),
+    : rtti(type), view(nullptr), d(new QTreeWidgetItemPrivate(this)), par(nullptr),
       itemFlags(Qt::ItemIsSelectable
                 |Qt::ItemIsUserCheckable
                 |Qt::ItemIsEnabled
@@ -1477,7 +1535,7 @@ QTreeWidgetItem::QTreeWidgetItem(QTreeWidgetItem *parent, int type)
     \sa type()
 */
 QTreeWidgetItem::QTreeWidgetItem(QTreeWidgetItem *parent, const QStringList &strings, int type)
-    : rtti(type), view(0), d(new QTreeWidgetItemPrivate(this)), par(0),
+    : rtti(type), view(nullptr), d(new QTreeWidgetItemPrivate(this)), par(nullptr),
       itemFlags(Qt::ItemIsSelectable
                 |Qt::ItemIsUserCheckable
                 |Qt::ItemIsEnabled
@@ -1499,7 +1557,7 @@ QTreeWidgetItem::QTreeWidgetItem(QTreeWidgetItem *parent, const QStringList &str
     \sa type()
 */
 QTreeWidgetItem::QTreeWidgetItem(QTreeWidgetItem *parent, QTreeWidgetItem *after, int type)
-    : rtti(type), view(0), d(new QTreeWidgetItemPrivate(this)), par(0),
+    : rtti(type), view(nullptr), d(new QTreeWidgetItemPrivate(this)), par(nullptr),
       itemFlags(Qt::ItemIsSelectable
                 |Qt::ItemIsUserCheckable
                 |Qt::ItemIsEnabled
@@ -1522,7 +1580,7 @@ QTreeWidgetItem::QTreeWidgetItem(QTreeWidgetItem *parent, QTreeWidgetItem *after
 
 QTreeWidgetItem::~QTreeWidgetItem()
 {
-    QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0);
+    QTreeModel *model = treeModel();
     bool wasSkipSort = false;
     if (model) {
         wasSkipSort = model->skipPendingSort;
@@ -1684,16 +1742,17 @@ void QTreeWidgetItem::setFlags(Qt::ItemFlags flags)
 
 void QTreeWidgetItemPrivate::updateHiddenStatus(QTreeWidgetItem *item, bool inserting)
 {
-    QTreeModel *model = (item->view ? qobject_cast<QTreeModel*>(item->view->model()) : 0);
+    QTreeModel *model = item->treeModel();
     if (!model)
         return;
     QStack<QTreeWidgetItem *> parents;
     parents.push(item);
     while (!parents.isEmpty()) {
         QTreeWidgetItem *parent = parents.pop();
-        QModelIndex index = model->index(parent, 0);
-        if (parent->d->hidden)
+        if (parent->d->hidden) {
+            const QModelIndex index = model->index(parent, 0);
             item->view->setRowHidden(index.row(), index.parent(), inserting);
+        }
         for (int i = 0; i < parent->children.count(); ++i) {
             QTreeWidgetItem *child = parent->children.at(i);
             parents.push(child);
@@ -1758,7 +1817,7 @@ void QTreeWidgetItem::setData(int column, int role, const QVariant &value)
     if (column < 0)
         return;
 
-    QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0);
+    QTreeModel *model = treeModel();
     switch (role) {
     case Qt::EditRole:
     case Qt::DisplayRole: {
@@ -1966,7 +2025,7 @@ void QTreeWidgetItem::insertChild(int index, QTreeWidgetItem *child)
     if (index < 0 || index > children.count() || child == 0 || child->view != 0 || child->par != 0)
         return;
 
-    if (QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0)) {
+    if (QTreeModel *model = treeModel()) {
         const bool wasSkipSort = model->skipPendingSort;
         model->skipPendingSort = true;
         if (model->rootItem == this)
@@ -2017,7 +2076,7 @@ QTreeWidgetItem *QTreeWidgetItem::takeChild(int index)
 {
     // we move this outside the check of the index to allow executing
     // pending sorts from inline functions, using this function (hack)
-    QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0);
+    QTreeModel *model = treeModel();
     if (model) {
         // This will trigger a layoutChanged signal, thus we might want to optimize
         // this function by not emitting the rowsRemoved signal etc to the view.
@@ -2075,7 +2134,7 @@ void QTreeWidgetItem::insertChildren(int index, const QList<QTreeWidgetItem*> &c
             insertChild(index, children.at(n));
         return;
     }
-    QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0);
+    QTreeModel *model = treeModel();
     QStack<QTreeWidgetItem*> stack;
     QList<QTreeWidgetItem*> itemsToInsert;
     for (int n = 0; n < children.count(); ++n) {
@@ -2122,7 +2181,7 @@ QList<QTreeWidgetItem*> QTreeWidgetItem::takeChildren()
 {
     QList<QTreeWidgetItem*> removed;
     if (children.count() > 0) {
-        QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0);
+        QTreeModel *model = treeModel();
         if (model) {
             // This will trigger a layoutChanged signal, thus we might want to optimize
             // this function by not emitting the rowsRemoved signal etc to the view.
@@ -2154,7 +2213,7 @@ QList<QTreeWidgetItem*> QTreeWidgetItem::takeChildren()
 
 void QTreeWidgetItemPrivate::sortChildren(int column, Qt::SortOrder order, bool climb)
 {
-    QTreeModel *model = (q->view ? qobject_cast<QTreeModel*>(q->view->model()) : 0);
+    QTreeModel *model = q->treeModel();
     if (!model)
         return;
     model->sortItems(&q->children, column, order);
@@ -2177,7 +2236,7 @@ void QTreeWidgetItemPrivate::sortChildren(int column, Qt::SortOrder order, bool
 */
 void QTreeWidgetItem::sortChildren(int column, Qt::SortOrder order, bool climb)
 {
-    QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0);
+    QTreeModel *model = treeModel();
     if (!model)
         return;
     if (model->isChanging())
@@ -2257,7 +2316,7 @@ void QTreeWidgetItem::emitDataChanged()
 */
 void QTreeWidgetItem::itemChanged()
 {
-    if (QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0))
+    if (QTreeModel *model = treeModel())
         model->itemChanged(this);
 }
 
@@ -2266,10 +2325,21 @@ void QTreeWidgetItem::itemChanged()
 */
 void QTreeWidgetItem::executePendingSort() const
 {
-    if (QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0))
+    if (QTreeModel *model = treeModel())
         model->executePendingSort();
 }
 
+/*!
+  \internal
+  returns the QTreeModel if a view is set
+*/
+QTreeModel *QTreeWidgetItem::treeModel(QTreeWidget *v) const
+{
+    if (!v)
+        v = view;
+    return (v ? qobject_cast<QTreeModel*>(v->model()) : nullptr);
+}
+
 
 #ifndef QT_NO_DATASTREAM
 /*!
@@ -2469,8 +2539,8 @@ void QTreeWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
     QStyle::SH_ItemView_ActivateItemOnSingleClick style hint) or
     pressing a special key (e.g., \uicontrol Enter).
 
-    The specified \a item is the item that was clicked, or 0 if no
-    item was clicked. The \a column is the item's column that was
+    The specified \a item is the item that was clicked, or \nullptr if
+    no item was clicked. The \a column is the item's column that was
     clicked, or -1 if no item was clicked.
 */
 
@@ -2480,8 +2550,8 @@ void QTreeWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
     This signal is emitted when the user presses a mouse button inside
     the widget.
 
-    The specified \a item is the item that was clicked, or 0 if no
-    item was clicked. The \a column is the item's column that was
+    The specified \a item is the item that was clicked, or \nullptr if
+    no item was clicked. The \a column is the item's column that was
     clicked, or -1 if no item was clicked.
 */
 
@@ -2501,8 +2571,8 @@ void QTreeWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
     This signal is emitted when the user double clicks inside the
     widget.
 
-    The specified \a item is the item that was clicked, or 0 if no
-    item was clicked. The \a column is the item's column that was
+    The specified \a item is the item that was clicked, or \nullptr if
+    no item was clicked. The \a column is the item's column that was
     clicked. If no item was double clicked, no signal will be emitted.
 */
 
@@ -2654,8 +2724,8 @@ QTreeWidgetItem *QTreeWidget::invisibleRootItem() const
 }
 
 /*!
-  Returns the top level item at the given \a index, or 0 if the item does
-  not exist.
+  Returns the top level item at the given \a index, or \nullptr if the
+  item does not exist.
 
   \sa topLevelItemCount(), insertTopLevelItem()
 */
@@ -2709,7 +2779,7 @@ void QTreeWidget::addTopLevelItem(QTreeWidgetItem *item)
 
 /*!
   Removes the top-level item at the given \a index in the tree and
-  returns it, otherwise returns 0;
+  returns it, otherwise returns \nullptr;
 
   \sa insertTopLevelItem(), topLevelItem(), topLevelItemCount()
 */
@@ -3031,7 +3101,7 @@ QWidget *QTreeWidget::itemWidget(QTreeWidgetItem *item, int column) const
 
     This function should only be used to display static content in the place of
     a tree widget item. If you want to display custom dynamic content or
-    implement a custom editor widget, use QTreeView and subclass QItemDelegate
+    implement a custom editor widget, use QTreeView and subclass QStyledItemDelegate
     instead.
 
     This function cannot be called before the item hierarchy has been set up,
@@ -3048,6 +3118,7 @@ void QTreeWidget::setItemWidget(QTreeWidgetItem *item, int column, QWidget *widg
     QAbstractItemView::setIndexWidget(d->index(item, column), widget);
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
   Returns \c true if the \a item is selected; otherwise returns \c false.
 
@@ -3059,9 +3130,7 @@ void QTreeWidget::setItemWidget(QTreeWidgetItem *item, int column, QWidget *widg
 */
 bool QTreeWidget::isItemSelected(const QTreeWidgetItem *item) const
 {
-    if (!item)
-        return false;
-    return item->d->selected;
+    return ((item && item->treeWidget() == this) ? item->isSelected() : false);
 }
 
 /*!
@@ -3076,16 +3145,10 @@ bool QTreeWidget::isItemSelected(const QTreeWidgetItem *item) const
 */
 void QTreeWidget::setItemSelected(const QTreeWidgetItem *item, bool select)
 {
-    Q_D(QTreeWidget);
-
-    if (!item)
-        return;
-
-    selectionModel()->select(d->index(item), (select ? QItemSelectionModel::Select
-                                              : QItemSelectionModel::Deselect)
-                             |QItemSelectionModel::Rows);
-    item->d->selected = select;
+    if (item && item->treeWidget() == this)
+        const_cast<QTreeWidgetItem*>(item)->setSelected(select);
 }
+#endif
 
 /*!
   Returns a list of all selected non-hidden items.
@@ -3102,7 +3165,7 @@ QList<QTreeWidgetItem*> QTreeWidget::selectedItems() const
     seen.reserve(indexes.count());
     for (const auto &index : indexes) {
         QTreeWidgetItem *item = d->item(index);
-        if (isItemHidden(item) || seen.contains(item))
+        if (item->isHidden() || seen.contains(item))
             continue;
         seen.insert(item);
         items.append(item);
@@ -3126,6 +3189,7 @@ QList<QTreeWidgetItem*> QTreeWidget::findItems(const QString &text, Qt::MatchFla
     return items;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
   Returns \c true if the \a item is explicitly hidden, otherwise returns \c false.
 
@@ -3135,13 +3199,7 @@ QList<QTreeWidgetItem*> QTreeWidget::findItems(const QString &text, Qt::MatchFla
 */
 bool QTreeWidget::isItemHidden(const QTreeWidgetItem *item) const
 {
-    Q_D(const QTreeWidget);
-    if (item == d->treeModel()->headerItem)
-        return header()->isHidden();
-    if (d->hiddenIndexes.isEmpty())
-        return false;
-    QTreeModel::SkipSorting skipSorting(d->treeModel());
-    return d->isRowHidden(d->index(item));
+    return ((item && item->treeWidget() == this) ? item->isHidden() : false);
 }
 
 /*!
@@ -3155,16 +3213,8 @@ bool QTreeWidget::isItemHidden(const QTreeWidgetItem *item) const
 */
 void QTreeWidget::setItemHidden(const QTreeWidgetItem *item, bool hide)
 {
-    if (!item)
-        return;
-    Q_D(QTreeWidget);
-    if (item == d->treeModel()->headerItem) {
-        header()->setHidden(hide);
-    } else {
-        const QModelIndex index = d->index(item);
-        setRowHidden(index.row(), index.parent(), hide);
-    }
-    item->d->hidden = hide;
+    if (item && item->treeWidget() == this)
+        const_cast<QTreeWidgetItem*>(item)->setHidden(hide);
 }
 
 /*!
@@ -3178,9 +3228,7 @@ void QTreeWidget::setItemHidden(const QTreeWidgetItem *item, bool hide)
 */
 bool QTreeWidget::isItemExpanded(const QTreeWidgetItem *item) const
 {
-    Q_D(const QTreeWidget);
-    QTreeModel::SkipSorting skipSorting(d->treeModel());
-    return isExpanded(d->index(item));
+    return ((item && item->treeWidget() == this) ? item->isExpanded() : false);
 }
 
 /*!
@@ -3195,9 +3243,8 @@ bool QTreeWidget::isItemExpanded(const QTreeWidgetItem *item) const
 */
 void QTreeWidget::setItemExpanded(const QTreeWidgetItem *item, bool expand)
 {
-    Q_D(QTreeWidget);
-    QTreeModel::SkipSorting skipSorting(d->treeModel());
-    setExpanded(d->index(item), expand);
+    if (item && item->treeWidget() == this)
+        const_cast<QTreeWidgetItem*>(item)->setExpanded(expand);
 }
 
 /*!
@@ -3207,14 +3254,14 @@ void QTreeWidget::setItemExpanded(const QTreeWidgetItem *item, bool expand)
   otherwise returns \c false.
 
   \sa setFirstItemColumnSpanned()
+
+  \obsolete
+
+  This function is deprecated. Use \l{QTreeWidgetItem::isFirstColumnSpanned()} instead.
 */
 bool QTreeWidget::isFirstItemColumnSpanned(const QTreeWidgetItem *item) const
 {
-    Q_D(const QTreeWidget);
-    if (item == d->treeModel()->headerItem)
-        return false; // We can't set the header items to spanning
-    const QModelIndex index = d->index(item);
-    return isFirstColumnSpanned(index.row(), index.parent());
+    return ((item && item->treeWidget() == this) ? item->isFirstColumnSpanned() : false);
 }
 
 /*!
@@ -3224,15 +3271,17 @@ bool QTreeWidget::isFirstItemColumnSpanned(const QTreeWidgetItem *item) const
   otherwise the item will show one section per column.
 
   \sa isFirstItemColumnSpanned()
+
+  \obsolete
+
+  This function is deprecated. Use \l{QTreeWidgetItem::setFirstColumnSpanned()} instead.
 */
 void QTreeWidget::setFirstItemColumnSpanned(const QTreeWidgetItem *item, bool span)
 {
-    Q_D(QTreeWidget);
-    if (item == d->treeModel()->headerItem)
-        return; // We can't set header items to spanning
-    const QModelIndex index = d->index(item);
-    setFirstColumnSpanned(index.row(), index.parent(), span);
+    if (item && item->treeWidget() == this)
+        const_cast<QTreeWidgetItem*>(item)->setFirstColumnSpanned(span);
 }
+#endif
 
 /*!
   \since 4.3
diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h
index 5044ec9e02..bed77b336d 100644
--- a/src/widgets/itemviews/qtreewidget.h
+++ b/src/widgets/itemviews/qtreewidget.h
@@ -66,9 +66,9 @@ public:
     enum ItemType { Type = 0, UserType = 1000 };
     explicit QTreeWidgetItem(int type = Type);
     explicit QTreeWidgetItem(const QStringList &strings, int type = Type);
-    explicit QTreeWidgetItem(QTreeWidget *view, int type = Type);
-    QTreeWidgetItem(QTreeWidget *view, const QStringList &strings, int type = Type);
-    QTreeWidgetItem(QTreeWidget *view, QTreeWidgetItem *after, int type = Type);
+    explicit QTreeWidgetItem(QTreeWidget *treeview, int type = Type);
+    QTreeWidgetItem(QTreeWidget *treeview, const QStringList &strings, int type = Type);
+    QTreeWidgetItem(QTreeWidget *treeview, QTreeWidgetItem *after, int type = Type);
     explicit QTreeWidgetItem(QTreeWidgetItem *parent, int type = Type);
     QTreeWidgetItem(QTreeWidgetItem *parent, const QStringList &strings, int type = Type);
     QTreeWidgetItem(QTreeWidgetItem *parent, QTreeWidgetItem *after, int type = Type);
@@ -79,17 +79,17 @@ public:
 
     inline QTreeWidget *treeWidget() const { return view; }
 
-    inline void setSelected(bool select);
-    inline bool isSelected() const;
+    void setSelected(bool select);
+    bool isSelected() const;
 
     void setHidden(bool hide);
     bool isHidden() const;
 
-    inline void setExpanded(bool expand);
-    inline bool isExpanded() const;
+    void setExpanded(bool expand);
+    bool isExpanded() const;
 
-    inline void setFirstColumnSpanned(bool span);
-    inline bool isFirstColumnSpanned() const;
+    void setFirstColumnSpanned(bool span);
+    bool isFirstColumnSpanned() const;
 
     inline void setDisabled(bool disabled);
     inline bool isDisabled() const;
@@ -215,6 +215,7 @@ private:
     QVariant childrenCheckState(int column) const;
     void itemChanged();
     void executePendingSort() const;
+    QTreeModel *treeModel(QTreeWidget *v = nullptr) const;
 
     int rtti;
     // One item has a vector of column entries. Each column has a vector of (role, value) pairs.
@@ -314,20 +315,32 @@ public:
     void setItemWidget(QTreeWidgetItem *item, int column, QWidget *widget);
     inline void removeItemWidget(QTreeWidgetItem *item, int column);
 
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X ("Use QTreeWidgetItem::isSelected() instead")
     bool isItemSelected(const QTreeWidgetItem *item) const;
+    QT_DEPRECATED_X ("Use QTreeWidgetItem::setSelected() instead")
     void setItemSelected(const QTreeWidgetItem *item, bool select);
+#endif
     QList<QTreeWidgetItem*> selectedItems() const;
     QList<QTreeWidgetItem*> findItems(const QString &text, Qt::MatchFlags flags,
                                       int column = 0) const;
 
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X ("Use QTreeWidgetItem::isHidden() instead")
     bool isItemHidden(const QTreeWidgetItem *item) const;
+    QT_DEPRECATED_X ("Use QTreeWidgetItem::setHidden() instead")
     void setItemHidden(const QTreeWidgetItem *item, bool hide);
 
+    QT_DEPRECATED_X ("Use QTreeWidgetItem::isExpanded() instead")
     bool isItemExpanded(const QTreeWidgetItem *item) const;
+    QT_DEPRECATED_X ("Use QTreeWidgetItem::setExpanded() instead")
     void setItemExpanded(const QTreeWidgetItem *item, bool expand);
 
+    QT_DEPRECATED_X ("Use QTreeWidgetItem::isFirstColumnSpanned() instead")
     bool isFirstItemColumnSpanned(const QTreeWidgetItem *item) const;
+    QT_DEPRECATED_X ("Use QTreeWidgetItem::setFirstColumnSpanned() instead")
     void setFirstItemColumnSpanned(const QTreeWidgetItem *item, bool span);
+#endif
 
     QTreeWidgetItem *itemAbove(const QTreeWidgetItem *item) const;
     QTreeWidgetItem *itemBelow(const QTreeWidgetItem *item) const;
@@ -412,24 +425,6 @@ inline QTreeWidgetItem *QTreeWidget::itemAt(int ax, int ay) const
 inline void QTreeWidget::setHeaderLabel(const QString &alabel)
 { setHeaderLabels(QStringList(alabel)); }
 
-inline void QTreeWidgetItem::setSelected(bool aselect)
-{ if (view) view->setItemSelected(this, aselect); }
-
-inline bool QTreeWidgetItem::isSelected() const
-{ return (view ? view->isItemSelected(this) : false); }
-
-inline void QTreeWidgetItem::setExpanded(bool aexpand)
-{ if (view) view->setItemExpanded(this, aexpand); }
-
-inline bool QTreeWidgetItem::isExpanded() const
-{ return (view ? view->isItemExpanded(this) : false); }
-
-inline void QTreeWidgetItem::setFirstColumnSpanned(bool aspan)
-{ if (view) view->setFirstItemColumnSpanned(this, aspan); }
-
-inline bool QTreeWidgetItem::isFirstColumnSpanned() const
-{ return (view ? view->isFirstItemColumnSpanned(this) : false); }
-
 inline void QTreeWidgetItem::setDisabled(bool disabled)
 { setFlags(disabled ? (flags() & ~Qt::ItemIsEnabled) : flags() | Qt::ItemIsEnabled); }
 
diff --git a/src/widgets/itemviews/qtreewidget_p.h b/src/widgets/itemviews/qtreewidget_p.h
index ee4a633468..81e7e86203 100644
--- a/src/widgets/itemviews/qtreewidget_p.h
+++ b/src/widgets/itemviews/qtreewidget_p.h
@@ -78,7 +78,7 @@ class QTreeModel : public QAbstractItemModel
     friend class QTreeWidgetItemIteratorPrivate;
 
 public:
-    explicit QTreeModel(int columns = 0, QTreeWidget *parent = 0);
+    explicit QTreeModel(int columns = 0, QTreeWidget *parent = nullptr);
     ~QTreeModel();
 
     inline QTreeWidget *view() const
@@ -140,7 +140,7 @@ public:
     { return createIndex(row, col, item); }
 
 protected:
-    QTreeModel(QTreeModelPrivate &, QTreeWidget *parent = 0);
+    QTreeModel(QTreeModelPrivate &, QTreeWidget *parent = nullptr);
     void emitDataChanged(QTreeWidgetItem *item, int column, const QVector<int> &roles);
     void beginInsertItems(QTreeWidgetItem *parent, int row, int count);
     void endInsertItems();
diff --git a/src/widgets/kernel/mac.pri b/src/widgets/kernel/mac.pri
index f7e7aa869a..d21e5d4a74 100644
--- a/src/widgets/kernel/mac.pri
+++ b/src/widgets/kernel/mac.pri
@@ -1,4 +1 @@
-macos {
-   LIBS_PRIVATE += -framework AppKit -lz
-   *-mwerks:INCLUDEPATH += compat
-}
+macos: LIBS_PRIVATE += -framework AppKit -lz
diff --git a/src/widgets/kernel/qactiongroup.cpp b/src/widgets/kernel/qactiongroup.cpp
index 7934ae1d90..4786437d7e 100644
--- a/src/widgets/kernel/qactiongroup.cpp
+++ b/src/widgets/kernel/qactiongroup.cpp
@@ -316,8 +316,8 @@ bool QActionGroup::isEnabled() const
 }
 
 /*!
-  Returns the currently checked action in the group, or 0 if none
-  are checked.
+  Returns the currently checked action in the group, or \nullptr if
+  none are checked.
 */
 QAction *QActionGroup::checkedAction() const
 {
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index f8f24d1ff0..1d26fb6697 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -58,7 +58,6 @@
 #include "qstyle.h"
 #include "qstyleoption.h"
 #include "qstylefactory.h"
-#include "qtextcodec.h"
 #include "qtooltip.h"
 #include "qtranslator.h"
 #include "qvariant.h"
@@ -361,7 +360,7 @@ void QApplicationPrivate::createEventDispatcher()
 /*!
     \fn QWidget *QApplication::topLevelAt(const QPoint &point)
 
-    Returns the top-level widget at the given \a point; returns 0 if
+    Returns the top-level widget at the given \a point; returns \nullptr if
     there is no such widget.
 */
 QWidget *QApplication::topLevelAt(const QPoint &pos)
@@ -576,10 +575,6 @@ void QApplicationPrivate::init()
     initialize();
     eventDispatcher->startingUp();
 
-#ifdef QT_EVAL
-    extern void qt_gui_eval_init(QCoreApplicationPrivate::Type);
-    qt_gui_eval_init(application_type);
-#endif
 #ifndef QT_NO_ACCESSIBILITY
     // factory for accessible interfaces for widgets shipped with Qt
     QAccessible::installFactory(&qAccessibleFactory);
@@ -785,7 +780,7 @@ QWidget *QApplication::activeModalWidget()
 
 /*!
     Cleans up any window system resources that were allocated by this
-    application. Sets the global variable \c qApp to 0.
+    application. Sets the global variable \c qApp to \nullptr.
 */
 
 QApplication::~QApplication()
@@ -894,8 +889,8 @@ void qt_cleanup()
 /*!
     \fn QWidget *QApplication::widgetAt(const QPoint &point)
 
-    Returns the widget at global screen position \a point, or 0 if there is no
-    Qt widget there.
+    Returns the widget at global screen position \a point, or \nullptr
+    if there is no Qt widget there.
 
     This function can be slow.
 
@@ -905,9 +900,9 @@ QWidget *QApplication::widgetAt(const QPoint &p)
 {
     QWidget *window = QApplication::topLevelAt(p);
     if (!window)
-        return 0;
+        return nullptr;
 
-    QWidget *child = 0;
+    QWidget *child = nullptr;
 
     if (!window->testAttribute(Qt::WA_TransparentForMouseEvents))
         child = window->childAt(window->mapFromGlobal(p));
@@ -943,8 +938,8 @@ QWidget *QApplication::widgetAt(const QPoint &p)
 
     \overload
 
-    Returns the widget at global screen position (\a x, \a y), or 0 if there is
-    no Qt widget there.
+    Returns the widget at global screen position (\a x, \a y), or
+    \nullptr if there is no Qt widget there.
 */
 
 /*!
@@ -1065,8 +1060,10 @@ QStyle *QApplication::style()
         if (!QApplicationPrivate::styleOverride.isEmpty()) {
             const QString style = QApplicationPrivate::styleOverride.toLower();
             app_style = QStyleFactory::create(style);
-            if (!app_style)
-                qWarning("QApplication: invalid style override passed, ignoring it.");
+            if (Q_UNLIKELY(!app_style)) {
+                qWarning("QApplication: invalid style override passed, ignoring it.\n"
+                "    Available styles: %s", qPrintable(QStyleFactory::keys().join(QLatin1String(", "))));
+            }
         }
         if (!app_style)
             app_style = QStyleFactory::create(QApplicationPrivate::desktopStyleKey());
@@ -1225,7 +1222,7 @@ void QApplication::setStyle(QStyle *style)
     "windows", "windowsvista", "fusion", or "macintosh". Style
     names are case insensitive.
 
-    Returns 0 if an unknown \a style is passed, otherwise the QStyle object
+    Returns \nullptr if an unknown \a style is passed, otherwise the QStyle object
     returned is set as the application's GUI style.
 
     \warning To ensure that the application's style is set correctly, it is
@@ -1242,6 +1239,7 @@ QStyle* QApplication::setStyle(const QString& style)
     return s;
 }
 
+#if QT_DEPRECATED_SINCE(5, 8)
 /*!
     Returns the color specification.
     \obsolete
@@ -1316,6 +1314,7 @@ void QApplication::setColorSpec(int spec)
 {
     Q_UNUSED(spec)
 }
+#endif
 
 /*!
     \property QApplication::globalStrut
@@ -1419,24 +1418,7 @@ void QApplicationPrivate::setPalette_helper(const QPalette &palette, const char*
 
     if (QApplicationPrivate::is_app_running && !QApplicationPrivate::is_app_closing) {
         // Send ApplicationPaletteChange to qApp itself, and to the widgets.
-        QEvent e(QEvent::ApplicationPaletteChange);
-        QApplication::sendEvent(QApplication::instance(), &e);
-
-        QWidgetList wids = QApplication::allWidgets();
-        for (QWidgetList::ConstIterator it = wids.constBegin(), cend = wids.constEnd(); it != cend; ++it) {
-            QWidget *w = *it;
-            if (all || (!className && w->isWindow()) || w->inherits(className)) // matching class
-                QApplication::sendEvent(w, &e);
-        }
-
-        // Send to all scenes as well.
-#if QT_CONFIG(graphicsview)
-        QList<QGraphicsScene *> &scenes = qApp->d_func()->scene_list;
-        for (QList<QGraphicsScene *>::ConstIterator it = scenes.constBegin();
-             it != scenes.constEnd(); ++it) {
-            QApplication::sendEvent(*it, &e);
-        }
-#endif // QT_CONFIG(graphicsview)
+        qApp->d_func()->sendApplicationPaletteChange(all, className);
     }
     if (!className && (!QApplicationPrivate::sys_pal || !palette.isCopyOf(*QApplicationPrivate::sys_pal))) {
         if (!QApplicationPrivate::set_pal)
@@ -1744,8 +1726,8 @@ QWidgetList QApplication::allWidgets()
 }
 
 /*!
-    Returns the application widget that has the keyboard input focus, or 0 if
-    no widget in this application has the focus.
+    Returns the application widget that has the keyboard input focus,
+    or \nullptr if no widget in this application has the focus.
 
     \sa QWidget::setFocus(), QWidget::hasFocus(), activeWindow(), focusChanged()
 */
@@ -1813,7 +1795,7 @@ void QApplicationPrivate::setFocusWidget(QWidget *focus, Qt::FocusReason reason)
 
 /*!
     Returns the application top-level window that has the keyboard input focus,
-    or 0 if no application window has the focus. There might be an
+    or \nullptr if no application window has the focus. There might be an
     activeWindow() even if there is no focusWidget(), for example if no widget
     in that window accepts key events.
 
@@ -2194,7 +2176,7 @@ void QApplicationPrivate::notifyActiveWindowChange(QWindow *previous)
 
 /*!internal
  * Helper function that returns the new focus widget, but does not set the focus reason.
- * Returns 0 if a new focus widget could not be found.
+ * Returns \nullptr if a new focus widget could not be found.
  * Shared with QGraphicsProxyWidgetPrivate::findFocusChild()
 */
 QWidget *QApplicationPrivate::focusNextPrevChild_helper(QWidget *toplevel, bool next,
@@ -3714,7 +3696,7 @@ bool QApplicationPrivate::notify_helper(QObject *receiver, QEvent * e)
     // to the ones in QCoreApplicationPrivate::notify_helper; the reason for their
     // duplication is because tracepoint symbols are not exported by QtCore.
     // If you adjust the tracepoints here, consider adjusting QCoreApplicationPrivate too.
-    Q_TRACE(QApplication_notify_entry, receiver, e, e->type());
+    Q_TRACE_SCOPE(QApplication_notify, receiver, e, e->type());
 
     // send to all application event filters
     if (threadRequiresCoreApplication()
@@ -4510,6 +4492,23 @@ void QApplicationPrivate::notifyThemeChanged()
     qt_init_tooltip_palette();
 }
 
+void QApplicationPrivate::sendApplicationPaletteChange(bool toAllWidgets, const char *className)
+{
+    QGuiApplicationPrivate::sendApplicationPaletteChange();
+
+    QEvent event(QEvent::ApplicationPaletteChange);
+    const QWidgetList widgets = QApplication::allWidgets();
+    for (auto widget : widgets) {
+        if (toAllWidgets || (!className && widget->isWindow()) || (className && widget->inherits(className)))
+            QApplication::sendEvent(widget, &event);
+    }
+
+#if QT_CONFIG(graphicsview)
+    for (auto scene : qAsConst(scene_list))
+        QApplication::sendEvent(scene, &event);
+#endif // QT_CONFIG(graphicsview)
+}
+
 #if QT_CONFIG(draganddrop)
 void QApplicationPrivate::notifyDragStarted(const QDrag *drag)
 {
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h
index 2d9468cc21..98eb9b73c6 100644
--- a/src/widgets/kernel/qapplication_p.h
+++ b/src/widgets/kernel/qapplication_p.h
@@ -113,7 +113,7 @@ public:
     bool tryCloseAllWindows() override;
 
 #if 0 // Used to be included in Qt4 for Q_WS_X11
-#ifndef QT_NO_SETTINGS
+#if QT_CONFIG(settings)
     static bool x11_apply_settings();
 #endif
     static void reset_instance_pointer();
@@ -128,10 +128,10 @@ public:
     void notifyWindowIconChanged() override;
 
     //modality
-    bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = 0) const override;
+    bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = nullptr) const override;
     static bool isBlockedByModal(QWidget *widget);
     static bool modalState();
-    static bool tryModalHelper(QWidget *widget, QWidget **rettop = 0);
+    static bool tryModalHelper(QWidget *widget, QWidget **rettop = nullptr);
 #if 0 // Used to be included in Qt4 for Q_WS_MAC
     static QWidget *tryModalHelper_sys(QWidget *top);
     bool canQuit();
@@ -157,7 +157,7 @@ public:
     void openPopup(QWidget *popup);
     static void setFocusWidget(QWidget *focus, Qt::FocusReason reason);
     static QWidget *focusNextPrevChild_helper(QWidget *toplevel, bool next,
-                                              bool *wrappingOccurred = 0);
+                                              bool *wrappingOccurred = nullptr);
 
 #if QT_CONFIG(graphicsview)
     // Maintain a list of all scenes to ensure font and palette propagation to
@@ -177,6 +177,9 @@ public:
 
 protected:
     void notifyThemeChanged() override;
+    void sendApplicationPaletteChange(bool toAllWidgets = false,
+                                      const char *className = nullptr) override;
+
 #if QT_CONFIG(draganddrop)
     void notifyDragStarted(const QDrag *) override;
 #endif // QT_CONFIG(draganddrop)
@@ -235,7 +238,7 @@ public:
             return window;
         if (const QWidget *nativeParent = widget->nativeParentWidget())
             return nativeParent->windowHandle();
-        return 0;
+        return nullptr;
     }
 
 #ifdef Q_OS_WIN
diff --git a/src/widgets/kernel/qdesktopwidget.cpp b/src/widgets/kernel/qdesktopwidget.cpp
index 5fb7882932..d17c7eb36c 100644
--- a/src/widgets/kernel/qdesktopwidget.cpp
+++ b/src/widgets/kernel/qdesktopwidget.cpp
@@ -176,26 +176,32 @@ void QDesktopWidgetPrivate::_q_updateScreens()
         // Notice that we trigger screenCountChanged even if a screen was removed and another one added,
         // in which case the total number of screens did not change. This is the only way for applications
         // to notice that a screen was swapped out against another one.
+#if QT_DEPRECATED_SINCE(5, 11)
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
         emit q->screenCountChanged(targetLength);
 QT_WARNING_POP
+#endif
     }
+#if QT_DEPRECATED_SINCE(5, 11)
     foreach (int changedScreen, changedScreens)
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
         emit q->resized(changedScreen);
 QT_WARNING_POP
+#endif
 }
 
 void QDesktopWidgetPrivate::_q_availableGeometryChanged()
 {
+#if QT_DEPRECATED_SINCE(5, 11)
     Q_Q(QDesktopWidget);
     if (QScreen *screen = qobject_cast<QScreen *>(q->sender()))
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
         emit q->workAreaResized(QGuiApplication::screens().indexOf(screen));
 QT_WARNING_POP
+#endif
 }
 
 QDesktopWidget::QDesktopWidget()
@@ -212,10 +218,12 @@ QDesktopWidget::~QDesktopWidget()
 {
 }
 
+#if QT_DEPRECATED_SINCE(5, 11)
 bool QDesktopWidget::isVirtualDesktop() const
 {
     return QDesktopWidgetPrivate::isVirtualDesktop();
 }
+#endif
 
 bool QDesktopWidgetPrivate::isVirtualDesktop()
 {
@@ -242,24 +250,27 @@ int QDesktopWidgetPrivate::height()
     return geometry().height();
 }
 
+#if QT_DEPRECATED_SINCE(5, 11)
 int QDesktopWidget::primaryScreen() const
 {
     return QDesktopWidgetPrivate::primaryScreen();
 }
+#endif
 
 int QDesktopWidgetPrivate::primaryScreen()
 {
     return 0;
 }
 
-int QDesktopWidget::numScreens() const
+int QDesktopWidgetPrivate::numScreens()
 {
-    return QDesktopWidgetPrivate::numScreens();
+    return qMax(QGuiApplication::screens().size(), 1);
 }
 
-int QDesktopWidgetPrivate::numScreens()
+#if QT_DEPRECATED_SINCE(5, 11)
+int QDesktopWidget::numScreens() const
 {
-    return qMax(QGuiApplication::screens().size(), 1);
+    return QDesktopWidgetPrivate::numScreens();
 }
 
 QWidget *QDesktopWidget::screen(int screen)
@@ -274,6 +285,7 @@ const QRect QDesktopWidget::availableGeometry(int screenNo) const
 {
     return QDesktopWidgetPrivate::availableGeometry(screenNo);
 }
+#endif
 
 const QRect QDesktopWidgetPrivate::availableGeometry(int screenNo)
 {
@@ -281,10 +293,12 @@ const QRect QDesktopWidgetPrivate::availableGeometry(int screenNo)
     return screen ? screen->availableGeometry() : QRect();
 }
 
+#if QT_DEPRECATED_SINCE(5, 11)
 const QRect QDesktopWidget::screenGeometry(int screenNo) const
 {
     return QDesktopWidgetPrivate::screenGeometry(screenNo);
 }
+#endif
 
 const QRect QDesktopWidgetPrivate::screenGeometry(int screenNo)
 {
@@ -344,10 +358,12 @@ int QDesktopWidgetPrivate::screenNumber(const QWidget *w)
     return allScreens.indexOf(widgetScreen);
 }
 
+#if QT_DEPRECATED_SINCE(5, 11)
 int QDesktopWidget::screenNumber(const QPoint &p) const
 {
     return QDesktopWidgetPrivate::screenNumber(p);
 }
+#endif
 
 int QDesktopWidgetPrivate::screenNumber(const QPoint &p)
 {
diff --git a/src/widgets/kernel/qdesktopwidget.h b/src/widgets/kernel/qdesktopwidget.h
index f986f0db20..e5c587984f 100644
--- a/src/widgets/kernel/qdesktopwidget.h
+++ b/src/widgets/kernel/qdesktopwidget.h
@@ -52,9 +52,11 @@ class QDesktopWidgetPrivate;
 class Q_WIDGETS_EXPORT QDesktopWidget : public QWidget
 {
     Q_OBJECT
+#if QT_DEPRECATED_SINCE(5, 11)
     Q_PROPERTY(bool virtualDesktop READ isVirtualDesktop)
     Q_PROPERTY(int screenCount READ screenCount NOTIFY screenCountChanged)
     Q_PROPERTY(int primaryScreen READ primaryScreen NOTIFY primaryScreenChanged)
+#endif
 public:
     QDesktopWidget();
     ~QDesktopWidget();
diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp
index 595ff3eb6e..9146ba84c8 100644
--- a/src/widgets/kernel/qformlayout.cpp
+++ b/src/widgets/kernel/qformlayout.cpp
@@ -419,13 +419,15 @@ void QFormLayoutPrivate::updateSizes()
             if (label) {
                 maxMinLblWidth = qMax(maxMinLblWidth, label->minSize.width());
                 maxShLblWidth = qMax(maxShLblWidth, label->sizeHint.width());
-                if (field) {
+            }
+            if (field) {
+                if (field->fullRow) {
+                    maxMinIfldWidth = qMax(maxMinIfldWidth, field->minSize.width());
+                    maxShIfldWidth = qMax(maxShIfldWidth, field->sizeHint.width());
+                } else {
                     maxMinFldWidth = qMax(maxMinFldWidth, field->minSize.width() + field->sbsHSpace);
                     maxShFldWidth = qMax(maxShFldWidth, field->sizeHint.width() + field->sbsHSpace);
                 }
-            } else if (field) {
-                maxMinIfldWidth = qMax(maxMinIfldWidth, field->minSize.width());
-                maxShIfldWidth = qMax(maxShIfldWidth, field->sizeHint.width());
             }
 
             prevLbl = label;
@@ -781,7 +783,7 @@ void QFormLayoutPrivate::setupVerticalLayoutData(int width)
             vLayouts[vidx].expansive = expanding || (vLayouts[vidx].stretch > 0);
             vLayouts[vidx].empty = false;
 
-            if (vLayouts[vidx].stretch > 0)
+            if (vLayouts[vidx].expansive)
                 addTopBottomStretch = false;
 
             if (vidx > 1)
@@ -1435,13 +1437,7 @@ static void clearAndDestroyQLayoutItem(QLayoutItem *item)
     up one row and the freed vertical space is redistributed amongst the remaining rows.
 
     You can use this function to undo a previous addRow() or insertRow():
-    \code
-    QFormLayout *flay = ...;
-    QPointer<QLineEdit> le = new QLineEdit;
-    flay->insertRow(2, "User:", le);
-    // later:
-    flay->removeRow(2); // le == nullptr at this point
-    \endcode
+    \snippet code/src_gui_kernel_qformlayout.cpp 3
 
     If you want to remove the row from the layout without deleting the widgets, use takeRow() instead.
 
@@ -1467,13 +1463,7 @@ void QFormLayout::removeRow(int row)
     up one row and the freed vertical space is redistributed amongst the remaining rows.
 
     You can use this function to undo a previous addRow() or insertRow():
-    \code
-    QFormLayout *flay = ...;
-    QPointer<QLineEdit> le = new QLineEdit;
-    flay->insertRow(2, "User:", le);
-    // later:
-    flay->removeRow(le); // le == nullptr at this point
-    \endcode
+    \snippet code/src_gui_kernel_qformlayout.cpp 4
 
     If you want to remove the row from the layout without deleting the widgets, use takeRow() instead.
 
@@ -1499,13 +1489,7 @@ void QFormLayout::removeRow(QWidget *widget)
     up one row and the freed vertical space is redistributed amongst the remaining rows.
 
     You can use this function to undo a previous addRow() or insertRow():
-    \code
-    QFormLayout *flay = ...;
-    QPointer<QVBoxLayout> vbl = new QVBoxLayout;
-    flay->insertRow(2, "User:", vbl);
-    // later:
-    flay->removeRow(layout); // vbl == nullptr at this point
-    \endcode
+    \snippet code/src_gui_kernel_qformlayout.cpp 5
 
     If you want to remove the row from the form layout without deleting the inserted layout,
     use takeRow() instead.
@@ -1532,13 +1516,7 @@ void QFormLayout::removeRow(QLayout *layout)
     up one row and the freed vertical space is redistributed amongst the remaining rows.
 
     You can use this function to undo a previous addRow() or insertRow():
-    \code
-    QFormLayout *flay = ...;
-    QPointer<QLineEdit> le = new QLineEdit;
-    flay->insertRow(2, "User:", le);
-    // later:
-    QFormLayout::TakeRowResult result = flay->takeRow(2);
-    \endcode
+    \snippet code/src_gui_kernel_qformlayout.cpp 6
 
     If you want to remove the row from the layout and delete the widgets, use removeRow() instead.
 
@@ -1583,13 +1561,7 @@ QFormLayout::TakeRowResult QFormLayout::takeRow(int row)
     After this call, rowCount() is decremented by one. All following rows are shifted
     up one row and the freed vertical space is redistributed amongst the remaining rows.
 
-    \code
-    QFormLayout *flay = ...;
-    QPointer<QLineEdit> le = new QLineEdit;
-    flay->insertRow(2, "User:", le);
-    // later:
-    QFormLayout::TakeRowResult result = flay->takeRow(widget);
-    \endcode
+    \snippet code/src_gui_kernel_qformlayout.cpp 7
 
     If you want to remove the row from the layout and delete the widgets, use removeRow() instead.
 
@@ -1628,13 +1600,7 @@ QFormLayout::TakeRowResult QFormLayout::takeRow(QWidget *widget)
     After this call, rowCount() is decremented by one. All following rows are shifted
     up one row and the freed vertical space is redistributed amongst the remaining rows.
 
-    \code
-    QFormLayout *flay = ...;
-    QPointer<QVBoxLayout> vbl = new QVBoxLayout;
-    flay->insertRow(2, "User:", vbl);
-    // later:
-    QFormLayout::TakeRowResult result = flay->takeRow(widget);
-    \endcode
+    \snippet code/src_gui_kernel_qformlayout.cpp 8
 
     If you want to remove the row from the form layout and delete the inserted layout,
     use removeRow() instead.
@@ -1861,7 +1827,7 @@ int QFormLayout::rowCount() const
 
 /*!
     Returns the layout item in the given \a row with the specified \a
-    role (column). Returns 0 if there is no such item.
+    role (column). Returns \nullptr if there is no such item.
 
     \sa QLayout::itemAt(), setItem()
 */
@@ -2243,8 +2209,11 @@ void QFormLayoutPrivate::arrangeWidgets(const QVector<QLayoutStruct>& layouts, Q
 
             QSize sz(qMin(label->layoutWidth, label->sizeHint.width()), height);
             int x = leftOffset + rect.x() + label->layoutPos;
-            if (fixedAlignment(q->labelAlignment(), layoutDirection) & Qt::AlignRight)
+            const auto fAlign = fixedAlignment(q->labelAlignment(), layoutDirection);
+            if (fAlign & Qt::AlignRight)
                 x += label->layoutWidth - sz.width();
+            else if (fAlign & Qt::AlignHCenter)
+                x += label->layoutWidth / 2 - sz.width() / 2;
             QPoint p(x, layouts.at(label->vLayoutIndex).pos);
             // ### expansion & sizepolicy stuff
 
diff --git a/src/widgets/kernel/qgesture_p.h b/src/widgets/kernel/qgesture_p.h
index 636103c1e1..cbf8d60892 100644
--- a/src/widgets/kernel/qgesture_p.h
+++ b/src/widgets/kernel/qgesture_p.h
@@ -111,7 +111,7 @@ class QPinchGesturePrivate : public QGesturePrivate
 
 public:
     QPinchGesturePrivate()
-        : totalChangeFlags(0), changeFlags(0),
+        : totalChangeFlags(nullptr), changeFlags(nullptr),
           totalScaleFactor(1), lastScaleFactor(1), scaleFactor(1),
           totalRotationAngle(0), lastRotationAngle(0), rotationAngle(0),
           isNewSequence(true)
diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp
index c4188044cf..cd27c9c5be 100644
--- a/src/widgets/kernel/qgesturemanager.cpp
+++ b/src/widgets/kernel/qgesturemanager.cpp
@@ -136,18 +136,13 @@ Qt::GestureType QGestureManager::registerGestureRecognizer(QGestureRecognizer *r
         ++m_lastCustomGestureId;
         type = Qt::GestureType(m_lastCustomGestureId);
     }
-    m_recognizers.insertMulti(type, recognizer);
+    m_recognizers.insert(type, recognizer);
     return type;
 }
 
 void QGestureManager::unregisterGestureRecognizer(Qt::GestureType type)
 {
     QList<QGestureRecognizer *> list = m_recognizers.values(type);
-    while (QGestureRecognizer *recognizer = m_recognizers.take(type)) {
-        // ensuring an entry exists causes the recognizer to be deleted on destruction of the manager
-        auto &gestures = m_obsoleteGestures[recognizer];
-        Q_UNUSED(gestures);
-    }
     foreach (QGesture *g, m_gestureToRecognizer.keys()) {
         QGestureRecognizer *recognizer = m_gestureToRecognizer.value(g);
         if (list.contains(recognizer)) {
@@ -522,7 +517,7 @@ bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event)
         for(ContextIterator it = w->d_func()->gestureContext.constBegin(),
             e = w->d_func()->gestureContext.constEnd(); it != e; ++it) {
             types.insert(it.key(), 0);
-            contexts.insertMulti(w, it.key());
+            contexts.insert(w, it.key());
         }
     }
     // find all gesture contexts for the widget tree
@@ -534,7 +529,7 @@ bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event)
             if (!(it.value() & Qt::DontStartGestureOnChildren)) {
                 if (!types.contains(it.key())) {
                     types.insert(it.key(), 0);
-                    contexts.insertMulti(w, it.key());
+                    contexts.insert(w, it.key());
                 }
             }
         }
@@ -556,7 +551,7 @@ bool QGestureManager::filterEvent(QGraphicsObject *receiver, QEvent *event)
         for(ContextIterator it = item->QGraphicsItem::d_func()->gestureContext.constBegin(),
             e = item->QGraphicsItem::d_func()->gestureContext.constEnd(); it != e; ++it) {
             types.insert(it.key(), 0);
-            contexts.insertMulti(item, it.key());
+            contexts.insert(item, it.key());
         }
     }
     // find all gesture contexts for the graphics object tree
@@ -569,7 +564,7 @@ bool QGestureManager::filterEvent(QGraphicsObject *receiver, QEvent *event)
             if (!(it.value() & Qt::DontStartGestureOnChildren)) {
                 if (!types.contains(it.key())) {
                     types.insert(it.key(), 0);
-                    contexts.insertMulti(item, it.key());
+                    contexts.insert(item, it.key());
                 }
             }
         }
diff --git a/src/widgets/kernel/qgesturerecognizer.cpp b/src/widgets/kernel/qgesturerecognizer.cpp
index 65c46a5e56..75d091ce4e 100644
--- a/src/widgets/kernel/qgesturerecognizer.cpp
+++ b/src/widgets/kernel/qgesturerecognizer.cpp
@@ -41,6 +41,7 @@
 
 #include "private/qgesture_p.h"
 #include "private/qgesturemanager_p.h"
+#include "private/qapplication_p.h"
 
 #ifndef QT_NO_GESTURES
 
@@ -231,6 +232,11 @@ Qt::GestureType QGestureRecognizer::registerRecognizer(QGestureRecognizer *recog
 */
 void QGestureRecognizer::unregisterRecognizer(Qt::GestureType type)
 {
+    auto qAppPriv = QApplicationPrivate::instance();
+    if (!qAppPriv)
+        return;
+    if (!qAppPriv->gestureManager)
+        return;
     QGestureManager::instance()->unregisterGestureRecognizer(type);
 }
 
diff --git a/src/widgets/kernel/qgridlayout.cpp b/src/widgets/kernel/qgridlayout.cpp
index db8ef89477..4f2b505e32 100644
--- a/src/widgets/kernel/qgridlayout.cpp
+++ b/src/widgets/kernel/qgridlayout.cpp
@@ -1029,7 +1029,7 @@ QRect QGridLayoutPrivate::cellRect(int row, int col) const
     This illustration shows a fragment of a dialog with a five-column,
     three-row grid (the grid is shown overlaid in magenta):
 
-    \image gridlayout.png A grid layout
+    \image qgridlayout.png A grid layout
 
     Columns 0, 2 and 4 in this dialog fragment are made up of a
     QLabel, a QLineEdit, and a QListBox. Columns 1 and 3 are
@@ -1330,8 +1330,8 @@ QLayoutItem *QGridLayout::itemAt(int index) const
 /*!
     \since 4.4
 
-    Returns the layout item that occupies cell (\a row, \a column), or 0 if
-    the cell is empty.
+    Returns the layout item that occupies cell (\a row, \a column), or
+    \nullptr if the cell is empty.
 
     \sa getItemPosition(), indexOf()
 */
@@ -1346,7 +1346,7 @@ QLayoutItem *QGridLayout::itemAtPosition(int row, int column) const
             return box->item();
         }
     }
-    return 0;
+    return nullptr;
 }
 
 /*!
diff --git a/src/widgets/kernel/qlayout.cpp b/src/widgets/kernel/qlayout.cpp
index eac5674161..e3f6a56875 100644
--- a/src/widgets/kernel/qlayout.cpp
+++ b/src/widgets/kernel/qlayout.cpp
@@ -109,7 +109,7 @@ static int menuBarHeightForWidth(QWidget *menubar, int w)
 
 /*!
     Constructs a new top-level QLayout, with parent \a parent.
-    \a parent may not be a \c nullptr.
+    \a parent may not be a \nullptr.
 
     The layout is set directly as the top-level layout for
     \a parent. There can be only one top-level layout for a
@@ -282,6 +282,7 @@ bool QLayout::setAlignment(QLayout *l, Qt::Alignment alignment)
     return false;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \property QLayout::margin
     \brief the width of the outside border of the layout
@@ -307,6 +308,15 @@ int QLayout::margin() const
 }
 
 /*!
+    \obsolete
+*/
+void QLayout::setMargin(int margin)
+{
+    setContentsMargins(margin, margin, margin, margin);
+}
+
+#endif
+/*!
     \property QLayout::spacing
     \brief the spacing between widgets inside the layout
 
@@ -344,14 +354,6 @@ int QLayout::spacing() const
     }
 }
 
-/*!
-    \obsolete
-*/
-void QLayout::setMargin(int margin)
-{
-    setContentsMargins(margin, margin, margin, margin);
-}
-
 void QLayout::setSpacing(int spacing)
 {
     if (QBoxLayout* boxlayout = qobject_cast<QBoxLayout*>(this)) {
@@ -474,8 +476,8 @@ QRect QLayout::contentsRect() const
 
 
 /*!
-    Returns the parent widget of this layout, or 0 if this layout is
-    not installed on any widget.
+    Returns the parent widget of this layout, or \nullptr if this
+    layout is not installed on any widget.
 
     If the layout is a sub-layout, this function returns the parent
     widget of the parent layout.
@@ -490,11 +492,11 @@ QWidget *QLayout::parentWidget() const
             QLayout *parentLayout = qobject_cast<QLayout*>(parent());
             if (Q_UNLIKELY(!parentLayout)) {
                 qWarning("QLayout::parentWidget: A layout can only have another layout as a parent.");
-                return 0;
+                return nullptr;
             }
             return parentLayout->parentWidget();
         } else {
-            return 0;
+            return nullptr;
         }
     } else {
         Q_ASSERT(parent() && parent()->isWidgetType());
@@ -950,8 +952,8 @@ void QLayout::setMenuBar(QWidget *widget)
 }
 
 /*!
-    Returns the menu bar set for this layout, or 0 if no menu bar is
-    set.
+    Returns the menu bar set for this layout, or \nullptr if no
+    menu bar is set.
 */
 
 QWidget *QLayout::menuBar() const
@@ -1130,8 +1132,9 @@ bool QLayout::activate()
 
     Searches for widget \a from and replaces it with widget \a to if found.
     Returns the layout item that contains the widget \a from on success.
-    Otherwise \c 0 is returned. If \a options contains \c Qt::FindChildrenRecursively
-    (the default), sub-layouts are searched for doing the replacement.
+    Otherwise \nullptr is returned.
+    If \a options contains \c Qt::FindChildrenRecursively  (the default),
+    sub-layouts are searched for doing the replacement.
     Any other flag in \a options is ignored.
 
     Notice that the returned item therefore might not belong to this layout,
diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h
index 616f4e7164..35a04a35b2 100644
--- a/src/widgets/kernel/qlayout.h
+++ b/src/widgets/kernel/qlayout.h
@@ -63,7 +63,9 @@ class Q_WIDGETS_EXPORT QLayout : public QObject, public QLayoutItem
     Q_OBJECT
     Q_DECLARE_PRIVATE(QLayout)
 
+#if QT_DEPRECATED_SINCE(5, 13)
     Q_PROPERTY(int margin READ margin WRITE setMargin)
+#endif
     Q_PROPERTY(int spacing READ spacing WRITE setSpacing)
     Q_PROPERTY(SizeConstraint sizeConstraint READ sizeConstraint WRITE setSizeConstraint)
 public:
@@ -81,10 +83,12 @@ public:
     QLayout();
     ~QLayout();
 
+#if QT_DEPRECATED_SINCE(5, 13)
     int margin() const;
-    int spacing() const;
-
     void setMargin(int);
+#endif
+
+    int spacing() const;
     void setSpacing(int);
 
     void setContentsMargins(int left, int top, int right, int bottom);
diff --git a/src/widgets/kernel/qlayout_p.h b/src/widgets/kernel/qlayout_p.h
index 8a1b12a6be..8e1d773355 100644
--- a/src/widgets/kernel/qlayout_p.h
+++ b/src/widgets/kernel/qlayout_p.h
@@ -80,7 +80,7 @@ public:
 
     static QWidgetItem *createWidgetItem(const QLayout *layout, QWidget *widget);
     static QSpacerItem *createSpacerItem(const QLayout *layout, int w, int h, QSizePolicy::Policy hPolicy = QSizePolicy::Minimum, QSizePolicy::Policy vPolicy = QSizePolicy::Minimum);
-    virtual QLayoutItem* replaceAt(int index, QLayoutItem *newitem) { Q_UNUSED(index); Q_UNUSED(newitem); return 0; }
+    virtual QLayoutItem* replaceAt(int index, QLayoutItem *newitem) { Q_UNUSED(index); Q_UNUSED(newitem); return nullptr; }
 
     static QWidgetItemFactoryMethod widgetItemFactoryMethod;
     static QSpacerItemFactoryMethod spacerItemFactoryMethod;
diff --git a/src/widgets/kernel/qlayoutengine_p.h b/src/widgets/kernel/qlayoutengine_p.h
index 812fa7cf3b..948c2424e6 100644
--- a/src/widgets/kernel/qlayoutengine_p.h
+++ b/src/widgets/kernel/qlayoutengine_p.h
@@ -105,9 +105,9 @@ Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidgetItem *i);
 Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidget *w);
 Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QSize &sizeHint,
                                  const QSize &minSize, const QSize &maxSize,
-                                 const QSizePolicy &sizePolicy, Qt::Alignment align = 0);
-Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align = 0);
-Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidget *w, Qt::Alignment align = 0);
+                                 const QSizePolicy &sizePolicy, Qt::Alignment align = nullptr);
+Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align = nullptr);
+Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidget *w, Qt::Alignment align = nullptr);
 
 Q_WIDGETS_EXPORT int qSmartSpacing(const QLayout *layout, QStyle::PixelMetric pm);
 
diff --git a/src/widgets/kernel/qlayoutitem.cpp b/src/widgets/kernel/qlayoutitem.cpp
index 25890e888b..0aab0bb06d 100644
--- a/src/widgets/kernel/qlayoutitem.cpp
+++ b/src/widgets/kernel/qlayoutitem.cpp
@@ -309,24 +309,24 @@ void QLayoutItem::invalidate()
 
 /*!
     If this item is a QLayout, it is returned as a QLayout; otherwise
-    0 is returned. This function provides type-safe casting.
+    \nullptr is returned. This function provides type-safe casting.
 
     \sa spacerItem(), widget()
 */
-QLayout * QLayoutItem::layout()
+QLayout *QLayoutItem::layout()
 {
-    return 0;
+    return nullptr;
 }
 
 /*!
     If this item is a QSpacerItem, it is returned as a QSpacerItem;
-    otherwise 0 is returned. This function provides type-safe casting.
+    otherwise \nullptr is returned. This function provides type-safe casting.
 
     \sa layout(), widget()
 */
-QSpacerItem * QLayoutItem::spacerItem()
+QSpacerItem *QLayoutItem::spacerItem()
 {
-    return 0;
+    return nullptr;
 }
 
 /*!
@@ -354,7 +354,7 @@ QSpacerItem * QSpacerItem::spacerItem()
 
 /*!
     If this item manages a QWidget, returns that widget. Otherwise,
-    \c nullptr is returned.
+    \nullptr is returned.
 
     \note While the functions layout() and spacerItem() perform casts, this
     function returns another object: QLayout and QSpacerItem inherit QLayoutItem,
@@ -362,9 +362,9 @@ QSpacerItem * QSpacerItem::spacerItem()
 
     \sa layout(), spacerItem()
 */
-QWidget * QLayoutItem::widget()
+QWidget *QLayoutItem::widget()
 {
-    return 0;
+    return nullptr;
 }
 
 /*!
@@ -502,6 +502,17 @@ void QWidgetItem::setGeometry(const QRect &rect)
     else if (!(align & Qt::AlignTop))
         y = y + (r.height() - s.height()) / 2;
 
+    // Make sure we don't move outside of the parent, e.g when styles demand
+    // surplus space that exceeds the available margins (f.ex macOS with QGroupBox)
+    if (x < 0) {
+        s.rwidth() += x;
+        x = 0;
+    }
+    if (y < 0) {
+        s.rheight() += y;
+        y = 0;
+    }
+
     wid->setGeometry(x, y, s.width(), s.height());
 }
 
diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp
index ed0fe0ed91..cf15614680 100644
--- a/src/widgets/kernel/qopenglwidget.cpp
+++ b/src/widgets/kernel/qopenglwidget.cpp
@@ -756,6 +756,7 @@ void QOpenGLWidgetPrivate::recreateFbo()
 
     fbo->bind();
     context->functions()->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+    flushPending = true; // Make sure the FBO is initialized before use
 
     paintDevice->setSize(deviceSize);
     paintDevice->setDevicePixelRatio(q->devicePixelRatioF());
@@ -1117,8 +1118,8 @@ void QOpenGLWidget::setTextureFormat(GLenum texFormat)
 /*!
     \return the active internal texture format if the widget has already
     initialized, the requested format if one was set but the widget has not yet
-    been made visible, or 0 if setTextureFormat() was not called and the widget
-    has not yet been made visible.
+    been made visible, or \nullptr if setTextureFormat() was not called and the
+    widget has not yet been made visible.
 
     \since 5.10
  */
diff --git a/src/widgets/kernel/qsizepolicy.cpp b/src/widgets/kernel/qsizepolicy.cpp
index b5a0cd3940..54bf8fe0dc 100644
--- a/src/widgets/kernel/qsizepolicy.cpp
+++ b/src/widgets/kernel/qsizepolicy.cpp
@@ -232,7 +232,7 @@ QT_BEGIN_NAMESPACE
     Returns the control type associated with the widget for which
     this size policy applies.
 */
-QSizePolicy::ControlType QSizePolicy::controlType() const Q_DECL_NOTHROW
+QSizePolicy::ControlType QSizePolicy::controlType() const noexcept
 {
     return QSizePolicy::ControlType(1 << bits.ctype);
 }
@@ -253,7 +253,7 @@ QSizePolicy::ControlType QSizePolicy::controlType() const Q_DECL_NOTHROW
 
     \sa QStyle::layoutSpacing()
 */
-void QSizePolicy::setControlType(ControlType type) Q_DECL_NOTHROW
+void QSizePolicy::setControlType(ControlType type) noexcept
 {
     bits.ctype = toControlTypeFieldValue(type);
 }
diff --git a/src/widgets/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h
index dba742dec5..f26923eeb0 100644
--- a/src/widgets/kernel/qsizepolicy.h
+++ b/src/widgets/kernel/qsizepolicy.h
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 class QVariant;
 class QSizePolicy;
 
-Q_DECL_CONST_FUNCTION inline uint qHash(QSizePolicy key, uint seed = 0) Q_DECL_NOTHROW;
+Q_DECL_CONST_FUNCTION inline uint qHash(QSizePolicy key, uint seed = 0) noexcept;
 
 class Q_WIDGETS_EXPORT QSizePolicy
 {
@@ -110,60 +110,60 @@ public:
     Q_DECLARE_FLAGS(ControlTypes, ControlType)
     Q_FLAG(ControlTypes)
 
-    QT_SIZEPOLICY_CONSTEXPR QSizePolicy() Q_DECL_NOTHROW : data(0) { }
+    QT_SIZEPOLICY_CONSTEXPR QSizePolicy() noexcept : data(0) { }
 
 #if defined(Q_COMPILER_UNIFORM_INIT) && !defined(Q_QDOC)
-    QT_SIZEPOLICY_CONSTEXPR QSizePolicy(Policy horizontal, Policy vertical, ControlType type = DefaultType) Q_DECL_NOTHROW
+    QT_SIZEPOLICY_CONSTEXPR QSizePolicy(Policy horizontal, Policy vertical, ControlType type = DefaultType) noexcept
         : bits{0, 0, quint32(horizontal), quint32(vertical),
                type == DefaultType ? 0 : toControlTypeFieldValue(type), 0, 0, 0}
     {}
 #else
-    QSizePolicy(Policy horizontal, Policy vertical, ControlType type = DefaultType) Q_DECL_NOTHROW
+    QSizePolicy(Policy horizontal, Policy vertical, ControlType type = DefaultType) noexcept
         : data(0) {
         bits.horPolicy = horizontal;
         bits.verPolicy = vertical;
         setControlType(type);
     }
 #endif // uniform-init
-    QT_SIZEPOLICY_CONSTEXPR Policy horizontalPolicy() const Q_DECL_NOTHROW { return static_cast<Policy>(bits.horPolicy); }
-    QT_SIZEPOLICY_CONSTEXPR Policy verticalPolicy() const Q_DECL_NOTHROW { return static_cast<Policy>(bits.verPolicy); }
-    ControlType controlType() const Q_DECL_NOTHROW;
+    QT_SIZEPOLICY_CONSTEXPR Policy horizontalPolicy() const noexcept { return static_cast<Policy>(bits.horPolicy); }
+    QT_SIZEPOLICY_CONSTEXPR Policy verticalPolicy() const noexcept { return static_cast<Policy>(bits.verPolicy); }
+    ControlType controlType() const noexcept;
 
-    Q_DECL_RELAXED_CONSTEXPR void setHorizontalPolicy(Policy d) Q_DECL_NOTHROW { bits.horPolicy = d; }
-    Q_DECL_RELAXED_CONSTEXPR void setVerticalPolicy(Policy d) Q_DECL_NOTHROW { bits.verPolicy = d; }
-    void setControlType(ControlType type) Q_DECL_NOTHROW;
+    Q_DECL_RELAXED_CONSTEXPR void setHorizontalPolicy(Policy d) noexcept { bits.horPolicy = d; }
+    Q_DECL_RELAXED_CONSTEXPR void setVerticalPolicy(Policy d) noexcept { bits.verPolicy = d; }
+    void setControlType(ControlType type) noexcept;
 
-    QT_SIZEPOLICY_CONSTEXPR Qt::Orientations expandingDirections() const Q_DECL_NOTHROW {
+    QT_SIZEPOLICY_CONSTEXPR Qt::Orientations expandingDirections() const noexcept {
         return ( (verticalPolicy()   & ExpandFlag) ? Qt::Vertical   : Qt::Orientations() )
              | ( (horizontalPolicy() & ExpandFlag) ? Qt::Horizontal : Qt::Orientations() ) ;
     }
 
-    Q_DECL_RELAXED_CONSTEXPR void setHeightForWidth(bool b) Q_DECL_NOTHROW { bits.hfw = b;  }
-    QT_SIZEPOLICY_CONSTEXPR bool hasHeightForWidth() const Q_DECL_NOTHROW { return bits.hfw; }
-    Q_DECL_RELAXED_CONSTEXPR void setWidthForHeight(bool b) Q_DECL_NOTHROW { bits.wfh = b;  }
-    QT_SIZEPOLICY_CONSTEXPR bool hasWidthForHeight() const Q_DECL_NOTHROW { return bits.wfh; }
+    Q_DECL_RELAXED_CONSTEXPR void setHeightForWidth(bool b) noexcept { bits.hfw = b;  }
+    QT_SIZEPOLICY_CONSTEXPR bool hasHeightForWidth() const noexcept { return bits.hfw; }
+    Q_DECL_RELAXED_CONSTEXPR void setWidthForHeight(bool b) noexcept { bits.wfh = b;  }
+    QT_SIZEPOLICY_CONSTEXPR bool hasWidthForHeight() const noexcept { return bits.wfh; }
 
-    QT_SIZEPOLICY_CONSTEXPR bool operator==(const QSizePolicy& s) const Q_DECL_NOTHROW { return data == s.data; }
-    QT_SIZEPOLICY_CONSTEXPR bool operator!=(const QSizePolicy& s) const Q_DECL_NOTHROW { return data != s.data; }
+    QT_SIZEPOLICY_CONSTEXPR bool operator==(const QSizePolicy& s) const noexcept { return data == s.data; }
+    QT_SIZEPOLICY_CONSTEXPR bool operator!=(const QSizePolicy& s) const noexcept { return data != s.data; }
 
-    friend Q_DECL_CONST_FUNCTION uint qHash(QSizePolicy key, uint seed) Q_DECL_NOTHROW { return qHash(key.data, seed); }
+    friend Q_DECL_CONST_FUNCTION uint qHash(QSizePolicy key, uint seed) noexcept { return qHash(key.data, seed); }
 
     operator QVariant() const;
 
-    QT_SIZEPOLICY_CONSTEXPR int horizontalStretch() const Q_DECL_NOTHROW { return static_cast<int>(bits.horStretch); }
-    QT_SIZEPOLICY_CONSTEXPR int verticalStretch() const Q_DECL_NOTHROW { return static_cast<int>(bits.verStretch); }
+    QT_SIZEPOLICY_CONSTEXPR int horizontalStretch() const noexcept { return static_cast<int>(bits.horStretch); }
+    QT_SIZEPOLICY_CONSTEXPR int verticalStretch() const noexcept { return static_cast<int>(bits.verStretch); }
     Q_DECL_RELAXED_CONSTEXPR void setHorizontalStretch(int stretchFactor) { bits.horStretch = static_cast<quint32>(qBound(0, stretchFactor, 255)); }
     Q_DECL_RELAXED_CONSTEXPR void setVerticalStretch(int stretchFactor) { bits.verStretch = static_cast<quint32>(qBound(0, stretchFactor, 255)); }
 
-    QT_SIZEPOLICY_CONSTEXPR bool retainSizeWhenHidden() const Q_DECL_NOTHROW { return bits.retainSizeWhenHidden; }
-    Q_DECL_RELAXED_CONSTEXPR void setRetainSizeWhenHidden(bool retainSize) Q_DECL_NOTHROW { bits.retainSizeWhenHidden = retainSize; }
+    QT_SIZEPOLICY_CONSTEXPR bool retainSizeWhenHidden() const noexcept { return bits.retainSizeWhenHidden; }
+    Q_DECL_RELAXED_CONSTEXPR void setRetainSizeWhenHidden(bool retainSize) noexcept { bits.retainSizeWhenHidden = retainSize; }
 
-    Q_DECL_RELAXED_CONSTEXPR void transpose() Q_DECL_NOTHROW { *this = transposed(); }
+    Q_DECL_RELAXED_CONSTEXPR void transpose() noexcept { *this = transposed(); }
     Q_REQUIRED_RESULT
 #ifndef Q_QDOC
     QT_SIZEPOLICY_CONSTEXPR_AND_UNIFORM_INIT
 #endif
-    QSizePolicy transposed() const Q_DECL_NOTHROW
+    QSizePolicy transposed() const noexcept
     {
         return QSizePolicy(bits.transposed());
     }
@@ -173,11 +173,11 @@ private:
     friend Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &, const QSizePolicy &);
     friend Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &, QSizePolicy &);
 #endif
-    QT_SIZEPOLICY_CONSTEXPR QSizePolicy(int i) Q_DECL_NOTHROW : data(i) { }
+    QT_SIZEPOLICY_CONSTEXPR QSizePolicy(int i) noexcept : data(i) { }
     struct Bits;
-    QT_SIZEPOLICY_CONSTEXPR explicit QSizePolicy(Bits b) Q_DECL_NOTHROW : bits(b) { }
+    QT_SIZEPOLICY_CONSTEXPR explicit QSizePolicy(Bits b) noexcept : bits(b) { }
 
-    static Q_DECL_RELAXED_CONSTEXPR quint32 toControlTypeFieldValue(ControlType type) Q_DECL_NOTHROW
+    static Q_DECL_RELAXED_CONSTEXPR quint32 toControlTypeFieldValue(ControlType type) noexcept
     {
         /*
           The control type is a flag type, with values 0x1, 0x2, 0x4, 0x8, 0x10,
@@ -207,7 +207,7 @@ private:
         quint32 retainSizeWhenHidden : 1;
 
         QT_SIZEPOLICY_CONSTEXPR_AND_UNIFORM_INIT
-        Bits transposed() const Q_DECL_NOTHROW
+        Bits transposed() const noexcept
         {
             return {verStretch, // \ swap
                     horStretch, // /
diff --git a/src/widgets/kernel/qstackedlayout.cpp b/src/widgets/kernel/qstackedlayout.cpp
index 7430d833db..0412dc188d 100644
--- a/src/widgets/kernel/qstackedlayout.cpp
+++ b/src/widgets/kernel/qstackedlayout.cpp
@@ -378,20 +378,20 @@ void QStackedLayout::setCurrentWidget(QWidget *widget)
 
 
 /*!
-    Returns the current widget, or 0 if there are no widgets in this
-    layout.
+    Returns the current widget, or \nullptr if there are no widgets
+    in this layout.
 
     \sa currentIndex(), setCurrentWidget()
 */
 QWidget *QStackedLayout::currentWidget() const
 {
     Q_D(const QStackedLayout);
-    return d->index >= 0 ? d->list.at(d->index)->widget() : 0;
+    return d->index >= 0 ? d->list.at(d->index)->widget() : nullptr;
 }
 
 /*!
-    Returns the widget at the given \a index, or 0 if there is no
-    widget at the given position.
+    Returns the widget at the given \a index, or \nullptr if there is
+    no widget at the given position.
 
     \sa currentWidget(), indexOf()
 */
@@ -399,7 +399,7 @@ QWidget *QStackedLayout::widget(int index) const
 {
     Q_D(const QStackedLayout);
      if (index < 0 || index >= d->list.size())
-        return 0;
+        return nullptr;
     return d->list.at(index)->widget();
 }
 
diff --git a/src/widgets/kernel/qt_widgets_pch.h b/src/widgets/kernel/qt_widgets_pch.h
index 924a68d62e..b70941950b 100644
--- a/src/widgets/kernel/qt_widgets_pch.h
+++ b/src/widgets/kernel/qt_widgets_pch.h
@@ -45,39 +45,17 @@
  * UNSUPPORTED.
  */
 
-// from corelib/global/qt_pch.h
+#include "../../gui/kernel/qt_gui_pch.h"
+
 #if defined __cplusplus
 #include <qtwidgetsglobal.h>
-
-
-#if 0 // Used to be included in Qt4 for Q_WS_WIN
-# define _POSIX_
-# include <limits.h>
-# undef _POSIX_
-#endif
-
-#include <qcoreapplication.h>
-#include <qlist.h>
-#include <qvariant.h>  // All moc genereated code has this include
-#include <qobject.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qtextcodec.h>
-
 #include <qapplication.h>
-#include <qbitmap.h>
-#include <qcursor.h>
-#include <qdesktopwidget.h>
-#include <qevent.h>
-#include <qimage.h>
+#include <qabstractbutton.h>
+#include <qabstractscrollarea.h>
+#include <qabstractslider.h>
+#include <qaction.h>
+#include <qcommonstyle.h>
 #include <qlayout.h>
-#include <qpainter.h>
-#include <qpixmap.h>
 #include <qstyle.h>
-#include <qtimer.h>
 #include <qwidget.h>
-
-#include <stdlib.h>
-
 #endif
diff --git a/src/widgets/kernel/qtestsupport_widgets.cpp b/src/widgets/kernel/qtestsupport_widgets.cpp
index b227e6ff5d..0056bebdc6 100644
--- a/src/widgets/kernel/qtestsupport_widgets.cpp
+++ b/src/widgets/kernel/qtestsupport_widgets.cpp
@@ -46,15 +46,14 @@
 
 QT_BEGIN_NAMESPACE
 
-/*! \fn bool qWaitForWindowActive(QWidget *widget, int timeout)
-    \relates QTest
+/*!
     \since 5.0
 
     Waits for \a timeout milliseconds or until the \a widget's window is active.
 
     Returns \c true if \c widget's window is active within \a timeout milliseconds, otherwise returns \c false.
 
-    \sa QTest::qWaitForWindowExposed(), QWidget::isActiveWindow()
+    \sa qWaitForWindowExposed(), QWidget::isActiveWindow()
 */
 Q_WIDGETS_EXPORT Q_REQUIRED_RESULT bool QTest::qWaitForWindowActive(QWidget *widget, int timeout)
 {
@@ -63,8 +62,7 @@ Q_WIDGETS_EXPORT Q_REQUIRED_RESULT bool QTest::qWaitForWindowActive(QWidget *wid
     return false;
 }
 
-/*! \fn bool qWaitForWindowExposed(QWidget *widget, int timeout)
-    \relates QTest
+/*!
     \since 5.0
 
     Waits for \a timeout milliseconds or until the \a widget's window is exposed.
@@ -80,7 +78,7 @@ Q_WIDGETS_EXPORT Q_REQUIRED_RESULT bool QTest::qWaitForWindowActive(QWidget *wid
     A specific configuration where this happens is when using QGLWidget as a viewport widget on macOS:
     The viewport widget gets the expose event, not the parent widget.
 
-    \sa QTest::qWaitForWindowActive()
+    \sa qWaitForWindowActive()
 */
 Q_WIDGETS_EXPORT Q_REQUIRED_RESULT bool QTest::qWaitForWindowExposed(QWidget *widget, int timeout)
 {
@@ -89,11 +87,12 @@ Q_WIDGETS_EXPORT Q_REQUIRED_RESULT bool QTest::qWaitForWindowExposed(QWidget *wi
     return false;
 }
 
-/*! \fn bool qWaitForWindowShown(QWidget *widget, int timeout)
-    \relates QTest
+/*! \fn bool QTest::qWaitForWindowShown(QWidget *widget, int timeout)
     \since 5.0
     \deprecated
 
+    Use qWaitForWindowExposed() instead.
+
     Waits for \a timeout milliseconds or until the \a widget's window is exposed.
     Returns \c true if \c widget's window is exposed within \a timeout milliseconds, otherwise returns \c false.
 
@@ -107,7 +106,7 @@ Q_WIDGETS_EXPORT Q_REQUIRED_RESULT bool QTest::qWaitForWindowExposed(QWidget *wi
         QTest::qWaitForWindowShown(&widget);
     \endcode
 
-    \sa QTest::qWaitForWindowActive(), QTest::qWaitForWindowExposed()
+    \sa qWaitForWindowActive(), qWaitForWindowExposed()
 */
 
 QT_END_NAMESPACE
diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp
index 8c5573d3a3..f81cb471fa 100644
--- a/src/widgets/kernel/qtooltip.cpp
+++ b/src/widgets/kernel/qtooltip.cpp
@@ -41,6 +41,7 @@
 #endif
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
+#include <QtWidgets/private/qlabel_p.h>
 
 #include <qapplication.h>
 #include <qdesktopwidget.h>
@@ -127,6 +128,7 @@ public:
     ~QTipLabel();
     static QTipLabel *instance;
 
+    void adjustTooltipScreen(const QPoint &pos);
     void updateSize(const QPoint &pos);
 
     bool eventFilter(QObject *, QEvent *) override;
@@ -214,7 +216,6 @@ void QTipLabel::reuseTip(const QString &text, int msecDisplayTime, const QPoint
     }
 #endif
 
-    setWordWrap(true);
     setText(text);
     updateSize(pos);
     restartExpireTimer(msecDisplayTime);
@@ -222,19 +223,28 @@ void QTipLabel::reuseTip(const QString &text, int msecDisplayTime, const QPoint
 
 void  QTipLabel::updateSize(const QPoint &pos)
 {
+#ifndef Q_OS_WINRT
+    // ### The code below does not always work well on WinRT
+    // (e.g COIN fails an auto test - tst_QToolTip::qtbug64550_stylesheet - QTBUG-72652)
+    d_func()->setScreenForPoint(pos);
+#endif
+    // Ensure that we get correct sizeHints by placing this window on the right screen.
     QFontMetrics fm(font());
     QSize extra(1, 0);
     // Make it look good with the default ToolTip font on Mac, which has a small descent.
     if (fm.descent() == 2 && fm.ascent() >= 11)
         ++extra.rheight();
+    setWordWrap(Qt::mightBeRichText(text()));
     QSize sh = sizeHint();
-    if (wordWrap()) {
-        const QRect screenRect = QGuiApplication::screenAt(pos)->geometry();
-        if (sh.width() > screenRect.width()) {
-            // Try to use widely accepted 75chars max length or 80% of the screen width else.
-            // See https://en.wikipedia.org/wiki/Line_length
-            sh.setWidth(qMin(fm.averageCharWidth() * 75, static_cast<int>(screenRect.width() * .8)));
-            sh.setHeight(heightForWidth(sh.width()));
+    // ### When the above WinRT code is fixed, windowhandle should be used to find the screen.
+    QScreen *screen = QGuiApplication::screenAt(pos);
+    if (!screen)
+        screen = QGuiApplication::primaryScreen();
+    if (screen) {
+        const qreal screenWidth = screen->geometry().width();
+        if (!wordWrap() && sh.width() > screenWidth) {
+            setWordWrap(true);
+            sh = sizeHint();
         }
     }
     resize(sh + extra);
@@ -472,8 +482,8 @@ bool QTipLabel::tipChanged(const QPoint &pos, const QString &text, QObject *o)
 
     The \a rect is in the coordinates of the widget you specify with
     \a w. If the \a rect is not empty you must specify a widget.
-    Otherwise this argument can be 0 but it is used to determine the
-    appropriate screen on multi-head systems.
+    Otherwise this argument can be \nullptr but it is used to
+    determine the appropriate screen on multi-head systems.
 
     If \a text is empty the tool tip is hidden. If the text is the
     same as the currently shown tooltip, the tip will \e not move.
diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp
index 1fa83d3238..4a798a7490 100644
--- a/src/widgets/kernel/qwhatsthis.cpp
+++ b/src/widgets/kernel/qwhatsthis.cpp
@@ -398,10 +398,10 @@ QWhatsThisPrivate::QWhatsThisPrivate()
 #ifdef QT_NO_CURSOR
         Q_UNUSED(sentEvent);
 #else
-        QApplication::setOverrideCursor((!sentEvent || !e.isAccepted())?
+        QGuiApplication::setOverrideCursor((!sentEvent || !e.isAccepted())?
                                         Qt::ForbiddenCursor:Qt::WhatsThisCursor);
     } else {
-        QApplication::setOverrideCursor(Qt::WhatsThisCursor);
+        QGuiApplication::setOverrideCursor(Qt::WhatsThisCursor);
 #endif
     }
 #ifndef QT_NO_ACCESSIBILITY
@@ -417,7 +417,7 @@ QWhatsThisPrivate::~QWhatsThisPrivate()
         action->setChecked(false);
 #endif // QT_CONFIG(action)
 #ifndef QT_NO_CURSOR
-    QApplication::restoreOverrideCursor();
+    QGuiApplication::restoreOverrideCursor();
 #endif
 #ifndef QT_NO_ACCESSIBILITY
     QAccessibleEvent event(this, QAccessible::ContextHelpEnd);
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index ca4f958c14..74b18d9991 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -247,6 +247,7 @@ QWidgetPrivate::QWidgetPrivate(int version)
 #ifndef QT_NO_TOOLTIP
       , toolTipDuration(-1)
 #endif
+      , directFontResolveMask(0)
       , inheritedFontResolveMask(0)
       , inheritedPaletteResolveMask(0)
       , leftmargin(0)
@@ -510,10 +511,10 @@ void QWidget::setAutoFillBackground(bool enabled)
     Every widget's constructor accepts one or two standard arguments:
 
     \list 1
-        \li  \c{QWidget *parent = 0} is the parent of the new widget. If it is 0
-            (the default), the new widget will be a window. If not, it will be
-            a child of \e parent, and be constrained by \e parent's geometry
-            (unless you specify Qt::Window as window flag).
+        \li  \c{QWidget *parent = \nullptr} is the parent of the new widget.
+            If it is \nullptr (the default), the new widget will be a window.
+            If not, it will be a child of \e parent, and be constrained by
+            \e parent's geometry (unless you specify Qt::Window as window flag).
         \li  \c{Qt::WindowFlags f = 0} (where available) sets the window flags;
             the default is suitable for almost all widgets, but to get, for
             example, a window without a window system frame, you must use
@@ -1002,14 +1003,14 @@ struct QWidgetExceptionCleaner
     Constructs a widget which is a child of \a parent, with  widget
     flags set to \a f.
 
-    If \a parent is 0, the new widget becomes a window. If
+    If \a parent is \nullptr, the new widget becomes a window. If
     \a parent is another widget, this widget becomes a child window
     inside \a parent. The new widget is deleted when its \a parent is
     deleted.
 
     The widget flags argument, \a f, is normally 0, but it can be set
-    to customize the frame of a window (i.e. \a
-    parent must be 0). To customize the frame, use a value composed
+    to customize the frame of a window (i.e. \a parent must be
+    \nullptr). To customize the frame, use a value composed
     from the bitwise OR of any of the \l{Qt::WindowFlags}{window flags}.
 
     If you add a child widget to an already visible widget you must
@@ -1347,11 +1348,6 @@ void QWidget::create(WId window, bool initializeWindow, bool destroyOldWindow)
     if (!isWindow() && parentWidget() && parentWidget()->testAttribute(Qt::WA_DropSiteRegistered))
         setAttribute(Qt::WA_DropSiteRegistered, true);
 
-#ifdef QT_EVAL
-    extern void qt_eval_init_widget(QWidget *w);
-    qt_eval_init_widget(this);
-#endif
-
     // need to force the resting of the icon after changing parents
     if (testAttribute(Qt::WA_SetWindowIcon))
         d->setWindowIcon_sys();
@@ -1542,14 +1538,19 @@ void QWidgetPrivate::createTLSysExtra()
             extra->topextra->window->setMaximumSize(QSize(extra->maxw, extra->maxh));
         if (extra->topextra->opacity != 255 && q->isWindow())
             extra->topextra->window->setOpacity(qreal(extra->topextra->opacity) / qreal(255));
+
+        const bool isTipLabel = q->inherits("QTipLabel");
+        const bool isAlphaWidget = !isTipLabel && q->inherits("QAlphaWidget");
 #ifdef Q_OS_WIN
         // Pass on native parent handle for Widget embedded into Active X.
         const QVariant activeXNativeParentHandle = q->property(activeXNativeParentHandleProperty);
         if (activeXNativeParentHandle.isValid())
             extra->topextra->window->setProperty(activeXNativeParentHandleProperty, activeXNativeParentHandle);
-        if (q->inherits("QTipLabel") || q->inherits("QAlphaWidget"))
+        if (isTipLabel || isAlphaWidget)
             extra->topextra->window->setProperty("_q_windowsDropShadow", QVariant(true));
 #endif
+        if (isTipLabel || isAlphaWidget || q->inherits("QRollEffect"))
+            qt_window_private(extra->topextra->window)->setAutomaticPositionAndResizeEnabled(false);
     }
 
 }
@@ -1580,9 +1581,6 @@ QWidget::~QWidget()
     d->gestureContext.clear();
 #endif
 
-    // force acceptDrops false before winId is destroyed.
-    d->registerDropSite(false);
-
 #ifndef QT_NO_ACTION
     // remove all actions from this widget
     for (int i = 0; i < d->actions.size(); ++i) {
@@ -1778,7 +1776,6 @@ void QWidgetPrivate::createTLExtra()
         x->posIncludesFrame = 0;
         x->sizeAdjusted = false;
         x->inTopLevelResize = false;
-        x->inRepaint = false;
         x->embedded = 0;
         x->window = 0;
         x->shareContext = 0;
@@ -2500,12 +2497,12 @@ void QWidgetPrivate::deactivateWidgetCleanup()
 
     The window identifier type depends on the underlying window
     system, see \c qwindowdefs.h for the actual definition. If there
-    is no widget with this identifier, 0 is returned.
+    is no widget with this identifier, \nullptr is returned.
 */
 
 QWidget *QWidget::find(WId id)
 {
-    return QWidgetPrivate::mapper ? QWidgetPrivate::mapper->value(id, 0) : 0;
+    return QWidgetPrivate::mapper ? QWidgetPrivate::mapper->value(id, 0) : nullptr;
 }
 
 
@@ -2578,6 +2575,27 @@ void QWidgetPrivate::createWinId()
     }
 }
 
+/*!
+\internal
+Ensures that the widget is set on the screen point is on. This is handy getting a correct
+size hint before a resize in e.g QMenu and QToolTip
+*/
+
+void QWidgetPrivate::setScreenForPoint(const QPoint &pos)
+{
+    Q_Q(QWidget);
+    if (!q->isWindow())
+        return;
+    // Find the screen for pos and make the widget undertand it is on that screen.
+    const QScreen *currentScreen = windowHandle() ? windowHandle()->screen() : nullptr;
+    QScreen *actualScreen = QGuiApplication::screenAt(pos);
+    if (actualScreen && currentScreen != actualScreen) {
+        if (!windowHandle()) // Try to create a window handle if not created.
+            createWinId();
+        if (windowHandle())
+            windowHandle()->setScreen(actualScreen);
+    }
+}
 
 /*!
 \internal
@@ -3261,7 +3279,7 @@ void QWidget::addActions(QList<QAction*> actions)
 
 /*!
     Inserts the action \a action to this widget's list of actions,
-    before the action \a before. It appends the action if \a before is 0 or
+    before the action \a before. It appends the action if \a before is \nullptr or
     \a before is not a valid action for this widget.
 
     A QWidget should only have one of each action.
@@ -3295,7 +3313,7 @@ void QWidget::insertAction(QAction *before, QAction *action)
 
 /*!
     Inserts the actions \a actions to this widget's list of actions,
-    before the action \a before. It appends the action if \a before is 0 or
+    before the action \a before. It appends the action if \a before is \nullptr or
     \a before is not a valid action for this widget.
 
     A QWidget can have at most one of each action.
@@ -3466,11 +3484,6 @@ void QWidget::setAcceptDrops(bool on)
 
 }
 
-void QWidgetPrivate::registerDropSite(bool on)
-{
-    Q_UNUSED(on);
-}
-
 /*!
     Disables widget input events if \a disable is true; otherwise
     enables input events.
@@ -4219,7 +4232,7 @@ void QWidget::setFixedHeight(int h)
 
 /*!
     Translates the widget coordinate \a pos to the coordinate system
-    of \a parent. The \a parent must not be 0 and must be a parent
+    of \a parent. The \a parent must not be \nullptr and must be a parent
     of the calling widget.
 
     \sa mapFrom(), mapToParent(), mapToGlobal(), underMouse()
@@ -4244,7 +4257,7 @@ QPoint QWidget::mapTo(const QWidget * parent, const QPoint & pos) const
 /*!
     Translates the widget coordinate \a pos from the coordinate system
     of \a parent to this widget's coordinate system. The \a parent
-    must not be 0 and must be a parent of the calling widget.
+    must not be \nullptr and must be a parent of the calling widget.
 
     \sa mapTo(), mapFromParent(), mapFromGlobal(), underMouse()
 */
@@ -4323,7 +4336,8 @@ QWidget *QWidget::window() const
     \since 4.4
 
     Returns the native parent for this widget, i.e. the next ancestor widget
-    that has a system identifier, or 0 if it does not have any native parent.
+    that has a system identifier, or \nullptr if it does not have any native
+    parent.
 
     \sa effectiveWinId()
 */
@@ -4499,15 +4513,14 @@ void QWidget::setForegroundRole(QPalette::ColorRole role)
     style, depend on third party APIs to render the content of widgets,
     and these styles typically do not follow the palette. Because of this,
     assigning roles to a widget's palette is not guaranteed to change the
-    appearance of the widget. Instead, you may choose to apply a \l
-    styleSheet.
+    appearance of the widget. Instead, you may choose to apply a \l {styleSheet}.
 
     \warning Do not use this function in conjunction with \l{Qt Style Sheets}.
     When using style sheets, the palette of a widget can be customized using
     the "color", "background-color", "selection-color",
     "selection-background-color" and "alternate-background-color".
 
-    \sa QApplication::palette(), QWidget::font(), \l {Qt Style Sheets}
+    \sa QApplication::palette(), QWidget::font(), {Qt Style Sheets}
 */
 const QPalette &QWidget::palette() const
 {
@@ -4745,6 +4758,18 @@ QFont QWidgetPrivate::naturalWidgetFont(uint inheritedMask) const
 /*!
     \internal
 
+    Returns a font suitable for inheritance, where only locally set attributes are considered resolved.
+*/
+QFont QWidgetPrivate::localFont() const
+{
+    QFont localfont = data.fnt;
+    localfont.resolve(directFontResolveMask);
+    return localfont;
+}
+
+/*!
+    \internal
+
     Determine which font is implicitly imposed on this widget by its ancestors
     and QApplication::font, resolve this against its own font (attributes from
     the implicit font are copied over). Then propagate this font to this
@@ -4753,7 +4778,7 @@ QFont QWidgetPrivate::naturalWidgetFont(uint inheritedMask) const
 void QWidgetPrivate::resolveFont()
 {
     QFont naturalFont = naturalWidgetFont(inheritedFontResolveMask);
-    QFont resolvedFont = data.fnt.resolve(naturalFont);
+    QFont resolvedFont = localFont().resolve(naturalFont);
     setFont_helper(resolvedFont);
 }
 
@@ -4792,6 +4817,11 @@ void QWidgetPrivate::updateFont(const QFont &font)
         inheritedFontResolveMask = 0;
     }
     uint newMask = data.fnt.resolve() | inheritedFontResolveMask;
+    // Set the font as also having resolved inherited traits, so the result of reading QWidget::font()
+    // isn't all weak information, but save the original mask to be able to let new changes on the
+    // parent widget font propagate correctly.
+    directFontResolveMask = data.fnt.resolve();
+    data.fnt.resolve(newMask);
 
     for (int i = 0; i < children.size(); ++i) {
         QWidget *w = qobject_cast<QWidget*>(children.at(i));
@@ -4928,9 +4958,9 @@ void QWidget::unsetLayoutDirection()
     Some underlying window implementations will reset the cursor if it
     leaves a widget even if the mouse is grabbed. If you want to have
     a cursor set for all widgets, even when outside the window, consider
-    QApplication::setOverrideCursor().
+    QGuiApplication::setOverrideCursor().
 
-    \sa QApplication::setOverrideCursor()
+    \sa QGuiApplication::setOverrideCursor()
 */
 
 #ifndef QT_NO_CURSOR
@@ -5243,7 +5273,7 @@ QPixmap QWidget::grab(const QRect &rectangle)
     \brief The graphicsEffect function returns a pointer to the
     widget's graphics effect.
 
-    If the widget has no graphics effect, 0 is returned.
+    If the widget has no graphics effect, \nullptr is returned.
 
     \since 4.6
 
@@ -5287,7 +5317,7 @@ void QWidget::setGraphicsEffect(QGraphicsEffect *effect)
         return;
 
     if (d->graphicsEffect) {
-        d->invalidateBuffer(rect());
+        d->invalidateBackingStore(rect());
         delete d->graphicsEffect;
         d->graphicsEffect = 0;
     }
@@ -5707,12 +5737,10 @@ void QWidgetPrivate::render(QPaintDevice *target, const QPoint &targetOffset,
     QPoint offset = targetOffset;
     offset -= paintRegion.boundingRect().topLeft();
     QPoint redirectionOffset;
-    QPaintDevice *redirected = 0;
+    QPaintDevice *redirected = nullptr;
 
     if (target->devType() == QInternal::Widget)
         redirected = static_cast<QWidget *>(target)->d_func()->redirected(&redirectionOffset);
-    if (!redirected)
-        redirected = QPainter::redirected(target, &redirectionOffset);
 
     if (redirected) {
         target = redirected;
@@ -5869,7 +5897,11 @@ QPixmap QWidgetEffectSourcePrivate::pixmap(Qt::CoordinateSystem system, QPoint *
 
     pixmapOffset -= effectRect.topLeft();
 
-    const qreal dpr = context->painter->device()->devicePixelRatioF();
+    qreal dpr(1.0);
+    if (const auto *paintDevice = context->painter->device())
+        dpr = paintDevice->devicePixelRatioF();
+    else
+        qWarning("QWidgetEffectSourcePrivate::pixmap: Painter not active");
     QPixmap pixmap(effectRect.size() * dpr);
     pixmap.setDevicePixelRatio(dpr);
 
@@ -5885,10 +5917,10 @@ QPixmap QWidgetEffectSourcePrivate::pixmap(Qt::CoordinateSystem system, QPoint *
 
     Finds the nearest widget embedded in a graphics proxy widget along the chain formed by this
     widget and its ancestors. The search starts at \a origin (inclusive).
-    If successful, the function returns the proxy that embeds the widget, or 0 if no embedded
-    widget was found.
+    If successful, the function returns the proxy that embeds the widget, or \nullptr if no
+    embedded widget was found.
 */
-QGraphicsProxyWidget * QWidgetPrivate::nearestGraphicsProxyWidget(const QWidget *origin)
+QGraphicsProxyWidget *QWidgetPrivate::nearestGraphicsProxyWidget(const QWidget *origin)
 {
     if (origin) {
         QWExtra *extra = origin->d_func()->extra;
@@ -5896,7 +5928,7 @@ QGraphicsProxyWidget * QWidgetPrivate::nearestGraphicsProxyWidget(const QWidget
             return extra->proxyWidget;
         return nearestGraphicsProxyWidget(origin->parentWidget());
     }
-    return 0;
+    return nullptr;
 }
 #endif
 
@@ -6022,13 +6054,7 @@ QString qt_setWindowTitle_helperHelper(const QString &title, const QWidget *widg
 {
     Q_ASSERT(widget);
 
-#ifdef QT_EVAL
-    extern QString qt_eval_adapt_window_title(const QString &title);
-    QString cap = qt_eval_adapt_window_title(title);
-#else
     QString cap = title;
-#endif
-
     if (cap.isEmpty())
         return cap;
 
@@ -6368,7 +6394,7 @@ void QWidget::setWindowRole(const QString &role)
 
 
 /*!
-    Sets the widget's focus proxy to widget \a w. If \a w is 0, the
+    Sets the widget's focus proxy to widget \a w. If \a w is \nullptr, the
     function resets this widget to have no focus proxy.
 
     Some widgets can "have focus", but create a child widget, such as
@@ -6401,15 +6427,15 @@ void QWidget::setFocusProxy(QWidget * w)
 
 
 /*!
-    Returns the focus proxy, or 0 if there is no focus proxy.
+    Returns the focus proxy, or \nullptr if there is no focus proxy.
 
     \sa setFocusProxy()
 */
 
-QWidget * QWidget::focusProxy() const
+QWidget *QWidget::focusProxy() const
 {
     Q_D(const QWidget);
-    return d->extra ? (QWidget *)d->extra->focus_proxy : 0;
+    return d->extra ? (QWidget *)d->extra->focus_proxy : nullptr;
 }
 
 
@@ -6600,20 +6626,25 @@ QWidget *QWidgetPrivate::deepestFocusProxy() const
     return focusProxy;
 }
 
+static inline bool isEmbedded(const QWindow *w)
+{
+     const auto platformWindow = w->handle();
+     return platformWindow && platformWindow->isEmbedded();
+}
+
 void QWidgetPrivate::setFocus_sys()
 {
     Q_Q(QWidget);
     // Embedded native widget may have taken the focus; get it back to toplevel
     // if that is the case (QTBUG-25852)
-    const QWidget *topLevel = q->window();
-    // Do not activate in case the popup menu opens another application (QTBUG-70810).
-    if (QGuiApplication::applicationState() == Qt::ApplicationActive
-        && topLevel->windowType() != Qt::Popup) {
-        if (QWindow *nativeWindow = q->window()->windowHandle()) {
-            if (nativeWindow != QGuiApplication::focusWindow()
-                && q->testAttribute(Qt::WA_WState_Created)) {
-                nativeWindow->requestActivate();
-            }
+    // Do not activate in case the popup menu opens another application (QTBUG-70810)
+    // unless the application is embedded (QTBUG-71991).
+    if (QWindow *nativeWindow = q->testAttribute(Qt::WA_WState_Created) ? q->window()->windowHandle() : nullptr) {
+        if (nativeWindow->type() != Qt::Popup && nativeWindow != QGuiApplication::focusWindow()
+            && (QGuiApplication::applicationState() == Qt::ApplicationActive
+                || QCoreApplication::testAttribute(Qt::AA_PluginApplication)
+                || isEmbedded(nativeWindow))) {
+            nativeWindow->requestActivate();
         }
     }
 }
@@ -7303,11 +7334,11 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
                 if (renderToTexture) {
                     QRegion updateRegion(q->geometry());
                     updateRegion += QRect(oldPos, olds);
-                    q->parentWidget()->d_func()->invalidateBuffer(updateRegion);
+                    q->parentWidget()->d_func()->invalidateBackingStore(updateRegion);
                 } else if (isMove && !isResize) {
                     moveRect(QRect(oldPos, olds), x - oldPos.x(), y - oldPos.y());
                 } else {
-                    invalidateBuffer_resizeHelper(oldPos, olds);
+                    invalidateBackingStore_resizeHelper(oldPos, olds);
                 }
             }
         }
@@ -8069,7 +8100,7 @@ void QWidgetPrivate::show_sys()
     QWidgetWindow *window = windowHandle();
 
     if (q->testAttribute(Qt::WA_DontShowOnScreen)) {
-        invalidateBuffer(q->rect());
+        invalidateBackingStore(q->rect());
         q->setAttribute(Qt::WA_Mapped);
         // add our window the modal window list (native dialogs)
         if (window && q->isWindow()
@@ -8112,7 +8143,7 @@ void QWidgetPrivate::show_sys()
 #ifndef QT_NO_CURSOR
         qt_qpa_set_cursor(q, false); // Needed in case cursor was set before show
 #endif
-        invalidateBuffer(q->rect());
+        invalidateBackingStore(q->rect());
         window->setNativeWindowVisibility(true);
         // Was the window moved by the Window system or QPlatformWindow::initialGeometry() ?
         if (window->isTopLevel()) {
@@ -8226,12 +8257,12 @@ void QWidgetPrivate::hide_sys()
         QWidget *p = q->parentWidget();
         if (p &&p->isVisible()) {
             if (renderToTexture)
-                p->d_func()->invalidateBuffer(q->geometry());
+                p->d_func()->invalidateBackingStore(q->geometry());
             else
-                invalidateBuffer(q->rect());
+                invalidateBackingStore(q->rect());
         }
     } else {
-        invalidateBuffer(q->rect());
+        invalidateBackingStore(q->rect());
     }
 
     if (window)
@@ -8261,49 +8292,57 @@ void QWidgetPrivate::hide_sys()
     \endlist
 */
 
-
 void QWidget::setVisible(bool visible)
 {
-    if (visible) { // show
-        if (testAttribute(Qt::WA_WState_ExplicitShowHide) && !testAttribute(Qt::WA_WState_Hidden))
-            return;
+    if (testAttribute(Qt::WA_WState_ExplicitShowHide) && testAttribute(Qt::WA_WState_Hidden) == !visible)
+        return;
 
-        Q_D(QWidget);
+    // Remember that setVisible was called explicitly
+    setAttribute(Qt::WA_WState_ExplicitShowHide);
+
+    Q_D(QWidget);
+    d->setVisible(visible);
+}
 
+// This method is called from QWidgetWindow in response to QWindow::setVisible,
+// and should match the semantics of QWindow::setVisible. QWidget::setVisible on
+// the other hand keeps track of WA_WState_ExplicitShowHide in addition.
+void QWidgetPrivate::setVisible(bool visible)
+{
+    Q_Q(QWidget);
+    if (visible) { // show
         // Designer uses a trick to make grabWidget work without showing
-        if (!isWindow() && parentWidget() && parentWidget()->isVisible()
-            && !parentWidget()->testAttribute(Qt::WA_WState_Created))
-            parentWidget()->window()->d_func()->createRecursively();
+        if (!q->isWindow() && q->parentWidget() && q->parentWidget()->isVisible()
+            && !q->parentWidget()->testAttribute(Qt::WA_WState_Created))
+            q->parentWidget()->window()->d_func()->createRecursively();
 
         //create toplevels but not children of non-visible parents
-        QWidget *pw = parentWidget();
-        if (!testAttribute(Qt::WA_WState_Created)
-            && (isWindow() || pw->testAttribute(Qt::WA_WState_Created))) {
-            create();
+        QWidget *pw = q->parentWidget();
+        if (!q->testAttribute(Qt::WA_WState_Created)
+            && (q->isWindow() || pw->testAttribute(Qt::WA_WState_Created))) {
+            q->create();
         }
 
-        bool wasResized = testAttribute(Qt::WA_Resized);
-        Qt::WindowStates initialWindowState = windowState();
+        bool wasResized = q->testAttribute(Qt::WA_Resized);
+        Qt::WindowStates initialWindowState = q->windowState();
 
         // polish if necessary
-        ensurePolished();
+        q->ensurePolished();
 
-        // remember that show was called explicitly
-        setAttribute(Qt::WA_WState_ExplicitShowHide);
         // whether we need to inform the parent widget immediately
-        bool needUpdateGeometry = !isWindow() && testAttribute(Qt::WA_WState_Hidden);
+        bool needUpdateGeometry = !q->isWindow() && q->testAttribute(Qt::WA_WState_Hidden);
         // we are no longer hidden
-        setAttribute(Qt::WA_WState_Hidden, false);
+        q->setAttribute(Qt::WA_WState_Hidden, false);
 
         if (needUpdateGeometry)
-            d->updateGeometry_helper(true);
+            updateGeometry_helper(true);
 
         // activate our layout before we and our children become visible
-        if (d->layout)
-            d->layout->activate();
+        if (layout)
+            layout->activate();
 
-        if (!isWindow()) {
-            QWidget *parent = parentWidget();
+        if (!q->isWindow()) {
+            QWidget *parent = q->parentWidget();
             while (parent && parent->isVisible() && parent->d_func()->layout  && !parent->data->in_show) {
                 parent->d_func()->layout->activate();
                 if (parent->isWindow())
@@ -8316,30 +8355,28 @@ void QWidget::setVisible(bool visible)
 
         // adjust size if necessary
         if (!wasResized
-            && (isWindow() || !parentWidget()->d_func()->layout))  {
-            if (isWindow()) {
-                adjustSize();
-                if (windowState() != initialWindowState)
-                    setWindowState(initialWindowState);
+            && (q->isWindow() || !q->parentWidget()->d_func()->layout))  {
+            if (q->isWindow()) {
+                q->adjustSize();
+                if (q->windowState() != initialWindowState)
+                    q->setWindowState(initialWindowState);
             } else {
-                adjustSize();
+                q->adjustSize();
             }
-            setAttribute(Qt::WA_Resized, false);
+            q->setAttribute(Qt::WA_Resized, false);
         }
 
-        setAttribute(Qt::WA_KeyboardFocusChange, false);
+        q->setAttribute(Qt::WA_KeyboardFocusChange, false);
 
-        if (isWindow() || parentWidget()->isVisible()) {
-            d->show_helper();
+        if (q->isWindow() || q->parentWidget()->isVisible()) {
+            show_helper();
 
-            qApp->d_func()->sendSyntheticEnterLeave(this);
+            qApp->d_func()->sendSyntheticEnterLeave(q);
         }
 
         QEvent showToParentEvent(QEvent::ShowToParent);
-        QApplication::sendEvent(this, &showToParentEvent);
+        QApplication::sendEvent(q, &showToParentEvent);
     } else { // hide
-        if (testAttribute(Qt::WA_WState_ExplicitShowHide) && testAttribute(Qt::WA_WState_Hidden))
-            return;
 #if 0 // Used to be included in Qt4 for Q_WS_WIN
         // reset WS_DISABLED style in a Blocked window
         if(isWindow() && testAttribute(Qt::WA_WState_Created)
@@ -8350,33 +8387,30 @@ void QWidget::setVisible(bool visible)
             SetWindowLong(winId(), GWL_STYLE, dwStyle);
         }
 #endif
-        if (QApplicationPrivate::hidden_focus_widget == this)
+        if (QApplicationPrivate::hidden_focus_widget == q)
             QApplicationPrivate::hidden_focus_widget = 0;
 
-        Q_D(QWidget);
-
         // hw: The test on getOpaqueRegion() needs to be more intelligent
         // currently it doesn't work if the widget is hidden (the region will
         // be clipped). The real check should be testing the cached region
         // (and dirty flag) directly.
-        if (!isWindow() && parentWidget()) // && !d->getOpaqueRegion().isEmpty())
-            parentWidget()->d_func()->setDirtyOpaqueRegion();
+        if (!q->isWindow() && q->parentWidget()) // && !d->getOpaqueRegion().isEmpty())
+            q->parentWidget()->d_func()->setDirtyOpaqueRegion();
 
-        setAttribute(Qt::WA_WState_Hidden);
-        setAttribute(Qt::WA_WState_ExplicitShowHide);
-        if (testAttribute(Qt::WA_WState_Created))
-            d->hide_helper();
+        q->setAttribute(Qt::WA_WState_Hidden);
+        if (q->testAttribute(Qt::WA_WState_Created))
+            hide_helper();
 
         // invalidate layout similar to updateGeometry()
-        if (!isWindow() && parentWidget()) {
-            if (parentWidget()->d_func()->layout)
-                parentWidget()->d_func()->layout->invalidate();
-            else if (parentWidget()->isVisible())
-                QApplication::postEvent(parentWidget(), new QEvent(QEvent::LayoutRequest));
+        if (!q->isWindow() && q->parentWidget()) {
+            if (q->parentWidget()->d_func()->layout)
+                q->parentWidget()->d_func()->layout->invalidate();
+            else if (q->parentWidget()->isVisible())
+                QApplication::postEvent(q->parentWidget(), new QEvent(QEvent::LayoutRequest));
         }
 
         QEvent hideToParentEvent(QEvent::HideToParent);
-        QApplication::sendEvent(this, &hideToParentEvent);
+        QApplication::sendEvent(q, &hideToParentEvent);
     }
 }
 
@@ -8782,7 +8816,7 @@ QSize QWidget::minimumSizeHint() const
 /*!
     \fn QWidget *QWidget::parentWidget() const
 
-    Returns the parent of this widget, or 0 if it does not have any
+    Returns the parent of this widget, or \nullptr if it does not have any
     parent widget.
 */
 
@@ -10099,24 +10133,32 @@ void QWidget::hideEvent(QHideEvent *)
     which are passed in the \a message parameter.
 
     In your reimplementation of this function, if you want to stop the
-    event being handled by Qt, return true and set \a result.
-    If you return false, this native event is passed back to Qt,
-    which translates the event into a Qt event and sends it to the widget.
+    event being handled by Qt, return true and set \a result. The \a result
+    parameter has meaning only on Windows. If you return false, this native
+    event is passed back to Qt, which translates the event into a Qt event
+    and sends it to the widget.
 
-    \note Events are only delivered to this event handler if the widget is
-    has a native Window handle.
+    \note Events are only delivered to this event handler if the widget
+    has a native window handle.
 
     \note This function superseedes the event filter functions
     x11Event(), winEvent() and macEvent() of Qt 4.
 
+    \sa QAbstractNativeEventFilter
+
     \table
     \header \li Platform \li Event Type Identifier \li Message Type \li Result Type
     \row \li Windows \li "windows_generic_MSG" \li MSG * \li LRESULT
     \row \li macOS \li "NSEvent" \li NSEvent * \li
+    \row \li XCB \li "xcb_generic_event_t" \li xcb_generic_event_t * \li
     \endtable
 */
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QWidget::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
+#else
 bool QWidget::nativeEvent(const QByteArray &eventType, void *message, long *result)
+#endif
 {
     Q_UNUSED(eventType);
     Q_UNUSED(message);
@@ -10188,7 +10230,7 @@ QRegion QWidget::mask() const
 }
 
 /*!
-    Returns the layout manager that is installed on this widget, or 0
+    Returns the layout manager that is installed on this widget, or \nullptr
     if no layout manager is installed.
 
     The layout manager sets the geometry of the widget's children
@@ -10387,7 +10429,7 @@ bool QWidget::hasHeightForWidth() const
 
     Returns the visible child widget at the position (\a{x}, \a{y})
     in the widget's coordinate system. If there is no visible child
-    widget at the specified position, the function returns 0.
+    widget at the specified position, the function returns \nullptr.
 */
 
 /*!
@@ -11036,11 +11078,8 @@ void QWidgetPrivate::repaint(T r)
         return;
 
     QTLWExtra *tlwExtra = q->window()->d_func()->maybeTopData();
-    if (tlwExtra && !tlwExtra->inTopLevelResize && tlwExtra->backingStore) {
-        tlwExtra->inRepaint = true;
+    if (tlwExtra && !tlwExtra->inTopLevelResize && tlwExtra->backingStore)
         tlwExtra->backingStoreTracker->markDirty(r, q, QWidgetBackingStore::UpdateNow);
-        tlwExtra->inRepaint = false;
-    }
 }
 
 /*!
@@ -11206,7 +11245,6 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
         break;
     }
     case Qt::WA_DropSiteRegistered:  {
-        d->registerDropSite(on);
         for (int i = 0; i < d->children.size(); ++i) {
             QWidget *w = qobject_cast<QWidget *>(d->children.at(i));
             if (w && !w->isWindow() && !w->testAttribute(Qt::WA_AcceptDrops) && w->testAttribute(Qt::WA_DropSiteRegistered) != on)
@@ -11864,7 +11902,7 @@ void QWidget::raise()
 
         QRegion region(rect());
         d->subtractOpaqueSiblings(region);
-        d->invalidateBuffer(region);
+        d->invalidateBackingStore(region);
     }
     if (testAttribute(Qt::WA_WState_Created))
         d->raise_sys();
@@ -11884,7 +11922,7 @@ void QWidgetPrivate::raise_sys()
     } else if (renderToTexture) {
         if (QWidget *p = q->parentWidget()) {
             setDirtyOpaqueRegion();
-            p->d_func()->invalidateBuffer(effectiveRectFor(q->geometry()));
+            p->d_func()->invalidateBackingStore(effectiveRectFor(q->geometry()));
         }
     }
 }
@@ -11934,7 +11972,7 @@ void QWidgetPrivate::lower_sys()
         q->windowHandle()->lower();
     } else if (QWidget *p = q->parentWidget()) {
         setDirtyOpaqueRegion();
-        p->d_func()->invalidateBuffer(effectiveRectFor(q->geometry()));
+        p->d_func()->invalidateBackingStore(effectiveRectFor(q->geometry()));
     }
 }
 
@@ -11978,7 +12016,7 @@ void QWidgetPrivate::stackUnder_sys(QWidget*)
     Q_Q(QWidget);
     if (QWidget *p = q->parentWidget()) {
         setDirtyOpaqueRegion();
-        p->d_func()->invalidateBuffer(effectiveRectFor(q->geometry()));
+        p->d_func()->invalidateBackingStore(effectiveRectFor(q->geometry()));
     }
 }
 
@@ -12080,14 +12118,14 @@ bool QWidgetPrivate::navigateToDirection(Direction direction)
     Searches for a widget that is positioned in the \a direction, starting
     from the current focusWidget.
 
-    Returns the pointer to a found widget or 0, if there was no widget in
-    that direction.
+    Returns the pointer to a found widget or \nullptr, if there was no widget
+    in that direction.
 */
 QWidget *QWidgetPrivate::widgetInNavigationDirection(Direction direction)
 {
     const QWidget *sourceWidget = QApplication::focusWidget();
     if (!sourceWidget)
-        return 0;
+        return nullptr;
     const QRect sourceRect = sourceWidget->rect().translated(sourceWidget->mapToGlobal(QPoint()));
     const int sourceX =
             (direction == DirectionNorth || direction == DirectionSouth) ?
@@ -12101,7 +12139,7 @@ QWidget *QWidgetPrivate::widgetInNavigationDirection(Direction direction)
     const QPoint sourceCenter = sourceRect.center();
     const QWidget *sourceWindow = sourceWidget->window();
 
-    QWidget *targetWidget = 0;
+    QWidget *targetWidget = nullptr;
     int shortestDistance = INT_MAX;
 
     const auto targetCandidates = QApplication::allWidgets();
@@ -12355,7 +12393,7 @@ Q_WIDGETS_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget)
    \since 4.5
 
    Returns the proxy widget for the corresponding embedded widget in a graphics
-   view; otherwise returns 0.
+   view; otherwise returns \nullptr.
 
    \sa QGraphicsProxyWidget::createProxyForChildWidget(),
        QGraphicsScene::addWidget()
@@ -12420,7 +12458,7 @@ void QWidget::destroy(bool destroyWindow, bool destroySubWindows)
 
     d->aboutToDestroy();
     if (!isWindow() && parentWidget())
-        parentWidget()->d_func()->invalidateBuffer(d->effectiveRectFor(geometry()));
+        parentWidget()->d_func()->invalidateBackingStore(d->effectiveRectFor(geometry()));
     d->deactivateWidgetCleanup();
 
     if ((windowType() == Qt::Popup) && qApp)
@@ -12768,7 +12806,7 @@ void QWidget::releaseKeyboard()
     Returns the widget that is currently grabbing the mouse input.
 
     If no widget in this application is currently grabbing the mouse,
-    0 is returned.
+    \nullptr is returned.
 
     \sa grabMouse(), keyboardGrabber()
 */
@@ -12785,7 +12823,7 @@ QWidget *QWidget::mouseGrabber()
     Returns the widget that is currently grabbing the keyboard input.
 
     If no widget in this application is currently grabbing the
-    keyboard, 0 is returned.
+    keyboard, \nullptr is returned.
 
     \sa grabMouse(), mouseGrabber()
 */
diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h
index 4e5ef5a111..aec3eee639 100644
--- a/src/widgets/kernel/qwidget.h
+++ b/src/widgets/kernel/qwidget.h
@@ -648,7 +648,12 @@ protected:
 
     virtual void showEvent(QShowEvent *event);
     virtual void hideEvent(QHideEvent *event);
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    virtual bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result);
+#else
     virtual bool nativeEvent(const QByteArray &eventType, void *message, long *result);
+#endif
 
     // Misc. protected functions
     virtual void changeEvent(QEvent *);
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h
index c8eaabf8e2..90c4c2a945 100644
--- a/src/widgets/kernel/qwidget_p.h
+++ b/src/widgets/kernel/qwidget_p.h
@@ -146,11 +146,11 @@ public:
 
     inline operator bool() const
     {
-        return (0 != m_ptr);
+        return (nullptr != m_ptr);
     }
 
 private:
-    Q_DISABLE_COPY(QWidgetBackingStoreTracker)
+    Q_DISABLE_COPY_MOVE(QWidgetBackingStoreTracker)
 
 private:
     QWidgetBackingStore* m_ptr;
@@ -190,7 +190,6 @@ struct QTLWExtra {
     uint posIncludesFrame : 1;
     uint sizeAdjusted : 1;
     uint inTopLevelResize : 1;
-    uint inRepaint : 1;
     uint embedded : 1;
 
     // *************************** Platform specific values (bit fields first) **********
@@ -356,6 +355,8 @@ public:
     void createRecursively();
     void createWinId();
 
+    void setScreenForPoint(const QPoint &pos);
+
     void createTLExtra();
     void createExtra();
     void deleteExtra();
@@ -382,10 +383,11 @@ public:
 
     void updateFont(const QFont &);
     inline void setFont_helper(const QFont &font) {
-        if (data.fnt.resolve() == font.resolve() && data.fnt == font)
+        if (directFontResolveMask == font.resolve() && data.fnt == font)
             return;
         updateFont(font);
     }
+    QFont localFont() const;
     void resolveFont();
     QFont naturalWidgetFont(uint inheritedMask) const;
 
@@ -409,7 +411,7 @@ public:
     void render(QPaintDevice *target, const QPoint &targetOffset, const QRegion &sourceRegion,
                 QWidget::RenderFlags renderFlags);
     void drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QPoint &offset, int flags,
-                    QPainter *sharedPainter = 0, QWidgetBackingStore *backingStore = 0);
+                    QPainter *sharedPainter = nullptr, QWidgetBackingStore *backingStore = nullptr);
     void sendPaintEvent(const QRegion &toBePainted);
 
 
@@ -426,7 +428,7 @@ public:
     QRegion clipRegion() const;
     void setSystemClip(QPaintEngine *paintEngine, qreal devicePixelRatio, const QRegion &region);
     void subtractOpaqueChildren(QRegion &rgn, const QRect &clipRect) const;
-    void subtractOpaqueSiblings(QRegion &source, bool *hasDirtySiblingsAbove = 0,
+    void subtractOpaqueSiblings(QRegion &source, bool *hasDirtySiblingsAbove = nullptr,
                                 bool alsoNonOpaque = false) const;
     void clipToEffectiveMask(QRegion &region) const;
     void updateIsOpaque();
@@ -450,10 +452,11 @@ public:
     void scrollChildren(int dx, int dy);
     void moveRect(const QRect &, int dx, int dy);
     void scrollRect(const QRect &, int dx, int dy);
-    void invalidateBuffer_resizeHelper(const QPoint &oldPos, const QSize &oldSize);
-    // ### Qt 4.6: Merge into a template function (after MSVC isn't supported anymore).
-    void invalidateBuffer(const QRegion &);
-    void invalidateBuffer(const QRect &);
+    void invalidateBackingStore_resizeHelper(const QPoint &oldPos, const QSize &oldSize);
+
+    template <class T>
+    void invalidateBackingStore(const T &);
+
     QRegion overlappedRegion(const QRect &rect, bool breakAfterFirst = false) const;
     void syncBackingStore();
     void syncBackingStore(const QRegion &region);
@@ -482,9 +485,9 @@ public:
     void hide_sys();
     void hide_helper();
     void _q_showIfNotHidden();
+    void setVisible(bool);
 
     void setEnabled_helper(bool);
-    void registerDropSite(bool);
     static void adjustFlags(Qt::WindowFlags &flags, QWidget *w = 0);
 
     void updateFrameStrut();
@@ -522,7 +525,7 @@ public:
 
     void getLayoutItemMargins(int *left, int *top, int *right, int *bottom) const;
     void setLayoutItemMargins(int left, int top, int right, int bottom);
-    void setLayoutItemMargins(QStyle::SubElement element, const QStyleOption *opt = 0);
+    void setLayoutItemMargins(QStyle::SubElement element, const QStyleOption *opt = nullptr);
 
     void updateContentsRect();
     QMargins safeAreaMargins() const;
@@ -552,7 +555,7 @@ public:
         QGraphicsProxyWidget *ancestorProxy = widget->d_func()->nearestGraphicsProxyWidget(widget);
         //It's embedded if it has an ancestor
         if (ancestorProxy) {
-            if (!bypassGraphicsProxyWidget(widget) && ancestorProxy->scene() != 0) {
+            if (!bypassGraphicsProxyWidget(widget) && ancestorProxy->scene() != nullptr) {
                 // One view, let be smart and return the viewport rect then the popup is aligned
                 if (ancestorProxy->scene()->views().size() == 1) {
                     QGraphicsView *view = ancestorProxy->scene()->views().at(0);
@@ -583,7 +586,7 @@ public:
     }
 
     inline void restoreRedirected()
-    { redirectDev = 0; }
+    { redirectDev = nullptr; }
 
     inline void enforceNativeChildren()
     {
@@ -605,6 +608,11 @@ public:
         return extra ? extra->nativeChildrenForced : false;
     }
 
+    inline QRect effectiveRectFor(const QRegion &region) const
+    {
+        return effectiveRectFor(region.boundingRect());
+    }
+
     inline QRect effectiveRectFor(const QRect &rect) const
     {
 #if QT_CONFIG(graphicseffect)
@@ -644,7 +652,7 @@ public:
 
     QOpenGLContext *shareContext() const;
 
-    virtual QObject *focusObject() { return 0; }
+    virtual QObject *focusObject() { return nullptr; }
 
 #ifndef QT_NO_OPENGL
     virtual GLuint textureId() const { return 0; }
@@ -652,7 +660,7 @@ public:
         Q_Q(QWidget);
         return q->testAttribute(Qt::WA_AlwaysStackOnTop)
             ? QPlatformTextureList::StacksOnTop
-            : QPlatformTextureList::Flags(0);
+            : QPlatformTextureList::Flags(nullptr);
     }
     virtual QImage grabFramebuffer() { return QImage(); }
     virtual void beginBackingStorePainting() { }
@@ -730,6 +738,7 @@ public:
 #endif
 
     // Other variables.
+    uint directFontResolveMask;
     uint inheritedFontResolveMask;
     uint inheritedPaletteResolveMask;
     short leftmargin;
@@ -895,7 +904,7 @@ struct QWidgetPaintContext
 {
     inline QWidgetPaintContext(QPaintDevice *d, const QRegion &r, const QPoint &o, int f,
                                QPainter *p, QWidgetBackingStore *b)
-        : pdev(d), rgn(r), offset(o), flags(f), sharedPainter(p), backingStore(b), painter(0) {}
+        : pdev(d), rgn(r), offset(o), flags(f), sharedPainter(p), backingStore(b), painter(nullptr) {}
 
     QPaintDevice *pdev;
     QRegion rgn;
@@ -911,14 +920,14 @@ class QWidgetEffectSourcePrivate : public QGraphicsEffectSourcePrivate
 {
 public:
     QWidgetEffectSourcePrivate(QWidget *widget)
-        : QGraphicsEffectSourcePrivate(), m_widget(widget), context(0), updateDueToGraphicsEffect(false)
+        : QGraphicsEffectSourcePrivate(), m_widget(widget), context(nullptr), updateDueToGraphicsEffect(false)
     {}
 
     void detach() override
-    { m_widget->d_func()->graphicsEffect = 0; }
+    { m_widget->d_func()->graphicsEffect = nullptr; }
 
     const QGraphicsItem *graphicsItem() const override
-    { return 0; }
+    { return nullptr; }
 
     const QWidget *widget() const override
     { return m_widget; }
@@ -944,7 +953,7 @@ public:
     }
 
     const QStyleOption *styleOption() const override
-    { return 0; }
+    { return nullptr; }
 
     QRect deviceRect() const override
     { return m_widget->window()->rect(); }
@@ -974,14 +983,14 @@ inline QTLWExtra *QWidgetPrivate::topData() const
 
 inline QTLWExtra *QWidgetPrivate::maybeTopData() const
 {
-    return extra ? extra->topextra : 0;
+    return extra ? extra->topextra : nullptr;
 }
 
 inline QPainter *QWidgetPrivate::sharedPainter() const
 {
     Q_Q(const QWidget);
     QTLWExtra *x = q->window()->d_func()->maybeTopData();
-    return x ? x->sharedPainter : 0;
+    return x ? x->sharedPainter : nullptr;
 }
 
 inline void QWidgetPrivate::setSharedPainter(QPainter *painter)
@@ -1002,7 +1011,7 @@ inline QWidgetBackingStore *QWidgetPrivate::maybeBackingStore() const
 {
     Q_Q(const QWidget);
     QTLWExtra *x = q->window()->d_func()->maybeTopData();
-    return x ? x->backingStoreTracker.data() : 0;
+    return x ? x->backingStoreTracker.data() : nullptr;
 }
 
 inline QWidgetWindow *QWidgetPrivate::windowHandle() const
diff --git a/src/widgets/kernel/qwidgetbackingstore.cpp b/src/widgets/kernel/qwidgetbackingstore.cpp
index 53769ef9ed..595beeaf47 100644
--- a/src/widgets/kernel/qwidgetbackingstore.cpp
+++ b/src/widgets/kernel/qwidgetbackingstore.cpp
@@ -101,6 +101,13 @@ void QWidgetBackingStore::qt_flush(QWidget *widget, const QRegion &region, QBack
 
     if (tlw->testAttribute(Qt::WA_DontShowOnScreen) || widget->testAttribute(Qt::WA_DontShowOnScreen))
         return;
+
+    // Foreign Windows do not have backing store content and must not be flushed
+    if (QWindow *widgetWindow = widget->windowHandle()) {
+        if (widgetWindow->type() == Qt::ForeignWindow)
+            return;
+    }
+
     static bool fpsDebug = qEnvironmentVariableIntValue("QT_DEBUG_FPS");
     if (fpsDebug) {
         if (!widgetBackingStore->perfFrames++)
@@ -303,12 +310,6 @@ bool QWidgetBackingStore::bltRect(const QRect &rect, int dx, int dy, QWidget *wi
     return store->scroll(tlwRect, dx, dy);
 }
 
-void QWidgetBackingStore::releaseBuffer()
-{
-    if (store)
-        store->resize(QSize());
-}
-
 /*!
     Prepares the window surface to paint a\ toClean region of the \a widget and
     updates the BeginPaintInfo struct accordingly.
@@ -500,6 +501,9 @@ void QWidgetBackingStore::sendUpdateRequest(QWidget *widget, UpdateTime updateTi
     }
 }
 
+static inline QRect widgetRectFor(QWidget *, const QRect &r) { return r; }
+static inline QRect widgetRectFor(QWidget *widget, const QRegion &) { return widget->rect(); }
+
 /*!
     Marks the region of the widget as dirty (if not already marked as dirty) and
     posts an UpdateRequest event to the top-level widget (if not already posted).
@@ -510,42 +514,44 @@ void QWidgetBackingStore::sendUpdateRequest(QWidget *widget, UpdateTime updateTi
 
     If the widget paints directly on screen, the event is sent to the widget
     instead of the top-level widget, and bufferState is completely ignored.
-
-    ### Qt 4.6: Merge into a template function (after MSVC isn't supported anymore).
 */
-void QWidgetBackingStore::markDirty(const QRegion &rgn, QWidget *widget,
-                                    UpdateTime updateTime, BufferState bufferState)
+template <class T>
+void QWidgetBackingStore::markDirty(const T &r, QWidget *widget, UpdateTime updateTime, BufferState bufferState)
 {
     Q_ASSERT(tlw->d_func()->extra);
     Q_ASSERT(tlw->d_func()->extra->topextra);
     Q_ASSERT(!tlw->d_func()->extra->topextra->inTopLevelResize);
     Q_ASSERT(widget->isVisible() && widget->updatesEnabled());
     Q_ASSERT(widget->window() == tlw);
-    Q_ASSERT(!rgn.isEmpty());
+    Q_ASSERT(!r.isEmpty());
 
 #if QT_CONFIG(graphicseffect)
     widget->d_func()->invalidateGraphicsEffectsRecursively();
-#endif // QT_CONFIG(graphicseffect)
+#endif
+
+    QRect widgetRect = widgetRectFor(widget, r);
+
+    // ---------------------------------------------------------------------------
 
     if (widget->d_func()->paintOnScreen()) {
         if (widget->d_func()->dirty.isEmpty()) {
-            widget->d_func()->dirty = rgn;
+            widget->d_func()->dirty = r;
             sendUpdateRequest(widget, updateTime);
             return;
-        } else if (qt_region_strictContains(widget->d_func()->dirty, widget->rect())) {
+        } else if (qt_region_strictContains(widget->d_func()->dirty, widgetRect)) {
             if (updateTime == UpdateNow)
                 sendUpdateRequest(widget, updateTime);
-            return; // Already dirty.
+            return; // Already dirty
         }
 
         const bool eventAlreadyPosted = !widget->d_func()->dirty.isEmpty();
-        widget->d_func()->dirty += rgn;
+        widget->d_func()->dirty += r;
         if (!eventAlreadyPosted || updateTime == UpdateNow)
             sendUpdateRequest(widget, updateTime);
         return;
     }
 
-    const QPoint offset = widget->mapTo(tlw, QPoint());
+    // ---------------------------------------------------------------------------
 
     if (QWidgetPrivate::get(widget)->renderToTexture) {
         if (!widget->d_func()->inDirtyList)
@@ -555,133 +561,67 @@ void QWidgetBackingStore::markDirty(const QRegion &rgn, QWidget *widget,
         return;
     }
 
-    const QRect widgetRect = widget->d_func()->effectiveRectFor(widget->rect());
-    if (qt_region_strictContains(dirty, widgetRect.translated(offset))) {
+    // ---------------------------------------------------------------------------
+
+    QRect effectiveWidgetRect = widget->d_func()->effectiveRectFor(widgetRect);
+    const QPoint offset = widget->mapTo(tlw, QPoint());
+    QRect translatedRect = effectiveWidgetRect.translated(offset);
+#if QT_CONFIG(graphicseffect)
+    // Graphics effects may exceed window size, clamp
+    translatedRect = translatedRect.intersected(QRect(QPoint(), tlw->size()));
+#endif
+    if (qt_region_strictContains(dirty, translatedRect)) {
         if (updateTime == UpdateNow)
             sendUpdateRequest(tlw, updateTime);
-        return; // Already dirty.
+        return; // Already dirty
     }
 
+    // ---------------------------------------------------------------------------
+
     if (bufferState == BufferInvalid) {
         const bool eventAlreadyPosted = !dirty.isEmpty() || updateRequestSent;
 #if QT_CONFIG(graphicseffect)
         if (widget->d_func()->graphicsEffect)
-            dirty += widget->d_func()->effectiveRectFor(rgn.boundingRect()).translated(offset);
+            dirty += widget->d_func()->effectiveRectFor(r).translated(offset);
         else
-#endif // QT_CONFIG(graphicseffect)
-            dirty += rgn.translated(offset);
+#endif
+            dirty += r.translated(offset);
+
         if (!eventAlreadyPosted || updateTime == UpdateNow)
             sendUpdateRequest(tlw, updateTime);
         return;
     }
 
+    // ---------------------------------------------------------------------------
+
     if (dirtyWidgets.isEmpty()) {
-        addDirtyWidget(widget, rgn);
+        addDirtyWidget(widget, r);
         sendUpdateRequest(tlw, updateTime);
         return;
     }
 
+    // ---------------------------------------------------------------------------
+
     if (widget->d_func()->inDirtyList) {
-        if (!qt_region_strictContains(widget->d_func()->dirty, widgetRect)) {
+        if (!qt_region_strictContains(widget->d_func()->dirty, effectiveWidgetRect)) {
 #if QT_CONFIG(graphicseffect)
             if (widget->d_func()->graphicsEffect)
-                widget->d_func()->dirty += widget->d_func()->effectiveRectFor(rgn.boundingRect());
+                widget->d_func()->dirty += widget->d_func()->effectiveRectFor(r);
             else
-#endif // QT_CONFIG(graphicseffect)
-                widget->d_func()->dirty += rgn;
+#endif
+                widget->d_func()->dirty += r;
         }
     } else {
-        addDirtyWidget(widget, rgn);
-    }
-
-    if (updateTime == UpdateNow)
-        sendUpdateRequest(tlw, updateTime);
-}
-
-/*!
-    This function is equivalent to calling markDirty(QRegion(rect), ...), but
-    is more efficient as it eliminates QRegion operations/allocations and can
-    use the rect more precisely for additional cut-offs.
-
-    ### Qt 4.6: Merge into a template function (after MSVC isn't supported anymore).
-*/
-void QWidgetBackingStore::markDirty(const QRect &rect, QWidget *widget,
-                                    UpdateTime updateTime, BufferState bufferState)
-{
-    Q_ASSERT(tlw->d_func()->extra);
-    Q_ASSERT(tlw->d_func()->extra->topextra);
-    Q_ASSERT(!tlw->d_func()->extra->topextra->inTopLevelResize);
-    Q_ASSERT(widget->isVisible() && widget->updatesEnabled());
-    Q_ASSERT(widget->window() == tlw);
-    Q_ASSERT(!rect.isEmpty());
-
-#if QT_CONFIG(graphicseffect)
-    widget->d_func()->invalidateGraphicsEffectsRecursively();
-#endif // QT_CONFIG(graphicseffect)
-
-    if (widget->d_func()->paintOnScreen()) {
-        if (widget->d_func()->dirty.isEmpty()) {
-            widget->d_func()->dirty = QRegion(rect);
-            sendUpdateRequest(widget, updateTime);
-            return;
-        } else if (qt_region_strictContains(widget->d_func()->dirty, rect)) {
-            if (updateTime == UpdateNow)
-                sendUpdateRequest(widget, updateTime);
-            return; // Already dirty.
-        }
-
-        const bool eventAlreadyPosted = !widget->d_func()->dirty.isEmpty();
-        widget->d_func()->dirty += rect;
-        if (!eventAlreadyPosted || updateTime == UpdateNow)
-            sendUpdateRequest(widget, updateTime);
-        return;
-    }
-
-    if (QWidgetPrivate::get(widget)->renderToTexture) {
-        if (!widget->d_func()->inDirtyList)
-            addDirtyRenderToTextureWidget(widget);
-        if (!updateRequestSent || updateTime == UpdateNow)
-            sendUpdateRequest(tlw, updateTime);
-        return;
-    }
-
-
-    const QRect widgetRect = widget->d_func()->effectiveRectFor(rect);
-    QRect translatedRect = widgetRect;
-    if (widget != tlw)
-        translatedRect.translate(widget->mapTo(tlw, QPoint()));
-    // Graphics effects may exceed window size, clamp.
-    translatedRect = translatedRect.intersected(QRect(QPoint(), tlw->size()));
-    if (qt_region_strictContains(dirty, translatedRect)) {
-        if (updateTime == UpdateNow)
-            sendUpdateRequest(tlw, updateTime);
-        return; // Already dirty
-    }
-
-    if (bufferState == BufferInvalid) {
-        const bool eventAlreadyPosted = !dirty.isEmpty();
-        dirty += translatedRect;
-        if (!eventAlreadyPosted || updateTime == UpdateNow)
-            sendUpdateRequest(tlw, updateTime);
-        return;
-    }
-
-    if (dirtyWidgets.isEmpty()) {
-        addDirtyWidget(widget, rect);
-        sendUpdateRequest(tlw, updateTime);
-        return;
+        addDirtyWidget(widget, r);
     }
 
-    if (widget->d_func()->inDirtyList) {
-        if (!qt_region_strictContains(widget->d_func()->dirty, widgetRect))
-            widget->d_func()->dirty += widgetRect;
-    } else {
-        addDirtyWidget(widget, rect);
-    }
+    // ---------------------------------------------------------------------------
 
     if (updateTime == UpdateNow)
         sendUpdateRequest(tlw, updateTime);
 }
+template void QWidgetBackingStore::markDirty<QRect>(const QRect &, QWidget *, UpdateTime, BufferState);
+template void QWidgetBackingStore::markDirty<QRegion>(const QRegion &, QWidget *, UpdateTime, BufferState);
 
 /*!
     Marks the \a region of the \a widget as dirty on screen. The \a region will be copied from
@@ -852,11 +792,11 @@ void QWidgetPrivate::moveRect(const QRect &rect, int dx, int dy)
         if (!extra || !extra->hasMask) {
             parentR -= newRect;
         } else {
-            // invalidateBuffer() excludes anything outside the mask
+            // invalidateBackingStore() excludes anything outside the mask
             parentR += newRect & clipR;
         }
-        pd->invalidateBuffer(parentR);
-        invalidateBuffer((newRect & clipR).translated(-data.crect.topLeft()));
+        pd->invalidateBackingStore(parentR);
+        invalidateBackingStore((newRect & clipR).translated(-data.crect.topLeft()));
     } else {
 
         QWidgetBackingStore *wbs = x->backingStoreTracker.data();
@@ -887,7 +827,7 @@ void QWidgetPrivate::moveRect(const QRect &rect, int dx, int dy)
         if (childUpdatesEnabled) {
             if (!overlappedExpose.isEmpty()) {
                 overlappedExpose.translate(-data.crect.topLeft());
-                invalidateBuffer(overlappedExpose);
+                invalidateBackingStore(overlappedExpose);
             }
             if (!childExpose.isEmpty()) {
                 childExpose.translate(-data.crect.topLeft());
@@ -937,9 +877,9 @@ void QWidgetPrivate::scrollRect(const QRect &rect, int dx, int dy)
         if (!overlappedRegion(scrollRect.translated(data.crect.topLeft()), true).isEmpty()) {
             QRegion region(scrollRect);
             subtractOpaqueSiblings(region);
-            invalidateBuffer(region);
+            invalidateBackingStore(region);
         }else {
-            invalidateBuffer(scrollRect);
+            invalidateBackingStore(scrollRect);
         }
     } else {
         const QPoint toplevelOffset = q->mapTo(tlw, QPoint());
@@ -980,7 +920,7 @@ void QWidgetPrivate::scrollRect(const QRect &rect, int dx, int dy)
             return;
 
         if (!overlappedExpose.isEmpty())
-            invalidateBuffer(overlappedExpose);
+            invalidateBackingStore(overlappedExpose);
         if (!childExpose.isEmpty()) {
             wbs->markDirty(childExpose, q);
             isScrolled = true;
@@ -1053,20 +993,8 @@ static QPlatformTextureList *widgetTexturesFor(QWidget *tlw, QWidget *widget)
         static bool switchableWidgetComposition =
             QGuiApplicationPrivate::instance()->platformIntegration()
                 ->hasCapability(QPlatformIntegration::SwitchableWidgetComposition);
-        if (!switchableWidgetComposition
-// The Windows compositor handles fullscreen OpenGL window specially. Besides
-// having trouble with popups, it also has issues with flip-flopping between
-// OpenGL-based and normal flushing. Therefore, stick with GL for fullscreen
-// windows (QTBUG-53515). Similary, translucent windows should not switch to
-// layered native windows (QTBUG-54734).
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) && !defined(Q_OS_WINCE)
-                || tlw->windowState().testFlag(Qt::WindowFullScreen)
-                || tlw->testAttribute(Qt::WA_TranslucentBackground)
-#endif
-                )
-        {
+        if (!switchableWidgetComposition)
             return qt_dummy_platformTextureList();
-        }
     }
 
     return 0;
@@ -1476,26 +1404,11 @@ void QWidgetBackingStore::flush(QWidget *widget)
     dirtyOnScreenWidgets->clear();
 }
 
-static inline bool discardInvalidateBufferRequest(QWidget *widget, QTLWExtra *tlwExtra)
-{
-    Q_ASSERT(widget);
-    if (QApplication::closingDown())
-        return true;
-
-    if (!tlwExtra || tlwExtra->inTopLevelResize || !tlwExtra->backingStore)
-        return true;
-
-    if (!widget->isVisible() || !widget->updatesEnabled())
-        return true;
-
-    return false;
-}
-
 /*!
-    Invalidates the buffer when the widget is resized.
+    Invalidates the backing store when the widget is resized.
     Static areas are never invalidated unless absolutely needed.
 */
-void QWidgetPrivate::invalidateBuffer_resizeHelper(const QPoint &oldPos, const QSize &oldSize)
+void QWidgetPrivate::invalidateBackingStore_resizeHelper(const QPoint &oldPos, const QSize &oldSize)
 {
     Q_Q(QWidget);
     Q_ASSERT(!q->isWindow());
@@ -1520,10 +1433,10 @@ void QWidgetPrivate::invalidateBuffer_resizeHelper(const QPoint &oldPos, const Q
         if (hasStaticChildren) {
             QRegion dirty(newWidgetRect);
             dirty -= staticChildren;
-            invalidateBuffer(dirty);
+            invalidateBackingStore(dirty);
         } else {
             // Entire widget needs repaint.
-            invalidateBuffer(newWidgetRect);
+            invalidateBackingStore(newWidgetRect);
         }
 
         if (!parentAreaExposed)
@@ -1535,14 +1448,14 @@ void QWidgetPrivate::invalidateBuffer_resizeHelper(const QPoint &oldPos, const Q
             parentExpose &= QRect(oldPos, oldSize);
             if (hasStaticChildren)
                 parentExpose -= data.crect; // Offset is unchanged, safe to do this.
-            q->parentWidget()->d_func()->invalidateBuffer(parentExpose);
+            q->parentWidget()->d_func()->invalidateBackingStore(parentExpose);
         } else {
             if (hasStaticChildren && !graphicsEffect) {
                 QRegion parentExpose(QRect(oldPos, oldSize));
                 parentExpose -= data.crect; // Offset is unchanged, safe to do this.
-                q->parentWidget()->d_func()->invalidateBuffer(parentExpose);
+                q->parentWidget()->d_func()->invalidateBackingStore(parentExpose);
             } else {
-                q->parentWidget()->d_func()->invalidateBuffer(effectiveRectFor(QRect(oldPos, oldSize)));
+                q->parentWidget()->d_func()->invalidateBackingStore(effectiveRectFor(QRect(oldPos, oldSize)));
             }
         }
         return;
@@ -1563,7 +1476,7 @@ void QWidgetPrivate::invalidateBuffer_resizeHelper(const QPoint &oldPos, const Q
     if (!sizeDecreased || !oldWidgetRect.contains(newWidgetRect)) {
         QRegion newVisible(newWidgetRect);
         newVisible -= oldWidgetRect;
-        invalidateBuffer(newVisible);
+        invalidateBackingStore(newVisible);
     }
 
     if (!parentAreaExposed)
@@ -1575,74 +1488,56 @@ void QWidgetPrivate::invalidateBuffer_resizeHelper(const QPoint &oldPos, const Q
         QRegion parentExpose(oldRect);
         parentExpose &= extra->mask.translated(oldPos);
         parentExpose -= (extra->mask.translated(data.crect.topLeft()) & data.crect);
-        q->parentWidget()->d_func()->invalidateBuffer(parentExpose);
+        q->parentWidget()->d_func()->invalidateBackingStore(parentExpose);
     } else {
         QRegion parentExpose(oldRect);
         parentExpose -= data.crect;
-        q->parentWidget()->d_func()->invalidateBuffer(parentExpose);
+        q->parentWidget()->d_func()->invalidateBackingStore(parentExpose);
     }
 }
 
 /*!
-    Invalidates the \a rgn (in widget's coordinates) of the backing store, i.e.
-    all widgets intersecting with the region will be repainted when the backing store
-    is synced.
-
-    ### Qt 4.6: Merge into a template function (after MSVC isn't supported anymore).
+    Invalidates the \a r (in widget's coordinates) of the backing store, i.e.
+    all widgets intersecting with the region will be repainted when the backing
+    store is synced.
 */
-void QWidgetPrivate::invalidateBuffer(const QRegion &rgn)
+template <class T>
+void QWidgetPrivate::invalidateBackingStore(const T &r)
 {
-    Q_Q(QWidget);
-
-    QTLWExtra *tlwExtra = q->window()->d_func()->maybeTopData();
-    if (discardInvalidateBufferRequest(q, tlwExtra) || rgn.isEmpty())
+    if (r.isEmpty())
         return;
 
-    QRegion wrgn(rgn);
-    wrgn &= clipRect();
-    if (!graphicsEffect && extra && extra->hasMask)
-        wrgn &= extra->mask;
-    if (wrgn.isEmpty())
+    if (QApplication::closingDown())
         return;
 
-    tlwExtra->backingStoreTracker->markDirty(wrgn, q,
-            QWidgetBackingStore::UpdateLater, QWidgetBackingStore::BufferInvalid);
-}
-
-/*!
-    This function is equivalent to calling invalidateBuffer(QRegion(rect), ...), but
-    is more efficient as it eliminates QRegion operations/allocations and can
-    use the rect more precisely for additional cut-offs.
-
-    ### Qt 4.6: Merge into a template function (after MSVC isn't supported anymore).
-*/
-void QWidgetPrivate::invalidateBuffer(const QRect &rect)
-{
     Q_Q(QWidget);
-
-    QTLWExtra *tlwExtra = q->window()->d_func()->maybeTopData();
-    if (discardInvalidateBufferRequest(q, tlwExtra) || rect.isEmpty())
+    if (!q->isVisible() || !q->updatesEnabled())
         return;
 
-    QRect wRect(rect);
-    wRect &= clipRect();
-    if (wRect.isEmpty())
+    QTLWExtra *tlwExtra = q->window()->d_func()->maybeTopData();
+    if (!tlwExtra || tlwExtra->inTopLevelResize || !tlwExtra->backingStore)
         return;
 
-    if (graphicsEffect || !extra || !extra->hasMask) {
-        tlwExtra->backingStoreTracker->markDirty(wRect, q,
-                QWidgetBackingStore::UpdateLater, QWidgetBackingStore::BufferInvalid);
+    T clipped(r);
+    clipped &= clipRect();
+    if (clipped.isEmpty())
         return;
-    }
 
-    QRegion wRgn(extra->mask);
-    wRgn &= wRect;
-    if (wRgn.isEmpty())
-        return;
+    if (!graphicsEffect && extra && extra->hasMask) {
+        QRegion masked(extra->mask);
+        masked &= clipped;
+        if (masked.isEmpty())
+            return;
 
-    tlwExtra->backingStoreTracker->markDirty(wRgn, q,
+        tlwExtra->backingStoreTracker->markDirty(masked, q,
             QWidgetBackingStore::UpdateLater, QWidgetBackingStore::BufferInvalid);
+    } else {
+        tlwExtra->backingStoreTracker->markDirty(clipped, q,
+            QWidgetBackingStore::UpdateLater, QWidgetBackingStore::BufferInvalid);
+    }
 }
+// Needed by tst_QWidget
+template Q_AUTOTEST_EXPORT void QWidgetPrivate::invalidateBackingStore<QRect>(const QRect &r);
 
 void QWidgetPrivate::repaint_sys(const QRegion &rgn)
 {
diff --git a/src/widgets/kernel/qwidgetbackingstore_p.h b/src/widgets/kernel/qwidgetbackingstore_p.h
index 53ccda850a..9409ba7832 100644
--- a/src/widgets/kernel/qwidgetbackingstore_p.h
+++ b/src/widgets/kernel/qwidgetbackingstore_p.h
@@ -109,7 +109,7 @@ public:
 
     void sync(QWidget *exposedWidget, const QRegion &exposedRegion);
     void sync();
-    void flush(QWidget *widget = 0);
+    void flush(QWidget *widget = nullptr);
 
     QBackingStore *backingStore() const { return store; }
 
@@ -118,10 +118,8 @@ public:
         return !(dirtyWidgets.isEmpty() && dirty.isEmpty() && dirtyRenderToTextureWidgets.isEmpty());
     }
 
-    // ### Qt 4.6: Merge into a template function (after MSVC isn't supported anymore).
-    void markDirty(const QRegion &rgn, QWidget *widget, UpdateTime updateTime = UpdateLater,
-                   BufferState bufferState = BufferValid);
-    void markDirty(const QRect &rect, QWidget *widget, UpdateTime updateTime = UpdateLater,
+    template <class T>
+    void markDirty(const T &r, QWidget *widget, UpdateTime updateTime = UpdateLater,
                    BufferState bufferState = BufferValid);
 
 private:
@@ -151,14 +149,13 @@ private:
 
     void doSync();
     bool bltRect(const QRect &rect, int dx, int dy, QWidget *widget);
-    void releaseBuffer();
 
     void beginPaint(QRegion &toClean, QWidget *widget, QBackingStore *backingStore,
                     BeginPaintInfo *returnInfo, bool toCleanIsInTopLevelCoordinates = true);
     void endPaint(const QRegion &cleaned, QBackingStore *backingStore, BeginPaintInfo *beginPaintInfo);
 
-    QRegion dirtyRegion(QWidget *widget = 0) const;
-    QRegion staticContents(QWidget *widget = 0, const QRect &withinClipRect = QRect()) const;
+    QRegion dirtyRegion(QWidget *widget = nullptr) const;
+    QRegion staticContents(QWidget *widget = nullptr, const QRect &withinClipRect = QRect()) const;
 
     void markDirtyOnScreen(const QRegion &dirtyOnScreen, QWidget *widget, const QPoint &topLevelOffset);
 
@@ -305,7 +302,7 @@ private:
     friend class QWidget;
     friend class QBackingStore;
 
-    Q_DISABLE_COPY(QWidgetBackingStore)
+    Q_DISABLE_COPY_MOVE(QWidgetBackingStore)
 };
 
 QT_END_NAMESPACE
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp
index 7292c795b8..5bcf885dfe 100644
--- a/src/widgets/kernel/qwidgetwindow.cpp
+++ b/src/widgets/kernel/qwidgetwindow.cpp
@@ -73,7 +73,7 @@ public:
     {
         Q_Q(QWidgetWindow);
         if (QWidget *widget = q->widget())
-            widget->setVisible(visible);
+            QWidgetPrivate::get(widget)->setVisible(visible);
         else
             QWindowPrivate::setVisible(visible);
     }
@@ -106,6 +106,7 @@ public:
         if (QWidget *widget = q->widget())
             QWidgetPrivate::get(widget)->updateContentsRect();
     }
+    bool allowClickThrough(const QPoint &) const override;
 };
 
 QRectF QWidgetWindowPrivate::closestAcceptableGeometry(const QRectF &rect) const
@@ -221,6 +222,12 @@ static inline bool shouldBePropagatedToWidget(QEvent *event)
     }
 }
 
+bool QWidgetWindowPrivate::allowClickThrough(const QPoint &globalPos) const
+{
+    QWidget *w = QApplication::widgetAt(globalPos);
+    return w && !w->testAttribute(Qt::WA_MacNoClickThrough);
+}
+
 bool QWidgetWindow::event(QEvent *event)
 {
     if (!m_widget)
@@ -521,7 +528,7 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event)
         if (activePopupWidget->isEnabled()) {
             // deliver event
             qt_replay_popup_mouse_event = false;
-            QWidget *receiver = activePopupWidget;
+            QPointer<QWidget> receiver = activePopupWidget;
             QPoint widgetPos = mapped;
             if (qt_button_down)
                 receiver = qt_button_down;
@@ -642,7 +649,8 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event)
     if (!widget)
         widget = m_widget;
 
-    if (event->type() == QEvent::MouseButtonPress)
+    const bool initialPress = event->buttons() == event->button();
+    if (event->type() == QEvent::MouseButtonPress && initialPress)
         qt_button_down = widget;
 
     QWidget *receiver = QApplicationPrivate::pickMouseReceiver(m_widget, event->windowPos().toPoint(), &mapped, event->type(), event->buttons(),
@@ -877,8 +885,6 @@ void QWidgetWindow::handleDragEnterEvent(QDragEnterEvent *event, QWidget *widget
     const QPoint mapped = widget->mapFromGlobal(m_widget->mapToGlobal(event->pos()));
     QDragEnterEvent translated(mapped, event->possibleActions(), event->mimeData(),
                                event->mouseButtons(), event->keyboardModifiers());
-    translated.setDropAction(event->dropAction());
-    translated.setAccepted(event->isAccepted());
     QGuiApplication::forwardEvent(m_dragTarget, &translated, event);
     event->setAccepted(translated.isAccepted());
     event->setDropAction(translated.dropAction());
@@ -898,10 +904,10 @@ void QWidgetWindow::handleDragMoveEvent(QDragMoveEvent *event)
         const QPoint mapped = widget->mapFromGlobal(m_widget->mapToGlobal(event->pos()));
         QDragMoveEvent translated(mapped, event->possibleActions(), event->mimeData(),
                                   event->mouseButtons(), event->keyboardModifiers());
-        translated.setDropAction(event->dropAction());
-        translated.setAccepted(event->isAccepted());
 
         if (widget == m_dragTarget) { // Target widget unchanged: Send DragMove
+            translated.setDropAction(event->dropAction());
+            translated.setAccepted(event->isAccepted());
             QGuiApplication::forwardEvent(m_dragTarget, &translated, event);
         } else {
             if (m_dragTarget) { // Send DragLeave to previous
@@ -911,6 +917,9 @@ void QWidgetWindow::handleDragMoveEvent(QDragMoveEvent *event)
             }
             // Send DragEnter to new widget.
             handleDragEnterEvent(static_cast<QDragEnterEvent*>(event), widget);
+            // Handling 'DragEnter' should suffice for the application.
+            translated.setDropAction(event->dropAction());
+            translated.setAccepted(event->isAccepted());
             // The drag enter event is always immediately followed by a drag move event,
             // see QDragEnterEvent documentation.
             QGuiApplication::forwardEvent(m_dragTarget, &translated, event);
@@ -1016,7 +1025,11 @@ void QWidgetWindow::handleWindowStateChangedEvent(QWindowStateChangeEvent *event
     }
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool QWidgetWindow::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
+#else
 bool QWidgetWindow::nativeEvent(const QByteArray &eventType, void *message, long *result)
+#endif
 {
     return m_widget->nativeEvent(eventType, message, result);
 }
diff --git a/src/widgets/kernel/qwidgetwindow_p.h b/src/widgets/kernel/qwidgetwindow_p.h
index 0728135467..80a345465d 100644
--- a/src/widgets/kernel/qwidgetwindow_p.h
+++ b/src/widgets/kernel/qwidgetwindow_p.h
@@ -103,7 +103,11 @@ protected:
 #endif
     void handleExposeEvent(QExposeEvent *);
     void handleWindowStateChangedEvent(QWindowStateChangeEvent *event);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override;
+#else
     bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
+#endif
 #if QT_CONFIG(tabletevent)
     void handleTabletEvent(QTabletEvent *);
 #endif
diff --git a/src/widgets/kernel/qwindowcontainer.cpp b/src/widgets/kernel/qwindowcontainer.cpp
index 81916bba90..4b289d2d33 100644
--- a/src/widgets/kernel/qwindowcontainer.cpp
+++ b/src/widgets/kernel/qwindowcontainer.cpp
@@ -227,6 +227,12 @@ QWindowContainer::QWindowContainer(QWindow *embeddedWindow, QWidget *parent, Qt:
         embeddedWindow->setSurfaceType(QSurface::RasterGLSurface);
 
     d->window = embeddedWindow;
+
+    QString windowName = d->window->objectName();
+    if (windowName.isEmpty())
+        windowName = QString::fromUtf8(d->window->metaObject()->className());
+    d->fakeParent.setObjectName(windowName + QLatin1String("ContainerFakeParent"));
+
     d->window->setParent(&d->fakeParent);
     setAcceptDrops(true);
 
@@ -309,6 +315,7 @@ bool QWindowContainer::event(QEvent *e)
             d->window->setParent(d->usesNativeWidgets
                                  ? windowHandle()
                                  : window()->windowHandle());
+            d->fakeParent.destroy();
         }
         if (d->window->parent()) {
             d->markParentChain();
@@ -398,6 +405,7 @@ void QWindowContainer::parentWasChanged(QWidget *parent)
                 Q_ASSERT(toplevel->windowHandle());
             }
             d->window->setParent(toplevel->windowHandle());
+            d->fakeParent.destroy();
             d->updateGeometry();
         }
     }
diff --git a/src/widgets/kernel/qwindowcontainer_p.h b/src/widgets/kernel/qwindowcontainer_p.h
index a8754232a8..c6de168c10 100644
--- a/src/widgets/kernel/qwindowcontainer_p.h
+++ b/src/widgets/kernel/qwindowcontainer_p.h
@@ -64,7 +64,7 @@ class Q_WIDGETS_EXPORT QWindowContainer : public QWidget
     Q_DECLARE_PRIVATE(QWindowContainer)
 
 public:
-    explicit QWindowContainer(QWindow *embeddedWindow, QWidget *parent = 0, Qt::WindowFlags f = 0);
+    explicit QWindowContainer(QWindow *embeddedWindow, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
     ~QWindowContainer();
     QWindow *containedWindow() const;
 
diff --git a/src/widgets/qtwidgets.tracepoints b/src/widgets/qtwidgets.tracepoints
index 01a1383670..9c40cdb3e7 100644
--- a/src/widgets/qtwidgets.tracepoints
+++ b/src/widgets/qtwidgets.tracepoints
@@ -1,4 +1,11 @@
+{
+QT_BEGIN_NAMESPACE
+class QEvent;
+QT_END_NAMESPACE
+}
+
 QApplication_notify_entry(QObject *receiver, QEvent *event, int type)
+QApplication_notify_exit(QObject *receiver, QEvent *event, int type)
 QApplication_notify_event_filtered(QObject *receiver, QEvent *event, int type)
 QApplication_notify_before_delivery(QObject *receiver, QEvent *event, int type)
 QApplication_notify_after_delivery(QObject *receiver, QEvent *event, int type, bool consumed)
diff --git a/src/widgets/statemachine/qbasickeyeventtransition_p.h b/src/widgets/statemachine/qbasickeyeventtransition_p.h
index 5007b79739..f23c078570 100644
--- a/src/widgets/statemachine/qbasickeyeventtransition_p.h
+++ b/src/widgets/statemachine/qbasickeyeventtransition_p.h
@@ -63,11 +63,11 @@ class Q_AUTOTEST_EXPORT QBasicKeyEventTransition : public QAbstractTransition
 {
     Q_OBJECT
 public:
-    QBasicKeyEventTransition(QState *sourceState = 0);
-    QBasicKeyEventTransition(QEvent::Type type, int key, QState *sourceState = 0);
+    QBasicKeyEventTransition(QState *sourceState = nullptr);
+    QBasicKeyEventTransition(QEvent::Type type, int key, QState *sourceState = nullptr);
     QBasicKeyEventTransition(QEvent::Type type, int key,
                              Qt::KeyboardModifiers modifierMask,
-                             QState *sourceState = 0);
+                             QState *sourceState = nullptr);
     ~QBasicKeyEventTransition();
 
     QEvent::Type eventType() const;
@@ -84,7 +84,7 @@ protected:
     void onTransition(QEvent *) override;
 
 private:
-    Q_DISABLE_COPY(QBasicKeyEventTransition)
+    Q_DISABLE_COPY_MOVE(QBasicKeyEventTransition)
     Q_DECLARE_PRIVATE(QBasicKeyEventTransition)
 };
 
diff --git a/src/widgets/statemachine/qbasicmouseeventtransition_p.h b/src/widgets/statemachine/qbasicmouseeventtransition_p.h
index 93d2a5ec61..dd619d189c 100644
--- a/src/widgets/statemachine/qbasicmouseeventtransition_p.h
+++ b/src/widgets/statemachine/qbasicmouseeventtransition_p.h
@@ -65,9 +65,9 @@ class Q_AUTOTEST_EXPORT QBasicMouseEventTransition : public QAbstractTransition
 {
     Q_OBJECT
 public:
-    QBasicMouseEventTransition(QState *sourceState = 0);
+    QBasicMouseEventTransition(QState *sourceState = nullptr);
     QBasicMouseEventTransition(QEvent::Type type, Qt::MouseButton button,
-                               QState *sourceState = 0);
+                               QState *sourceState = nullptr);
     ~QBasicMouseEventTransition();
 
     QEvent::Type eventType() const;
@@ -87,7 +87,7 @@ protected:
     void onTransition(QEvent *) override;
 
 private:
-    Q_DISABLE_COPY(QBasicMouseEventTransition)
+    Q_DISABLE_COPY_MOVE(QBasicMouseEventTransition)
     Q_DECLARE_PRIVATE(QBasicMouseEventTransition)
 };
 
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
index b9943533ee..a3461d8848 100644
--- a/src/widgets/styles/qcommonstyle.cpp
+++ b/src/widgets/styles/qcommonstyle.cpp
@@ -105,10 +105,14 @@
 #endif
 #include <qfileinfo.h>
 #include <qdir.h>
+#if QT_CONFIG(settings)
 #include <qsettings.h>
+#endif
 #include <qvariant.h>
 #include <qpixmapcache.h>
+#if QT_CONFIG(animation)
 #include <private/qstyleanimation_p.h>
+#endif
 
 #include <limits.h>
 
@@ -190,12 +194,12 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
                         opt->state & (State_Sunken | State_On), 1,
                         &opt->palette.brush(QPalette::Button));
         break;
-    case PE_IndicatorViewItemCheck:
+    case PE_IndicatorItemViewItemCheck:
         proxy()->drawPrimitive(PE_IndicatorCheckBox, opt, p, widget);
         break;
     case PE_IndicatorCheckBox:
         if (opt->state & State_NoChange) {
-            p->setPen(opt->palette.foreground().color());
+            p->setPen(opt->palette.windowText().color());
             p->fillRect(opt->rect, opt->palette.brush(QPalette::Button));
             p->drawRect(opt->rect);
             p->drawLine(opt->rect.topLeft(), opt->rect.bottomRight());
@@ -211,7 +215,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
         p->drawArc(opt->rect, 0, 5760);
         if (opt->state & (State_Sunken | State_On)) {
             ir.adjust(2, 2, -2, -2);
-            p->setBrush(opt->palette.foreground());
+            p->setBrush(opt->palette.windowText());
             bool oldQt4CompatiblePainting = p->testRenderHint(QPainter::Qt4CompatiblePainting);
             p->setRenderHint(QPainter::Qt4CompatiblePainting);
             p->drawEllipse(ir);
@@ -230,7 +234,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
                 else
                     p->setPen(Qt::white);
             } else {
-                p->setPen(opt->palette.foreground().color());
+                p->setPen(opt->palette.windowText().color());
             }
             QRect focusRect = opt->rect.adjusted(1, 1, -1, -1);
             p->drawRect(focusRect.adjusted(0, 0, -1, -1)); //draw pen inclusive
@@ -277,7 +281,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
                 qDrawShadePanel(p, frame->rect, frame->palette, frame->state & State_Sunken,
                                 frame->lineWidth);
             } else {
-                qDrawPlainRect(p, frame->rect, frame->palette.foreground().color(), frame->lineWidth);
+                qDrawPlainRect(p, frame->rect, frame->palette.windowText().color(), frame->lineWidth);
             }
         }
         break;
@@ -614,7 +618,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
             }
 
             p->setPen(QPen(tab->palette.dark(), qreal(.8)));
-            p->setBrush(tab->palette.background());
+            p->setBrush(tab->palette.window());
             p->setRenderHint(QPainter::Antialiasing);
             p->drawPath(path);
         }
@@ -747,7 +751,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
             QString pixmapName = QStyleHelper::uniqueName(QLatin1String("$qt_ia-")
                                                           % QLatin1String(metaObject()->className()), opt, QSize(size, size))
                                  % HexString<uint>(pe);
-            if (!QPixmapCache::find(pixmapName, pixmap)) {
+            if (!QPixmapCache::find(pixmapName, &pixmap)) {
                 qreal pixelRatio = p->device()->devicePixelRatioF();
                 int border = qRound(pixelRatio*(size/5));
                 int sqsize = qRound(pixelRatio*(2*(size/2)));
@@ -842,13 +846,14 @@ static void drawArrow(const QStyle *style, const QStyleOptionToolButton *toolbut
 }
 #endif // QT_CONFIG(toolbutton)
 
-#if QT_CONFIG(itemviews)
-
-static QSizeF viewItemTextLayout(QTextLayout &textLayout, int lineWidth)
+static QSizeF viewItemTextLayout(QTextLayout &textLayout, int lineWidth, int maxHeight = -1, int *lastVisibleLine = nullptr)
 {
+    if (lastVisibleLine)
+        *lastVisibleLine = -1;
     qreal height = 0;
     qreal widthUsed = 0;
     textLayout.beginLayout();
+    int i = 0;
     while (true) {
         QTextLine line = textLayout.createLine();
         if (!line.isValid())
@@ -857,11 +862,99 @@ static QSizeF viewItemTextLayout(QTextLayout &textLayout, int lineWidth)
         line.setPosition(QPointF(0, height));
         height += line.height();
         widthUsed = qMax(widthUsed, line.naturalTextWidth());
+        // we assume that the height of the next line is the same as the current one
+        if (maxHeight > 0 && lastVisibleLine && height + line.height() > maxHeight) {
+            const QTextLine nextLine = textLayout.createLine();
+            *lastVisibleLine = nextLine.isValid() ? i : -1;
+            break;
+        }
+        ++i;
     }
     textLayout.endLayout();
     return QSizeF(widthUsed, height);
 }
 
+QString QCommonStylePrivate::calculateElidedText(const QString &text, const QTextOption &textOption,
+                                                 const QFont &font, const QRect &textRect, const Qt::Alignment valign,
+                                                 Qt::TextElideMode textElideMode, int flags,
+                                                 bool lastVisibleLineShouldBeElided, QPointF *paintStartPosition) const
+{
+    QTextLayout textLayout(text, font);
+    textLayout.setTextOption(textOption);
+
+    // In AlignVCenter mode when more than one line is displayed and the height only allows
+    // some of the lines it makes no sense to display those. From a users perspective it makes
+    // more sense to see the start of the text instead something inbetween.
+    const bool vAlignmentOptimization = paintStartPosition && valign.testFlag(Qt::AlignVCenter);
+
+    int lastVisibleLine = -1;
+    viewItemTextLayout(textLayout, textRect.width(), vAlignmentOptimization ? textRect.height() : -1, &lastVisibleLine);
+
+    const QRectF boundingRect = textLayout.boundingRect();
+    // don't care about LTR/RTL here, only need the height
+    const QRect layoutRect = QStyle::alignedRect(Qt::LayoutDirectionAuto, valign,
+                                                 boundingRect.size().toSize(), textRect);
+
+    if (paintStartPosition)
+        *paintStartPosition = QPointF(textRect.x(), layoutRect.top());
+
+    QString ret;
+    qreal height = 0;
+    const int lineCount = textLayout.lineCount();
+    for (int i = 0; i < lineCount; ++i) {
+        const QTextLine line = textLayout.lineAt(i);
+        height += line.height();
+
+        // above visible rect
+        if (height + layoutRect.top() <= textRect.top()) {
+            if (paintStartPosition)
+                paintStartPosition->ry() += line.height();
+            continue;
+        }
+
+        const int start = line.textStart();
+        const int length = line.textLength();
+        const bool drawElided = line.naturalTextWidth() > textRect.width();
+        bool elideLastVisibleLine = lastVisibleLine == i;
+        if (!drawElided && i + 1 < lineCount && lastVisibleLineShouldBeElided) {
+            const QTextLine nextLine = textLayout.lineAt(i + 1);
+            const int nextHeight = height + nextLine.height() / 2;
+            // elide when less than the next half line is visible
+            if (nextHeight + layoutRect.top() > textRect.height() + textRect.top())
+                elideLastVisibleLine = true;
+        }
+
+        QString text = textLayout.text().mid(start, length);
+        if (drawElided || elideLastVisibleLine) {
+            if (elideLastVisibleLine) {
+                if (text.endsWith(QChar::LineSeparator))
+                    text.chop(1);
+                text += QChar(0x2026);
+            }
+            const QStackTextEngine engine(text, font);
+            ret += engine.elidedText(textElideMode, textRect.width(), flags);
+
+            // no newline for the last line (last visible or real)
+            // sometimes drawElided is true but no eliding is done so the text ends
+            // with QChar::LineSeparator - don't add another one. This happened with
+            // arabic text in the testcase for QTBUG-72805
+            if (i < lineCount - 1 &&
+                !ret.endsWith(QChar::LineSeparator))
+                ret += QChar::LineSeparator;
+        } else {
+            ret += text;
+        }
+
+        // below visible text, can stop
+        if ((height + layoutRect.top() >= textRect.bottom()) ||
+                (lastVisibleLine >= 0 && lastVisibleLine == i))
+            break;
+    }
+    return ret;
+}
+
+#if QT_CONFIG(itemviews)
+
 QSize QCommonStylePrivate::viewItemSize(const QStyleOptionViewItem *option, int role) const
 {
     const QWidget *widget = option->widget;
@@ -934,59 +1027,17 @@ void QCommonStylePrivate::viewItemDrawText(QPainter *p, const QStyleOptionViewIt
     textOption.setWrapMode(wrapText ? QTextOption::WordWrap : QTextOption::ManualWrap);
     textOption.setTextDirection(option->direction);
     textOption.setAlignment(QStyle::visualAlignment(option->direction, option->displayAlignment));
-    QTextLayout textLayout(option->text, option->font);
-    textLayout.setTextOption(textOption);
-
-    viewItemTextLayout(textLayout, textRect.width());
-
-    const QRectF boundingRect = textLayout.boundingRect();
-    const QRect layoutRect = QStyle::alignedRect(option->direction, option->displayAlignment,
-                                                 boundingRect.size().toSize(), textRect);
-    const QPointF position = layoutRect.topLeft();
-    const int lineCount = textLayout.lineCount();
-
-    qreal height = 0;
-    for (int i = 0; i < lineCount; ++i) {
-        const QTextLine line = textLayout.lineAt(i);
-        height += line.height();
-
-        // above visible rect
-        if (height + layoutRect.top() <= textRect.top())
-            continue;
 
-        const int start = line.textStart();
-        const int length = line.textLength();
+    QPointF paintPosition;
+    const QString newText = calculateElidedText(option->text, textOption,
+                                                option->font, textRect, option->displayAlignment,
+                                                option->textElideMode, 0,
+                                                true, &paintPosition);
 
-        const bool drawElided = line.naturalTextWidth() > textRect.width();
-        bool elideLastVisibleLine = false;
-        if (!drawElided && i + 1 < lineCount) {
-            const QTextLine nextLine = textLayout.lineAt(i + 1);
-            const int nextHeight = height + nextLine.height() / 2;
-            // elide when less than the next half line is visible
-            if (nextHeight + layoutRect.top() > textRect.height() + textRect.top())
-                elideLastVisibleLine = true;
-        }
-
-        if (drawElided || elideLastVisibleLine) {
-            QString text = textLayout.text().mid(start, length);
-            if (elideLastVisibleLine)
-                text += QChar(0x2026);
-            const QStackTextEngine engine(text, option->font);
-            const QString elidedText = engine.elidedText(option->textElideMode, textRect.width());
-            const QPointF pos(position.x() + line.x(),
-                              position.y() + line.y() + line.ascent());
-            p->save();
-            p->setFont(option->font);
-            p->drawText(pos, elidedText);
-            p->restore();
-        } else {
-            line.draw(p, position);
-        }
-
-        // below visible text, can stop
-        if (height + layoutRect.top() >= textRect.bottom())
-            break;
-    }
+    QTextLayout textLayout(newText, option->font);
+    textLayout.setTextOption(textOption);
+    viewItemTextLayout(textLayout, textRect.width());
+    textLayout.draw(p, paintPosition);
 }
 
 /*! \internal
@@ -1126,6 +1177,25 @@ void QCommonStylePrivate::viewItemLayout(const QStyleOptionViewItem *opt,  QRect
 }
 #endif // QT_CONFIG(itemviews)
 
+#if QT_CONFIG(toolbutton)
+QString QCommonStylePrivate::toolButtonElideText(const QStyleOptionToolButton *option,
+                                                 const QRect &textRect, int flags) const
+{
+    if (option->fontMetrics.horizontalAdvance(option->text) <= textRect.width())
+        return option->text;
+
+    QString text = option->text;
+    text.replace('\n', QChar::LineSeparator);
+    QTextOption textOption;
+    textOption.setWrapMode(QTextOption::ManualWrap);
+    textOption.setTextDirection(option->direction);
+
+    return calculateElidedText(text, textOption,
+                               option->font, textRect, Qt::AlignTop,
+                               Qt::ElideMiddle, flags,
+                               false, nullptr);
+}
+#endif // QT_CONFIG(toolbutton)
 
 #if QT_CONFIG(tabbar)
 /*! \internal
@@ -1182,8 +1252,9 @@ void QCommonStylePrivate::tabLayout(const QStyleOptionTab *opt, const QWidget *w
         // High-dpi icons do not need adjustment; make sure tabIconSize is not larger than iconSize
         tabIconSize = QSize(qMin(tabIconSize.width(), iconSize.width()), qMin(tabIconSize.height(), iconSize.height()));
 
-        *iconRect = QRect(tr.left(), tr.center().y() - tabIconSize.height() / 2,
-                    tabIconSize.width(), tabIconSize.height());
+        const int offsetX = (iconSize.width() - tabIconSize.width()) / 2;
+        *iconRect = QRect(tr.left() + offsetX, tr.center().y() - tabIconSize.height() / 2,
+                          tabIconSize.width(), tabIconSize.height());
         if (!verticalTabs)
             *iconRect = proxyStyle->visualRect(opt->direction, opt->rect, *iconRect);
         tr.setLeft(tr.left() + tabIconSize.width() + 4);
@@ -1196,7 +1267,7 @@ void QCommonStylePrivate::tabLayout(const QStyleOptionTab *opt, const QWidget *w
 }
 #endif // QT_CONFIG(tabbar)
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
 /*! \internal */
 QList<const QObject*> QCommonStylePrivate::animationTargets() const
 {
@@ -1498,7 +1569,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
 
             QPalette pal2 = pb->palette;
             // Correct the highlight color if it is the same as the background
-            if (pal2.highlight() == pal2.background())
+            if (pal2.highlight() == pal2.window())
                 pal2.setColor(QPalette::Highlight, pb->palette.color(QPalette::Active,
                                                                      QPalette::Highlight));
             bool reverse = ((!vertical && (pb->direction == Qt::RightToLeft)) || vertical);
@@ -1653,7 +1724,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
                         alignment |= Qt::TextHideMnemonic;
 
                     if (toolbutton->toolButtonStyle == Qt::ToolButtonTextUnderIcon) {
-                        pr.setHeight(pmSize.height() + 6);
+                        pr.setHeight(pmSize.height() + 4); //### 4 is currently hardcoded in QToolButton::sizeHint()
                         tr.adjust(0, pr.height() - 1, 0, -1);
                         pr.translate(shiftX, shiftY);
                         if (!hasArrow) {
@@ -1663,7 +1734,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
                         }
                         alignment |= Qt::AlignCenter;
                     } else {
-                        pr.setWidth(pmSize.width() + 8);
+                        pr.setWidth(pmSize.width() + 4); //### 4 is currently hardcoded in QToolButton::sizeHint()
                         tr.adjust(pr.width(), 0, 0, 0);
                         pr.translate(shiftX, shiftY);
                         if (!hasArrow) {
@@ -1674,7 +1745,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
                         alignment |= Qt::AlignLeft | Qt::AlignVCenter;
                     }
                     tr.translate(shiftX, shiftY);
-                    const QString text = toolbutton->fontMetrics.elidedText(toolbutton->text, Qt::ElideMiddle, tr.width());
+                    const QString text = d->toolButtonElideText(toolbutton, tr, alignment);
                     proxy()->drawItemText(p, QStyle::visualRect(opt->direction, rect, tr), alignment, toolbutton->palette,
                                  toolbutton->state & State_Enabled, text,
                                  QPalette::ButtonText);
@@ -1786,14 +1857,14 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
                 }
             }
 
-            p->setPen(QPen(tab->palette.foreground(), 0));
+            p->setPen(QPen(tab->palette.windowText(), 0));
             if (selected) {
                 p->setBrush(tab->palette.base());
             } else {
                 if (widget && widget->parentWidget())
-                    p->setBrush(widget->parentWidget()->palette().background());
+                    p->setBrush(widget->parentWidget()->palette().window());
                 else
-                    p->setBrush(tab->palette.background());
+                    p->setBrush(tab->palette.window());
             }
 
             int y;
@@ -2090,7 +2161,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
 
                 const int indent = p->fontMetrics().descent();
                 proxy()->drawItemText(p, r.adjusted(indent + 1, 1, -indent - 1, -1),
-                              Qt::AlignLeft | Qt::AlignVCenter | Qt::TextShowMnemonic, dwOpt->palette,
+                              Qt::AlignLeft | Qt::AlignVCenter, dwOpt->palette,
                               dwOpt->state & State_Enabled, dwOpt->title,
                               QPalette::WindowText);
 
@@ -2117,7 +2188,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
         }
         break;
     case CE_FocusFrame:
-            p->fillRect(opt->rect, opt->palette.foreground());
+            p->fillRect(opt->rect, opt->palette.windowText());
         break;
     case CE_HeaderSection:
             qDrawShadePanel(p, opt->rect, opt->palette,
@@ -2125,7 +2196,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
                         &opt->palette.brush(QPalette::Button));
         break;
     case CE_HeaderEmptyArea:
-            p->fillRect(opt->rect, opt->palette.background());
+            p->fillRect(opt->rect, opt->palette.window());
         break;
 #if QT_CONFIG(combobox)
     case CE_ComboBoxLabel:
@@ -2229,7 +2300,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
                     option.state |= QStyle::State_On;
                     break;
                 }
-                proxy()->drawPrimitive(QStyle::PE_IndicatorViewItemCheck, &option, p, widget);
+                proxy()->drawPrimitive(QStyle::PE_IndicatorItemViewItemCheck, &option, p, widget);
             }
 
             // draw the icon
@@ -3086,13 +3157,17 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt,
                 ///we need to access the widget here because the style option doesn't
                 //have all the information we need (ie. the layout's margin)
                 const QToolBar *tb = qobject_cast<const QToolBar*>(widget);
-                const int margin = tb && tb->layout() ? tb->layout()->margin() : 2;
+                const QMargins margins = tb && tb->layout() ? tb->layout()->contentsMargins() : QMargins(2, 2, 2, 2);
                 const int handleExtent = proxy()->pixelMetric(QStyle::PM_ToolBarHandleExtent, opt, tb);
                 if (tbopt->state & QStyle::State_Horizontal) {
-                    r = QRect(margin, margin, handleExtent, tbopt->rect.height() - 2*margin);
+                    r = QRect(margins.left(), margins.top(),
+                              handleExtent,
+                              tbopt->rect.height() - (margins.top() + margins.bottom()));
                     r = QStyle::visualRect(tbopt->direction, tbopt->rect, r);
                 } else {
-                    r = QRect(margin, margin, tbopt->rect.width() - 2*margin, handleExtent);
+                    r = QRect(margins.left(), margins.top(),
+                              tbopt->rect.width() - (margins.left() + margins.right()),
+                              handleExtent);
                 }
             }
         }
@@ -3189,7 +3264,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl
                 // Since there is no subrect for tickmarks do a translation here.
                 p->save();
                 p->translate(slider->rect.x(), slider->rect.y());
-                p->setPen(slider->palette.foreground().color());
+                p->setPen(slider->palette.windowText().color());
                 int v = slider->minimum;
                 while (v <= slider->maximum + 1) {
                     if (v == slider->maximum + 1 && interval == 1)
@@ -3635,7 +3710,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl
             QPalette pal = opt->palette;
             // draw notches
             if (dial->subControls & QStyle::SC_DialTickmarks) {
-                p->setPen(pal.foreground().color());
+                p->setPen(pal.windowText().color());
                 p->drawLines(QStyleHelper::calcLines(dial));
             }
 
@@ -4917,8 +4992,8 @@ QSize QCommonStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt,
         break;
 #if QT_CONFIG(groupbox)
     case CT_GroupBox:
-        if (const QGroupBox *grb = static_cast<const QGroupBox *>(widget))
-            sz += QSize(!grb->isFlat() ? 16 : 0, 0);
+        if (const QStyleOptionGroupBox *styleOpt = qstyleoption_cast<const QStyleOptionGroupBox *>(opt))
+            sz += QSize(styleOpt->features.testFlag(QStyleOptionFrame::Flat) ? 0 : 16, 0);
         break;
 #endif // QT_CONFIG(groupbox)
     case CT_MdiControls:
diff --git a/src/widgets/styles/qcommonstyle.h b/src/widgets/styles/qcommonstyle.h
index f39915295e..78c5171717 100644
--- a/src/widgets/styles/qcommonstyle.h
+++ b/src/widgets/styles/qcommonstyle.h
@@ -97,7 +97,7 @@ protected:
 private:
     Q_DECLARE_PRIVATE(QCommonStyle)
     Q_DISABLE_COPY(QCommonStyle)
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     Q_PRIVATE_SLOT(d_func(), void _q_removeAnimation())
 #endif
 };
diff --git a/src/widgets/styles/qcommonstyle_p.h b/src/widgets/styles/qcommonstyle_p.h
index 93db75ac2d..4860dfe4c9 100644
--- a/src/widgets/styles/qcommonstyle_p.h
+++ b/src/widgets/styles/qcommonstyle_p.h
@@ -43,8 +43,9 @@
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "qcommonstyle.h"
 #include "qstyle_p.h"
+#if QT_CONFIG(animation)
 #include "qstyleanimation_p.h"
-
+#endif
 #include "qstyleoption.h"
 
 QT_BEGIN_NAMESPACE
@@ -61,6 +62,7 @@ QT_BEGIN_NAMESPACE
 //
 
 class QStringList;
+class QTextOption;
 
 // Private class
 class Q_WIDGETS_EXPORT QCommonStylePrivate : public QStylePrivate
@@ -69,14 +71,14 @@ class Q_WIDGETS_EXPORT QCommonStylePrivate : public QStylePrivate
 public:
     inline QCommonStylePrivate() :
 #if QT_CONFIG(itemviews)
-    cachedOption(0),
+    cachedOption(nullptr),
 #endif
     animationFps(30)
     { }
 
     ~QCommonStylePrivate()
     {
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
         qDeleteAll(animations);
 #endif
 #if QT_CONFIG(itemviews)
@@ -84,6 +86,10 @@ public:
 #endif
     }
 
+    QString calculateElidedText(const QString &text, const QTextOption &textOption,
+                                const QFont &font, const QRect &textRect, const Qt::Alignment valign,
+                                Qt::TextElideMode textElideMode, int flags,
+                                bool lastVisibleLineShouldBeElided, QPointF *paintStartPosition) const;
 #if QT_CONFIG(itemviews)
     void viewItemDrawText(QPainter *p, const QStyleOptionViewItem *option, const QRect &rect) const;
     void viewItemLayout(const QStyleOptionViewItem *opt,  QRect *checkRect,
@@ -109,13 +115,18 @@ public:
                && option.viewItemPosition == cachedOption->viewItemPosition);
     }
 #endif
+#if QT_CONFIG(toolbutton)
+    QString toolButtonElideText(const QStyleOptionToolButton *toolbutton,
+                                const QRect &textRect, int flags) const;
+#endif
+
     mutable QIcon tabBarcloseButtonIcon;
 #if QT_CONFIG(tabbar)
     void tabLayout(const QStyleOptionTab *opt, const QWidget *widget, QRect *textRect, QRect *pixmapRect) const;
 #endif
 
     int animationFps;
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     void _q_removeAnimation();
 
     QList<const QObject*> animationTargets() const;
@@ -125,7 +136,7 @@ public:
 
 private:
     mutable QHash<const QObject*, QStyleAnimation*> animations;
-#endif // QT_NO_ANIMATION
+#endif // animation
 };
 
 QT_END_NAMESPACE
diff --git a/src/widgets/styles/qdrawutil.cpp b/src/widgets/styles/qdrawutil.cpp
index 299dbb9f82..d30b43a679 100644
--- a/src/widgets/styles/qdrawutil.cpp
+++ b/src/widgets/styles/qdrawutil.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 namespace {
 class PainterStateGuard {
-    Q_DISABLE_COPY(PainterStateGuard)
+    Q_DISABLE_COPY_MOVE(PainterStateGuard)
 public:
     explicit PainterStateGuard(QPainter *p) : m_painter(p) {}
     ~PainterStateGuard()
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp
index 7474cd23d6..f3961b2a99 100644
--- a/src/widgets/styles/qfusionstyle.cpp
+++ b/src/widgets/styles/qfusionstyle.cpp
@@ -247,6 +247,9 @@ static QLinearGradient qt_fusion_gradient(const QRect &rect, const QBrush &baseC
 
 static void qt_fusion_draw_arrow(Qt::ArrowType type, QPainter *painter, const QStyleOption *option, const QRect &rect, const QColor &color)
 {
+    if (rect.isEmpty())
+        return;
+
     const int arrowWidth = QStyleHelper::dpiScaled(14);
     const int arrowHeight = QStyleHelper::dpiScaled(8);
 
@@ -258,7 +261,7 @@ static void qt_fusion_draw_arrow(Qt::ArrowType type, QPainter *painter, const QS
     QString cacheKey = QStyleHelper::uniqueName(QLatin1String("fusion-arrow"), option, rect.size())
             % HexString<uint>(type)
             % HexString<uint>(color.rgba());
-    if (!QPixmapCache::find(cacheKey, cachePixmap)) {
+    if (!QPixmapCache::find(cacheKey, &cachePixmap)) {
         cachePixmap = styleCachePixmap(rect.size());
         cachePixmap.fill(Qt::transparent);
         QPainter cachePainter(&cachePixmap);
@@ -536,7 +539,7 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem,
     {
         if (option->rect.width() <= 1 || option->rect.height() <= 1)
             break;
-        QColor arrowColor = option->palette.foreground().color();
+        QColor arrowColor = option->palette.windowText().color();
         arrowColor.setAlpha(160);
         Qt::ArrowType arrow = Qt::UpArrow;
         switch (elem) {
@@ -555,7 +558,7 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem,
         qt_fusion_draw_arrow(arrow, painter, option, option->rect, arrowColor);
     }
         break;
-    case PE_IndicatorViewItemCheck:
+    case PE_IndicatorItemViewItemCheck:
     {
         QStyleOptionButton button;
         button.QStyleOption::operator=(*option);
@@ -566,7 +569,7 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem,
     case PE_IndicatorHeaderArrow:
         if (const QStyleOptionHeader *header = qstyleoption_cast<const QStyleOptionHeader *>(option)) {
             QRect r = header->rect;
-            QColor arrowColor = header->palette.foreground().color();
+            QColor arrowColor = header->palette.windowText().color();
             arrowColor.setAlpha(180);
             QPoint offset = QPoint(0, -2);
 
@@ -595,24 +598,24 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem,
         const int margin = 6;
         if (option->state & State_Horizontal) {
             const int offset = rect.width()/2;
-            painter->setPen(QPen(option->palette.background().color().darker(110)));
+            painter->setPen(QPen(option->palette.window().color().darker(110)));
             painter->drawLine(rect.bottomLeft().x() + offset,
                               rect.bottomLeft().y() - margin,
                               rect.topLeft().x() + offset,
                               rect.topLeft().y() + margin);
-            painter->setPen(QPen(option->palette.background().color().lighter(110)));
+            painter->setPen(QPen(option->palette.window().color().lighter(110)));
             painter->drawLine(rect.bottomLeft().x() + offset + 1,
                               rect.bottomLeft().y() - margin,
                               rect.topLeft().x() + offset + 1,
                               rect.topLeft().y() + margin);
         } else { //Draw vertical separator
             const int offset = rect.height()/2;
-            painter->setPen(QPen(option->palette.background().color().darker(110)));
+            painter->setPen(QPen(option->palette.window().color().darker(110)));
             painter->drawLine(rect.topLeft().x() + margin ,
                               rect.topLeft().y() + offset,
                               rect.topRight().x() - margin,
                               rect.topRight().y() + offset);
-            painter->setPen(QPen(option->palette.background().color().lighter(110)));
+            painter->setPen(QPen(option->palette.window().color().lighter(110)));
             painter->drawLine(rect.topLeft().x() + margin ,
                               rect.topLeft().y() + offset + 1,
                               rect.topRight().x() - margin,
@@ -639,8 +642,8 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem,
     {
         painter->setPen(QPen(outline));
         painter->drawRect(option->rect.adjusted(0, 0, -1, -1));
-        QColor frameLight = option->palette.background().color().lighter(160);
-        QColor frameShadow = option->palette.background().color().darker(110);
+        QColor frameLight = option->palette.window().color().lighter(160);
+        QColor frameShadow = option->palette.window().color().darker(110);
 
         //paint beveleffect
         QRect frame = option->rect.adjusted(1, 1, -1, -1);
@@ -658,14 +661,14 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem,
 
         painter->save();
     {
-        QColor softshadow = option->palette.background().color().darker(120);
+        QColor softshadow = option->palette.window().color().darker(120);
 
         QRect rect= option->rect;
         painter->setPen(softshadow);
         painter->drawRect(option->rect.adjusted(0, 0, -1, -1));
         painter->setPen(QPen(option->palette.light(), 1));
         painter->drawLine(QPoint(rect.left() + 1, rect.top() + 1), QPoint(rect.left() + 1, rect.bottom() - 1));
-        painter->setPen(QPen(option->palette.background().color().darker(120)));
+        painter->setPen(QPen(option->palette.window().color().darker(120)));
         painter->drawLine(QPoint(rect.left() + 1, rect.bottom() - 1), QPoint(rect.right() - 2, rect.bottom() - 1));
         painter->drawLine(QPoint(rect.right() - 1, rect.top() + 1), QPoint(rect.right() - 1, rect.bottom() - 1));
 
@@ -701,7 +704,7 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem,
         painter->setPen(QPen(option->palette.light(), 1));
         painter->drawLine(QPoint(rect.left() + 1, rect.top() + 1),
                           QPoint(rect.left() + 1, rect.bottom() - 1));
-        painter->setPen(QPen(option->palette.background().color().darker(120)));
+        painter->setPen(QPen(option->palette.window().color().darker(120)));
         painter->drawLine(QPoint(rect.left() + 1, rect.bottom() - 1),
                           QPoint(rect.right() - 2, rect.bottom() - 1));
         painter->drawLine(QPoint(rect.right() - 1, rect.top() + 1),
@@ -722,7 +725,6 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem,
 
         // Draw Outline
         painter->setPen( QPen(hasFocus ? highlightedOutline : outline));
-        painter->setBrush(option->palette.base());
         painter->drawRoundedRect(r.adjusted(0, 0, -1, -1), 2, 2);
 
         if (hasFocus) {
@@ -746,7 +748,7 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem,
             painter->translate(0.5, 0.5);
             rect = rect.adjusted(0, 0, -1, -1);
 
-            QColor pressedColor = mergedColors(option->palette.base().color(), option->palette.foreground().color(), 85);
+            QColor pressedColor = mergedColors(option->palette.base().color(), option->palette.windowText().color(), 85);
             painter->setBrush(Qt::NoBrush);
 
             // Gradient fill
@@ -800,14 +802,14 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem,
     case PE_IndicatorRadioButton:
         painter->save();
     {
-        QColor pressedColor = mergedColors(option->palette.base().color(), option->palette.foreground().color(), 85);
+        QColor pressedColor = mergedColors(option->palette.base().color(), option->palette.windowText().color(), 85);
         painter->setBrush((state & State_Sunken) ? pressedColor : option->palette.base().color());
         painter->setRenderHint(QPainter::Antialiasing, true);
         QPainterPath circle;
         const QPointF circleCenter = rect.center() + QPoint(1, 1);
         const qreal outlineRadius = (rect.width() + (rect.width() + 1) % 2) / 2.0 - 1;
         circle.addEllipse(circleCenter, outlineRadius, outlineRadius);
-        painter->setPen(QPen(option->palette.background().color().darker(150)));
+        painter->setPen(QPen(option->palette.window().color().darker(150)));
         if (option->state & State_HasFocus && option->state & State_KeyboardFocusChange)
             painter->setPen(QPen(highlightedOutline));
         painter->drawPath(circle);
@@ -989,7 +991,7 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem,
     case PE_PanelMenu: {
         painter->save();
         const QBrush menuBackground = option->palette.base().color().lighter(108);
-        QColor borderColor = option->palette.background().color().darker(160);
+        QColor borderColor = option->palette.window().color().darker(160);
         qDrawPlainRect(painter, option->rect, borderColor, 1, &menuBackground);
         painter->restore();
     }
@@ -1254,7 +1256,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
                                                             Qt::ElideRight, titleRect.width());
                 proxy()->drawItemText(painter,
                                       titleRect,
-                                      Qt::AlignLeft | Qt::AlignVCenter | Qt::TextShowMnemonic, dwOpt->palette,
+                                      Qt::AlignLeft | Qt::AlignVCenter, dwOpt->palette,
                                       dwOpt->state & State_Enabled, titleText,
                                       QPalette::WindowText);
             }
@@ -1270,7 +1272,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
             pixmapName += QString::number(- int(header->orientation));
 
             QPixmap cache;
-            if (!QPixmapCache::find(pixmapName, cache)) {
+            if (!QPixmapCache::find(pixmapName, &cache)) {
                 cache = styleCachePixmap(rect.size());
                 cache.fill(Qt::transparent);
                 QRect pixmapRect(0, 0, rect.width(), rect.height());
@@ -1281,8 +1283,8 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
                 gradientStopColor = buttonColor.darker(102);
                 QLinearGradient gradient(pixmapRect.topLeft(), pixmapRect.bottomLeft());
 
-                if (option->palette.background().gradient()) {
-                    gradient.setStops(option->palette.background().gradient()->stops());
+                if (option->palette.window().gradient()) {
+                    gradient.setStops(option->palette.window().gradient()->stops());
                 } else {
                     QColor midColor1 = mergedColors(gradientStartColor, gradientStopColor, 60);
                     QColor midColor2 = mergedColors(gradientStartColor, gradientStopColor, 40);
@@ -1429,14 +1431,14 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
                 painter->drawRoundedRect(progressBar.adjusted(1, 1, -1, -1), 1, 1);
 
                 if (!indeterminate) {
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
                     (const_cast<QFusionStylePrivate*>(d))->stopAnimation(option->styleObject);
 #endif
                 } else {
                     highlightedGradientStartColor.setAlpha(120);
                     painter->setPen(QPen(highlightedGradientStartColor, 9.0));
                     painter->setClipRect(progressBar.adjusted(1, 1, -1, -1));
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
                 if (QProgressStyleAnimation *animation = qobject_cast<QProgressStyleAnimation*>(d->animation(option->styleObject)))
                     step = animation->animationStep() % 22;
                 else
@@ -1517,7 +1519,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
                 proxy()->drawItemText(painter, item.rect, alignment, mbi->palette, mbi->state & State_Enabled, mbi->text, textRole);
             } else {
 
-                QColor shadow = mergedColors(option->palette.background().color().darker(120),
+                QColor shadow = mergedColors(option->palette.window().color().darker(120),
                                              outline.lighter(140), 60);
                 painter->setPen(QPen(shadow));
                 painter->drawLine(option->rect.bottomLeft(), option->rect.bottomRight());
@@ -1647,7 +1649,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
                 if (!ignoreCheckMark && checkable && checked) {
                     QStyleOption opt = *option;
                     if (act) {
-                        QColor activeColor = mergedColors(option->palette.background().color(),
+                        QColor activeColor = mergedColors(option->palette.window().color(),
                                                           option->palette.highlight().color());
                         opt.palette.setBrush(QPalette::Button, activeColor);
                     }
@@ -1729,7 +1731,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
                 newMI.rect = vSubMenuRect;
                 newMI.state = !enabled ? State_None : State_Enabled;
                 if (selected)
-                    newMI.palette.setColor(QPalette::Foreground,
+                    newMI.palette.setColor(QPalette::WindowText,
                                            newMI.palette.highlightedText().color());
                 proxy()->drawPrimitive(arrow, &newMI, painter, widget);
             }
@@ -1810,7 +1812,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
         painter->save();
     {
         painter->fillRect(rect, option->palette.window());
-        QColor shadow = mergedColors(option->palette.background().color().darker(120),
+        QColor shadow = mergedColors(option->palette.window().color().darker(120),
                                      outline.lighter(140), 60);
         painter->setPen(QPen(shadow));
         painter->drawLine(option->rect.bottomLeft(), option->rect.bottomRight());
@@ -1973,7 +1975,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
         // ### backgroundrole/foregroundrole should be part of the style option
         alphaCornerColor = mergedColors(option->palette.color(widget->backgroundRole()), outline);
     } else {
-        alphaCornerColor = mergedColors(option->palette.background().color(), outline);
+        alphaCornerColor = mergedColors(option->palette.window().color(), outline);
     }
 
     switch (control) {
@@ -2028,7 +2030,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
         if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) {
             QPixmap cache;
             QString pixmapName = QStyleHelper::uniqueName(QLatin1String("spinbox"), spinBox, spinBox->rect.size());
-            if (!QPixmapCache::find(pixmapName, cache)) {
+            if (!QPixmapCache::find(pixmapName, &cache)) {
 
                 cache = styleCachePixmap(spinBox->rect.size());
                 cache.fill(Qt::transparent);
@@ -2037,7 +2039,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
                 QRect rect = pixmapRect;
                 QRect r = rect.adjusted(0, 1, 0, -1);
                 QPainter cachePainter(&cache);
-                QColor arrowColor = spinBox->palette.foreground().color();
+                QColor arrowColor = spinBox->palette.windowText().color();
                 arrowColor.setAlpha(160);
 
                 bool isEnabled = (spinBox->state & State_Enabled);
@@ -2172,13 +2174,13 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
             QColor highlight = option->palette.highlight().color();
 
             QColor titleBarFrameBorder(active ? highlight.darker(180): outline.darker(110));
-            QColor titleBarHighlight(active ? highlight.lighter(120): palette.background().color().lighter(120));
+            QColor titleBarHighlight(active ? highlight.lighter(120): palette.window().color().lighter(120));
             QColor textColor(active ? 0xffffff : 0xff000000);
             QColor textAlphaColor(active ? 0xffffff : 0xff000000 );
 
             {
                 // Fill title bar gradient
-                QColor titlebarColor = QColor(active ? highlight: palette.background().color());
+                QColor titlebarColor = QColor(active ? highlight: palette.window().color());
                 QLinearGradient gradient(option->rect.center().x(), option->rect.top(),
                                          option->rect.center().x(), option->rect.bottom());
 
@@ -2463,7 +2465,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
                     styleObject->setProperty("_q_stylestate", static_cast<QStyle::State::Int>(scrollBar->state));
                     styleObject->setProperty("_q_stylecontrols", static_cast<uint>(scrollBar->activeSubControls));
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
                     // if the scrollbar is transient or its attributes, geometry or
                     // state has changed, the opacity is reset back to 100% opaque
                     opacity = 1.0;
@@ -2481,10 +2483,10 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
                     } else if (anim && anim->mode() == QScrollbarStyleAnimation::Deactivating) {
                         d->stopAnimation(styleObject);
                     }
-#endif // !QT_NO_ANIMATION
+#endif // animation
                 }
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
                 QScrollbarStyleAnimation *anim = qobject_cast<QScrollbarStyleAnimation *>(d->animation(styleObject));
                 if (anim && anim->mode() == QScrollbarStyleAnimation::Deactivating) {
                     // once a scrollbar was active (hovered/pressed), it retains
@@ -2513,7 +2515,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
                     }
                 }
                 painter->setOpacity(opacity);
-#endif // !QT_NO_ANIMATION
+#endif // animation
             }
 
             bool transient = proxy()->styleHint(SH_ScrollBar_Transient, option, widget);
@@ -2529,7 +2531,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
             QColor alphaOutline = outline;
             alphaOutline.setAlpha(180);
 
-            QColor arrowColor = option->palette.foreground().color();
+            QColor arrowColor = option->palette.windowText().color();
             arrowColor.setAlpha(160);
 
             const QColor bgColor = QStyleHelper::backgroundColor(option->palette, widget);
@@ -2743,7 +2745,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
             if (!comboBox->frame)
                 pixmapName += QLatin1String("-frameless");
 
-            if (!QPixmapCache::find(pixmapName, cache)) {
+            if (!QPixmapCache::find(pixmapName, &cache)) {
                 cache = styleCachePixmap(comboBox->rect.size());
                 cache.fill(Qt::transparent);
                 QPainter cachePainter(&cache);
@@ -2850,7 +2852,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
                 QRect pixmapRect(0, 0, groove.width(), groove.height());
 
                 // draw background groove
-                if (!QPixmapCache::find(groovePixmapName, cache)) {
+                if (!QPixmapCache::find(groovePixmapName, &cache)) {
                     cache = styleCachePixmap(pixmapRect.size());
                     cache.fill(Qt::transparent);
                     QPainter groovePainter(&cache);
@@ -2878,7 +2880,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
                 // draw blue groove highlight
                 QRect clipRect;
                 groovePixmapName += QLatin1String("_blue");
-                if (!QPixmapCache::find(groovePixmapName, cache)) {
+                if (!QPixmapCache::find(groovePixmapName, &cache)) {
                     cache = styleCachePixmap(pixmapRect.size());
                     cache.fill(Qt::transparent);
                     QPainter groovePainter(&cache);
@@ -2985,7 +2987,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
             // draw handle
             if ((option->subControls & SC_SliderHandle) ) {
                 QString handlePixmapName = QStyleHelper::uniqueName(QLatin1String("slider_handle"), option, handle.size());
-                if (!QPixmapCache::find(handlePixmapName, cache)) {
+                if (!QPixmapCache::find(handlePixmapName, &cache)) {
                     cache = styleCachePixmap(handle.size());
                     cache.fill(Qt::transparent);
                     QRect pixmapRect(0, 0, handle.width(), handle.height());
@@ -3223,7 +3225,7 @@ QSize QFusionStyle::sizeFromContents(ContentsType type, const QStyleOption *opti
                 QFont fontBold = menuItem->font;
                 fontBold.setBold(true);
                 QFontMetrics fmBold(fontBold);
-                w += fmBold.width(menuItem->text) - fm.horizontalAdvance(menuItem->text);
+                w += fmBold.horizontalAdvance(menuItem->text) - fm.horizontalAdvance(menuItem->text);
             }
             const int checkcol = qMax<int>(maxpmw, QStyleHelper::dpiScaled(QFusionStylePrivate::menuCheckMarkWidth)); // Windows always shows a check column
             w += checkcol;
@@ -3671,7 +3673,7 @@ int QFusionStyle::styleHint(StyleHint hint, const QStyleOption *option, const QW
     case SH_FontDialog_SelectAssociatedText:
     case SH_MenuBar_AltKeyNavigation:
     case SH_ComboBox_ListMouseTracking:
-    case SH_ScrollBar_StopMouseOverSlider:
+    case SH_Slider_StopMouseOverSlider:
     case SH_ScrollBar_MiddleClickAbsolutePosition:
     case SH_EtchDisabledText:
     case SH_TitleBar_AutoRaise:
@@ -3703,7 +3705,7 @@ int QFusionStyle::styleHint(StyleHint hint, const QStyleOption *option, const QW
         return 0;
 
     case SH_Table_GridLineColor:
-        return option ? option->palette.background().color().darker(120).rgb() : 0;
+        return option ? option->palette.window().color().darker(120).rgb() : 0;
 
     case SH_MessageBox_TextInteractionFlags:
         return Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse;
diff --git a/src/widgets/styles/qfusionstyle_p.h b/src/widgets/styles/qfusionstyle_p.h
index e67e792727..cbefe3e1af 100644
--- a/src/widgets/styles/qfusionstyle_p.h
+++ b/src/widgets/styles/qfusionstyle_p.h
@@ -72,28 +72,28 @@ public:
     QPalette standardPalette () const override;
     void drawPrimitive(PrimitiveElement elem,
                        const QStyleOption *option,
-                       QPainter *painter, const QWidget *widget = 0) const override;
+                       QPainter *painter, const QWidget *widget = nullptr) const override;
     void drawControl(ControlElement ce, const QStyleOption *option, QPainter *painter,
                      const QWidget *widget) const override;
-    int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const override;
+    int pixelMetric(PixelMetric metric, const QStyleOption *option = nullptr, const QWidget *widget = nullptr) const override;
     void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option,
                             QPainter *painter, const QWidget *widget) const override;
-    QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const override;
+    QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = nullptr) const override;
     QSize sizeFromContents(ContentsType type, const QStyleOption *option,
                            const QSize &size, const QWidget *widget) const override;
     SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt,
-                                     const QPoint &pt, const QWidget *w = 0) const override;
+                                     const QPoint &pt, const QWidget *w = nullptr) const override;
     QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
                          SubControl sc, const QWidget *widget) const override;
     QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
                                 const QStyleOption *opt) const override;
-    int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0,
-                  QStyleHintReturn *returnData = 0) const override;
+    int styleHint(StyleHint hint, const QStyleOption *option = nullptr, const QWidget *widget = nullptr,
+                  QStyleHintReturn *returnData = nullptr) const override;
     QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const override;
-    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0,
-                       const QWidget *widget = 0) const override;
+    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = nullptr,
+                       const QWidget *widget = nullptr) const override;
     QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt,
-                           const QWidget *widget = 0) const override;
+                           const QWidget *widget = nullptr) const override;
     void drawItemPixmap(QPainter *painter, const QRect &rect,
                         int alignment, const QPixmap &pixmap) const override;
     void drawItemText(QPainter *painter, const QRect &rect,
diff --git a/src/widgets/styles/qfusionstyle_p_p.h b/src/widgets/styles/qfusionstyle_p_p.h
index 169fd9a407..a92041fcfe 100644
--- a/src/widgets/styles/qfusionstyle_p_p.h
+++ b/src/widgets/styles/qfusionstyle_p_p.h
@@ -113,7 +113,7 @@ public:
     QColor outline(const QPalette &pal) const {
         if (pal.window().style() == Qt::TexturePattern)
             return QColor(0, 0, 0, 160);
-        return pal.background().color().darker(140);
+        return pal.window().color().darker(140);
     }
 
     QColor highlightedOutline(const QPalette &pal) const {
diff --git a/src/widgets/styles/qpixmapstyle_p.h b/src/widgets/styles/qpixmapstyle_p.h
index 590434d95e..d32631a527 100644
--- a/src/widgets/styles/qpixmapstyle_p.h
+++ b/src/widgets/styles/qpixmapstyle_p.h
@@ -147,7 +147,7 @@ public:
     void drawControl(ControlElement element, const QStyleOption *option,
             QPainter *painter, const QWidget *widget = nullptr) const override;
     void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *option,
-                            QPainter *painter, const QWidget *widget=0) const override;
+                            QPainter *painter, const QWidget *widget=nullptr) const override;
 
     QSize sizeFromContents(ContentsType type, const QStyleOption *option,
             const QSize &contentsSize, const QWidget *widget = nullptr) const override;
diff --git a/src/widgets/styles/qproxystyle_p.h b/src/widgets/styles/qproxystyle_p.h
index 2343a03e2a..2321f0fed0 100644
--- a/src/widgets/styles/qproxystyle_p.h
+++ b/src/widgets/styles/qproxystyle_p.h
@@ -67,7 +67,7 @@ public:
     void ensureBaseStyle() const;
 private:
     QProxyStylePrivate() :
-    QCommonStylePrivate(), baseStyle(0) {}
+    QCommonStylePrivate(), baseStyle(nullptr) {}
     mutable QPointer <QStyle> baseStyle;
 };
 
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index 8006be8c27..ec5b6df6b3 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -46,6 +46,7 @@
 #include "qstyleoption.h"
 #include "private/qstyle_p.h"
 #include "private/qguiapplication_p.h"
+#include <qpa/qplatformtheme.h>
 #ifndef QT_NO_DEBUG
 #include "qdebug.h"
 #endif
@@ -1971,8 +1972,8 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
 
     \value SH_Widget_Animate Deprecated. Use \l{SH_Widget_Animation_Duration} instead.
 
-    \value SH_Splitter_OpaqueResize Determines if resizing is opaque
-           This enum value has been introduced in Qt 5.2
+    \value SH_Splitter_OpaqueResize Determines if widgets are resized dynamically (opaquely) while
+           interactively moving the splitter. This enum value was introduced in Qt 5.2.
 
     \value SH_TabBar_ChangeCurrentDelay Determines the delay before the current
            tab is changed while dragging over the tabbar, in milliseconds. This
@@ -1998,7 +1999,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
            This enum value has been introduced in Qt 5.10.
 
     \value SH_SpinBox_ButtonsInsideFrame
-           Determnines if the spin box buttons are inside the line edit frame.
+           Determines if the spin box buttons are inside the line edit frame.
            This enum value has been introduced in Qt 5.11.
 
     \value SH_SpinBox_StepModifier
@@ -2447,6 +2448,13 @@ void QStyle::setProxy(QStyle *style)
     d->proxyStyle = style;
 }
 
+//Windows and KDE allow menus to cover the taskbar, while GNOME and macOS don't
+bool QStylePrivate::useFullScreenForPopup()
+{
+    auto theme = QGuiApplicationPrivate::platformTheme();
+    return theme && theme->themeHint(QPlatformTheme::UseFullScreenForPopupMenu).toBool();
+}
+
 QT_END_NAMESPACE
 
 #include "moc_qstyle.cpp"
diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h
index 8256f908db..ee234457f5 100644
--- a/src/widgets/styles/qstyle.h
+++ b/src/widgets/styles/qstyle.h
@@ -141,8 +141,10 @@ public:
         PE_FrameGroupBox,
         PE_FrameLineEdit,
         PE_FrameMenu,
-        PE_FrameStatusBar, // ### Qt 6: remove
-        PE_FrameStatusBarItem = PE_FrameStatusBar,
+        PE_FrameStatusBarItem,
+#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove
+        PE_FrameStatusBar Q_DECL_ENUMERATOR_DEPRECATED = PE_FrameStatusBarItem,
+#endif
         PE_FrameTabWidget,
         PE_FrameWindow,
         PE_FrameButtonBevel,
@@ -162,8 +164,10 @@ public:
         PE_IndicatorArrowUp,
         PE_IndicatorBranch,
         PE_IndicatorButtonDropDown,
-        PE_IndicatorViewItemCheck, // ### Qt 6: remove
-        PE_IndicatorItemViewItemCheck = PE_IndicatorViewItemCheck,
+        PE_IndicatorItemViewItemCheck,
+#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove
+        PE_IndicatorViewItemCheck Q_DECL_ENUMERATOR_DEPRECATED = PE_IndicatorItemViewItemCheck,
+#endif
         PE_IndicatorCheckBox,
         PE_IndicatorDockWidgetResizeHandle,
         PE_IndicatorHeaderArrow,
@@ -309,8 +313,9 @@ public:
         SE_TabWidgetRightCorner,
 
         SE_ItemViewItemCheckIndicator,
-        SE_ViewItemCheckIndicator = SE_ItemViewItemCheckIndicator, // ### Qt 6: remove
-
+#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove
+        SE_ViewItemCheckIndicator Q_DECL_ENUMERATOR_DEPRECATED = SE_ItemViewItemCheckIndicator,
+#endif
         SE_TabBarTearIndicator,
         SE_TabBarTearIndicatorLeft = SE_TabBarTearIndicator,
 
@@ -506,9 +511,11 @@ public:
         PM_DialogButtonsButtonHeight,
 
         PM_MdiSubWindowFrameWidth,
-        PM_MDIFrameWidth = PM_MdiSubWindowFrameWidth,         // ### Qt 6: remove
         PM_MdiSubWindowMinimizedWidth,
-        PM_MDIMinimizedWidth = PM_MdiSubWindowMinimizedWidth, // ### Qt 6: remove
+#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove
+        PM_MDIFrameWidth Q_DECL_ENUMERATOR_DEPRECATED = PM_MdiSubWindowFrameWidth,
+        PM_MDIMinimizedWidth Q_DECL_ENUMERATOR_DEPRECATED = PM_MdiSubWindowMinimizedWidth,
+#endif
 
         PM_HeaderMargin,
         PM_HeaderMarkSize,
@@ -649,7 +656,9 @@ public:
         SH_ComboBox_Popup,
         SH_TitleBar_NoBorder,
         SH_Slider_StopMouseOverSlider,
-        SH_ScrollBar_StopMouseOverSlider = SH_Slider_StopMouseOverSlider, // ### Qt 6: remove
+#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove
+        SH_ScrollBar_StopMouseOverSlider Q_DECL_ENUMERATOR_DEPRECATED = SH_Slider_StopMouseOverSlider,
+#endif
         SH_BlinkCursorWhenTextSelected,
         SH_RichText_FullWidthSelection,
         SH_Menu_Scrollable,
@@ -823,6 +832,13 @@ public:
         SP_MediaVolume,
         SP_MediaVolumeMuted,
         SP_LineEditClearButton,
+        SP_DialogYesToAllButton,
+        SP_DialogNoToAllButton,
+        SP_DialogSaveAllButton,
+        SP_DialogAbortButton,
+        SP_DialogRetryButton,
+        SP_DialogIgnoreButton,
+        SP_RestoreDefaultsButton,
         // do not add any values below/greater than this
         SP_CustomBase = 0xf0000000
     };
diff --git a/src/widgets/styles/qstyle_p.h b/src/widgets/styles/qstyle_p.h
index 94e4540d0b..7942cafaf7 100644
--- a/src/widgets/styles/qstyle_p.h
+++ b/src/widgets/styles/qstyle_p.h
@@ -66,7 +66,10 @@ class QStylePrivate: public QObjectPrivate
     Q_DECLARE_PUBLIC(QStyle)
 public:
     inline QStylePrivate()
-        : layoutSpacingIndex(-1), proxyStyle(0) {}
+        : layoutSpacingIndex(-1), proxyStyle(nullptr) {}
+
+    static bool useFullScreenForPopup();
+
     mutable int layoutSpacingIndex;
     QStyle *proxyStyle;
 };
@@ -96,7 +99,7 @@ inline QPixmap styleCachePixmap(const QSize &size)
     int txType = painter->deviceTransform().type() | painter->worldTransform().type(); \
     bool doPixmapCache = (!option->rect.isEmpty()) \
             && ((txType <= QTransform::TxTranslate) || (painter->deviceTransform().type() == QTransform::TxScale)); \
-    if (doPixmapCache && QPixmapCache::find(unique, internalPixmapCache)) { \
+    if (doPixmapCache && QPixmapCache::find(unique, &internalPixmapCache)) { \
         painter->drawPixmap(option->rect.topLeft(), internalPixmapCache); \
     } else { \
         if (doPixmapCache) { \
diff --git a/src/widgets/styles/qstyleanimation.cpp b/src/widgets/styles/qstyleanimation.cpp
index 0b8e32be19..b9202eae69 100644
--- a/src/widgets/styles/qstyleanimation.cpp
+++ b/src/widgets/styles/qstyleanimation.cpp
@@ -39,8 +39,6 @@
 
 #include "qstyleanimation_p.h"
 
-#ifndef QT_NO_ANIMATION
-
 #include <qcoreapplication.h>
 #include <qwidget.h>
 #include <qevent.h>
@@ -367,5 +365,3 @@ void QScrollbarStyleAnimation::updateCurrentTime(int time)
 QT_END_NAMESPACE
 
 #include "moc_qstyleanimation_p.cpp"
-
-#endif //QT_NO_ANIMATION
diff --git a/src/widgets/styles/qstyleanimation_p.h b/src/widgets/styles/qstyleanimation_p.h
index a2ad4a91da..d28fc6ebab 100644
--- a/src/widgets/styles/qstyleanimation_p.h
+++ b/src/widgets/styles/qstyleanimation_p.h
@@ -45,9 +45,9 @@
 #include "qdatetime.h"
 #include "qimage.h"
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(animation);
 
-#ifndef QT_NO_ANIMATION
+QT_BEGIN_NAMESPACE
 
 //
 //  W A R N I N G
@@ -201,8 +201,6 @@ private:
     bool _active;
 };
 
-#endif // QT_NO_ANIMATION
-
 QT_END_NAMESPACE
 
 #endif // QSTYLEANIMATION_P_H
diff --git a/src/widgets/styles/qstylefactory.cpp b/src/widgets/styles/qstylefactory.cpp
index c959994d2c..b0ce5e52cf 100644
--- a/src/widgets/styles/qstylefactory.cpp
+++ b/src/widgets/styles/qstylefactory.cpp
@@ -77,7 +77,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
 
 /*!
     Creates and returns a QStyle object that matches the given \a key, or
-    returns 0 if no matching style is found.
+    returns \nullptr if no matching style is found.
 
     Both built-in styles and styles from style plugins are queried for a
     matching style.
diff --git a/src/widgets/styles/qstylehelper_p.h b/src/widgets/styles/qstylehelper_p.h
index d79dfe4288..fe052b8984 100644
--- a/src/widgets/styles/qstylehelper_p.h
+++ b/src/widgets/styles/qstylehelper_p.h
@@ -89,11 +89,11 @@ namespace QStyleHelper
     Q_WIDGETS_EXPORT bool isInstanceOf(QObject *obj, QAccessible::Role role);
     Q_WIDGETS_EXPORT bool hasAncestor(QObject *obj, QAccessible::Role role);
 #endif
-    Q_WIDGETS_EXPORT QColor backgroundColor(const QPalette &pal, const QWidget* widget = 0);
+    Q_WIDGETS_EXPORT QColor backgroundColor(const QPalette &pal, const QWidget* widget = nullptr);
 
     enum WidgetSizePolicy { SizeLarge = 0, SizeSmall = 1, SizeMini = 2, SizeDefault = -1 };
 
-    Q_WIDGETS_EXPORT WidgetSizePolicy widgetSizePolicy(const QWidget *w, const QStyleOption *opt = 0);
+    Q_WIDGETS_EXPORT WidgetSizePolicy widgetSizePolicy(const QWidget *w, const QStyleOption *opt = nullptr);
 }
 
 
diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp
index 97631a5841..88031a9f1e 100644
--- a/src/widgets/styles/qstyleoption.cpp
+++ b/src/widgets/styles/qstyleoption.cpp
@@ -3270,7 +3270,7 @@ QStyleOptionViewItem::QStyleOptionViewItem(int version)
     \fn template <typename T> T qstyleoption_cast<T>(const QStyleOption *option)
     \relates QStyleOption
 
-    Returns a T or 0 depending on the \l{QStyleOption::type}{type} and
+    Returns a T or \nullptr depending on the \l{QStyleOption::type}{type} and
     \l{QStyleOption::version}{version} of the given \a option.
 
     Example:
@@ -3285,7 +3285,7 @@ QStyleOptionViewItem::QStyleOptionViewItem(int version)
     \overload
     \relates QStyleOption
 
-    Returns a T or 0 depending on the type of the given \a option.
+    Returns a T or \nullptr depending on the type of the given \a option.
 */
 
 #if QT_CONFIG(tabwidget)
@@ -4006,7 +4006,7 @@ QStyleHintReturnVariant::~QStyleHintReturnVariant()
     \fn template <typename T> T qstyleoption_cast<T>(const QStyleHintReturn *hint)
     \relates QStyleHintReturn
 
-    Returns a T or 0 depending on the \l{QStyleHintReturn::type}{type}
+    Returns a T or \nullptr depending on the \l{QStyleHintReturn::type}{type}
     and \l{QStyleHintReturn::version}{version} of \a hint.
 
     Example:
@@ -4021,7 +4021,7 @@ QStyleHintReturnVariant::~QStyleHintReturnVariant()
     \overload
     \relates QStyleHintReturn
 
-    Returns a T or 0 depending on the type of \a hint.
+    Returns a T or \nullptr depending on the type of \a hint.
 */
 
 #if !defined(QT_NO_DEBUG_STREAM)
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
index f2af8aee32..956c2be3a9 100644
--- a/src/widgets/styles/qstylesheetstyle.cpp
+++ b/src/widgets/styles/qstylesheetstyle.cpp
@@ -85,7 +85,9 @@
 #include <qheaderview.h>
 #endif
 #include <private/qwindowsstyle_p_p.h>
+#if QT_CONFIG(animation)
 #include <private/qstyleanimation_p.h>
+#endif
 #if QT_CONFIG(tabbar)
 #include <qtabbar.h>
 #endif
@@ -849,7 +851,7 @@ QHash<QStyle::SubControl, QRect> QStyleSheetStyle::titleBarLayout(const QWidget
             info.rule = subRule;
             info.offset = offsets[where];
             info.where = where;
-            infos.append(qMove(info));
+            infos.append(std::move(info));
 
             offsets[where] += info.width;
         }
@@ -1642,7 +1644,7 @@ QVector<QCss::StyleRule> QStyleSheetStyle::styleRules(const QObject *obj) const
             if (!parser.parse(&ss)) {
                 parser.init(QLatin1String("* {") + styleSheet + QLatin1Char('}'));
                 if (Q_UNLIKELY(!parser.parse(&ss)))
-                   qWarning("Could not parse stylesheet of object %p", o);
+                   qWarning() << "Could not parse stylesheet of object" << o;
             }
             ss.origin = StyleSheetOrigin_Inline;
             styleSheetCaches->styleSheetCache.insert(o, ss);
@@ -2643,7 +2645,7 @@ void QStyleSheetStyle::setPalette(QWidget *w)
         QRenderRule rule = renderRule(w, PseudoElement_None, map[i].state | extendedPseudoClass(w));
         if (i == 0) {
             if (!w->property("_q_styleSheetWidgetFont").isValid()) {
-                saveWidgetFont(w, w->font());
+                saveWidgetFont(w, w->d_func()->localFont());
             }
             updateStyleSheetFont(w);
             if (ew != w)
@@ -3244,8 +3246,8 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC
 #if QT_CONFIG(scrollbar)
     case CC_ScrollBar:
         if (const QStyleOptionSlider *sb = qstyleoption_cast<const QStyleOptionSlider *>(opt)) {
-            QStyleOptionSlider sbOpt(*sb);
             if (!rule.hasDrawable()) {
+                QStyleOptionSlider sbOpt(*sb);
                 sbOpt.rect = rule.borderRect(opt->rect);
                 rule.drawBackgroundImage(p, opt->rect);
                 baseStyle()->drawComplexControl(cc, &sbOpt, p, w);
@@ -3706,21 +3708,17 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
                     QRenderRule subSubRule = renderRule(w, opt, PseudoElement_MenuCheckMark);
                     QStyleOptionMenuItem newMi = mi;
                     newMi.rect = positionRect(w, subRule, subSubRule, PseudoElement_MenuCheckMark, opt->rect, opt->direction);
-                    checkableOffset = newMi.rect.width();
+                    // align with icons if there are some
+                    checkableOffset = std::max(m->maxIconWidth, newMi.rect.width());
                     if (subSubRule.hasDrawable() || checked)
                         drawPrimitive(PE_IndicatorMenuCheckMark, &newMi, p, w);
                 }
 
-                int iconOffset = 0;
                 if (!mi.icon.isNull()) {
                     QIcon::Mode mode = dis ? QIcon::Disabled : QIcon::Normal;
                     if (act && !dis)
                         mode = QIcon::Active;
-                    QPixmap pixmap;
-                    if (checked)
-                        pixmap = mi.icon.pixmap(pixelMetric(PM_SmallIconSize), mode, QIcon::On);
-                    else
-                        pixmap = mi.icon.pixmap(pixelMetric(PM_SmallIconSize), mode);
+                    const QPixmap pixmap(mi.icon.pixmap(pixelMetric(PM_SmallIconSize), mode, checked ? QIcon::On : QIcon::Off));
                     const int pixw = pixmap.width() / pixmap.devicePixelRatio();
                     const int pixh = pixmap.height() / pixmap.devicePixelRatio();
                     QRenderRule iconRule = renderRule(w, opt, PseudoElement_MenuIcon);
@@ -3739,15 +3737,20 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
                     QRect pmr(0, 0, pixw, pixh);
                     pmr.moveCenter(iconRect.center());
                     p->drawPixmap(pmr.topLeft(), pixmap);
-                    iconOffset = iconRule.geo->width;
                 }
 
+                int textOffset = 0;
+                // padding overrules it all
+                if (!subRule.hasBox() || subRule.box()->paddings[LeftEdge] == 0) {
+                    textOffset = checkableOffset;
+                    if (!m->icon.isNull() || !checkable)
+                        textOffset += m->maxIconWidth;
+                }
                 QRect textRect = subRule.contentsRect(opt->rect);
-                if (opt->direction == Qt::LeftToRight)
-                    textRect.setLeft(textRect.left() + checkableOffset + iconOffset);
-                else
-                    textRect.setRight(textRect.right() - checkableOffset - iconOffset);
+                textRect.setLeft(textRect.left() + textOffset);
                 textRect.setWidth(textRect.width() - mi.tabWidth);
+                const QRect vTextRect = visualRect(opt->direction, m->rect, textRect);
+
                 QStringRef s(&mi.text);
                 p->setPen(mi.palette.buttonText().color());
                 if (!s.isEmpty()) {
@@ -3761,7 +3764,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
                         p->drawText(vShortcutRect, text_flags, s.mid(t + 1).toString());
                         s = s.left(t);
                     }
-                    p->drawText(textRect, text_flags, s.left(t).toString());
+                    p->drawText(vTextRect, text_flags, s.left(t).toString());
                 }
 
                 if (mi.menuItemType == QStyleOptionMenuItem::SubMenu) {// draw sub menu arrow
@@ -4087,6 +4090,11 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
             if (subRule.hasFont)
                 p->setFont(subRule.font);
             boxCopy.rect = subRule.contentsRect(opt->rect);
+            if (subRule.hasImage()) {
+                // the image is already drawn with CE_ToolBoxTabShape, adjust rect here
+                const int iconExtent = proxy()->pixelMetric(QStyle::PM_SmallIconSize, box, w);
+                boxCopy.rect.setLeft(boxCopy.rect.left() + iconExtent);
+            }
             QWindowsStyle::drawControl(ce, &boxCopy, p , w);
             if (subRule.hasFont)
                 p->setFont(oldFont);
@@ -4222,7 +4230,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
 
                 QString titleText = p->fontMetrics().elidedText(dwOpt->title, Qt::ElideRight, r.width());
                 drawItemText(p, r,
-                             alignment | Qt::TextShowMnemonic, dwOpt->palette,
+                             alignment, dwOpt->palette,
                              dwOpt->state & State_Enabled, titleText,
                              QPalette::WindowText);
 
@@ -4296,7 +4304,7 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op
 
     switch (pe) {
 
-    case PE_FrameStatusBar: {
+    case PE_FrameStatusBarItem: {
         QRenderRule subRule = renderRule(w ? w->parentWidget() : nullptr, opt, PseudoElement_Item);
         if (subRule.hasDrawable()) {
             subRule.drawRule(p, opt->rect);
@@ -4317,7 +4325,7 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op
         pseudoElement = PseudoElement_ExclusiveIndicator;
         break;
 
-    case PE_IndicatorViewItemCheck:
+    case PE_IndicatorItemViewItemCheck:
         pseudoElement = PseudoElement_ViewItemIndicator;
         break;
 
@@ -4590,8 +4598,12 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op
         break;
 #if QT_CONFIG(tabbar)
     case PE_IndicatorTabClose:
-        if (w)
+        if (w) {
+            // QMacStyle needs a real widget, not its parent - to implement
+            // 'document mode' properly, drawing nothing if a tab is not hovered.
+            baseStyle()->setProperty("_q_styleSheetRealCloseButton", QVariant::fromValue((void *)w));
             w = w->parentWidget(); //match on the QTabBar instead of the CloseButton
+        }
         pseudoElement = PseudoElement_TabBarTabCloseButton;
 #endif
 
@@ -4609,6 +4621,9 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op
     } else {
         baseStyle()->drawPrimitive(pe, opt, p, w);
     }
+
+    if (baseStyle()->property("_q_styleSheetRealCloseButton").toBool())
+        baseStyle()->setProperty("_q_styleSheetRealCloseButton", QVariant(QVariant::Invalid));
 }
 
 QPixmap QStyleSheetStyle::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap& pixmap,
@@ -5086,10 +5101,11 @@ QSize QStyleSheetStyle::sizeFromContents(ContentsType ct, const QStyleOption *op
                 if (mi->text.contains(QLatin1Char('\t')))
                     sz.rwidth() += 12; //as in QCommonStyle
                 bool checkable = mi->checkType != QStyleOptionMenuItem::NotCheckable;
+                int checkableWidth = 0;
                 if (checkable) {
                     QRenderRule subSubRule = renderRule(w, opt, PseudoElement_MenuCheckMark);
                     QRect checkmarkRect = positionRect(w, subRule, subSubRule, PseudoElement_MenuCheckMark, opt->rect, opt->direction);
-                    sz.rwidth() += checkmarkRect.width();
+                    checkableWidth = std::max(mi->maxIconWidth, checkmarkRect.width());
                 }
                 if (!mi->icon.isNull()) {
                     QPixmap pixmap = mi->icon.pixmap(pixelMetric(PM_SmallIconSize));
@@ -5100,6 +5116,12 @@ QSize QStyleSheetStyle::sizeFromContents(ContentsType ct, const QStyleOption *op
                     const QRect r = fm.boundingRect(QRect(), Qt::TextSingleLine | Qt::TextShowMnemonic, mi->text);
                     sz = sz.expandedTo(r.size());
                 }
+                // padding overrules it all
+                if (!subRule.hasBox() || subRule.box()->paddings[LeftEdge] == 0) {
+                    sz.rwidth() += checkableWidth;
+                    if (!mi->icon.isNull() || !checkable)
+                        sz.rwidth() += mi->maxIconWidth;
+                }
                 return subRule.boxSize(subRule.adjustSize(sz));
             }
         }
@@ -5639,22 +5661,18 @@ QRect QStyleSheetStyle::subControlRect(ComplexControl cc, const QStyleOptionComp
                     } else {
                         sliderlen = maxlen;
                     }
-                    const int sliderPosition = sb->orientation == Qt::Horizontal && sb->direction == Qt::RightToLeft ? sb->maximum - sb->sliderPosition + sb->minimum : sb->sliderPosition;
                     int sliderstart = (styleOptionSlider.orientation == Qt::Horizontal ? contentRect.left() : contentRect.top())
-                        + sliderPositionFromValue(sb->minimum, sb->maximum, sliderPosition,
+                        + sliderPositionFromValue(sb->minimum, sb->maximum, sb->sliderPosition,
                                                   maxlen - sliderlen, sb->upsideDown);
 
                     QRect sr = (sb->orientation == Qt::Horizontal)
                                ? QRect(sliderstart, contentRect.top(), sliderlen, contentRect.height())
                                : QRect(contentRect.left(), sliderstart, contentRect.width(), sliderlen);
-                    if (sc == SC_ScrollBarSlider) {
-                        return sr;
-                    } else if (sc == SC_ScrollBarSubPage) {
-                        return QRect(contentRect.topLeft(), sb->orientation == Qt::Horizontal ? sr.bottomLeft() : sr.topRight());
-                    } else { // SC_ScrollBarAddPage
-                        return QRect(sb->orientation == Qt::Horizontal ? sr.topRight() : sr.bottomLeft(), contentRect.bottomRight());
-                    }
-                    break;
+                    if (sc == SC_ScrollBarSubPage)
+                        sr = QRect(contentRect.topLeft(), sb->orientation == Qt::Horizontal ? sr.bottomLeft() : sr.topRight());
+                    else if (sc == SC_ScrollBarAddPage)
+                        sr = QRect(sb->orientation == Qt::Horizontal ? sr.topRight() : sr.bottomLeft(), contentRect.bottomRight());
+                    return visualRect(styleOptionSlider.direction, grooveRect, sr);
                 }
                 case SC_ScrollBarAddLine: pe = PseudoElement_ScrollBarAddLine; break;
                 case SC_ScrollBarSubLine: pe = PseudoElement_ScrollBarSubLine; break;
@@ -5775,11 +5793,10 @@ QRect QStyleSheetStyle::subElementRect(SubElement se, const QStyleOption *opt, c
     case SE_PushButtonContents:
     case SE_PushButtonFocusRect:
         if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(opt)) {
-            QStyleOptionButton btnOpt(*btn);
             if (rule.hasBox() || !rule.hasNativeBorder())
                 return visualRect(opt->direction, opt->rect, rule.contentsRect(opt->rect));
-            return rule.baseStyleCanDraw() ? baseStyle()->subElementRect(se, &btnOpt, w)
-                                           : QWindowsStyle::subElementRect(se, &btnOpt, w);
+            return rule.baseStyleCanDraw() ? baseStyle()->subElementRect(se, btn, w)
+                                           : QWindowsStyle::subElementRect(se, btn, w);
         }
         break;
 
@@ -6036,7 +6053,7 @@ void QStyleSheetStyle::updateStyleSheetFont(QWidget* w) const
         unsetStyleSheetFont(w);
 
         if (rule.font.resolve()) {
-            QFont wf = w->font();
+            QFont wf = w->d_func()->localFont();
             styleSheetCaches->customFontWidgets.insert(w, {wf, rule.font.resolve()});
 
             QFont font = rule.font.resolve(wf);
@@ -6044,7 +6061,9 @@ void QStyleSheetStyle::updateStyleSheetFont(QWidget* w) const
             w->setFont(font);
         }
     } else {
-        QFont font = rule.font.resolve(w->font());
+        QFont wf = w->d_func()->localFont();
+        QFont font = rule.font.resolve(wf);
+        font.resolve(wf.resolve() | rule.font.resolve());
 
         if ((!w->isWindow() || w->testAttribute(Qt::WA_WindowPropagation))
             && isNaturalChild(w) && qobject_cast<QWidget *>(w->parent())) {
@@ -6052,10 +6071,11 @@ void QStyleSheetStyle::updateStyleSheetFont(QWidget* w) const
             font = font.resolve(static_cast<QWidget *>(w->parent())->font());
         }
 
-        if (w->data->fnt == font)
+        if (wf.resolve() == font.resolve() && wf == font)
             return;
 
         w->data->fnt = font;
+        w->d_func()->directFontResolveMask = font.resolve();
 
         QEvent e(QEvent::FontChange);
         QApplication::sendEvent(w, &e);
diff --git a/src/widgets/styles/qstylesheetstyle_p.h b/src/widgets/styles/qstylesheetstyle_p.h
index d4edb83525..c5266558af 100644
--- a/src/widgets/styles/qstylesheetstyle_p.h
+++ b/src/widgets/styles/qstylesheetstyle_p.h
@@ -82,40 +82,40 @@ public:
     ~QStyleSheetStyle();
 
     void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p,
-                            const QWidget *w = 0) const override;
+                            const QWidget *w = nullptr) const override;
     void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p,
-                     const QWidget *w = 0) const override;
+                     const QWidget *w = nullptr) const override;
     void drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, const QPixmap &pixmap) const override;
     void drawItemText(QPainter *painter, const QRect& rect, int alignment, const QPalette &pal,
               bool enabled, const QString& text, QPalette::ColorRole textRole  = QPalette::NoRole) const override;
     void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p,
-                       const QWidget *w = 0) const override;
+                       const QWidget *w = nullptr) const override;
     QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
                                 const QStyleOption *option) const override;
     SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt,
-                                     const QPoint &pt, const QWidget *w = 0) const override;
+                                     const QPoint &pt, const QWidget *w = nullptr) const override;
     QRect itemPixmapRect(const QRect &rect, int alignment, const QPixmap &pixmap) const override;
     QRect itemTextRect(const QFontMetrics &metrics, const QRect &rect, int alignment, bool enabled,
                        const QString &text) const override;
-    int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const override;
+    int pixelMetric(PixelMetric metric, const QStyleOption *option = nullptr, const QWidget *widget = nullptr) const override;
     void polish(QWidget *widget) override;
     void polish(QApplication *app) override;
     void polish(QPalette &pal) override;
     QSize sizeFromContents(ContentsType ct, const QStyleOption *opt,
-                           const QSize &contentsSize, const QWidget *widget = 0) const override;
+                           const QSize &contentsSize, const QWidget *widget = nullptr) const override;
     QPalette standardPalette() const override;
-    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0,
-                       const QWidget *widget = 0) const override;
-    QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *option = 0,
-                           const QWidget *w = 0 ) const override;
+    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = nullptr,
+                       const QWidget *widget = nullptr) const override;
+    QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *option = nullptr,
+                           const QWidget *w = nullptr ) const override;
     int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2,
-                          Qt::Orientation orientation, const QStyleOption *option = 0,
-                          const QWidget *widget = 0) const override;
-    int styleHint(StyleHint sh, const QStyleOption *opt = 0, const QWidget *w = 0,
-                  QStyleHintReturn *shret = 0) const override;
-    QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const override;
+                          Qt::Orientation orientation, const QStyleOption *option = nullptr,
+                          const QWidget *widget = nullptr) const override;
+    int styleHint(StyleHint sh, const QStyleOption *opt = nullptr, const QWidget *w = nullptr,
+                  QStyleHintReturn *shret = nullptr) const override;
+    QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = nullptr) const override;
     QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc,
-                         const QWidget *w = 0) const override;
+                         const QWidget *w = nullptr) const override;
 
     // These functions are called from QApplication/QWidget. Be careful.
     QStyle *baseStyle() const;
@@ -173,7 +173,7 @@ public:
     static int numinstances;
 
 private:
-    Q_DISABLE_COPY(QStyleSheetStyle)
+    Q_DISABLE_COPY_MOVE(QStyleSheetStyle)
     Q_DECLARE_PRIVATE(QStyleSheetStyle)
 };
 
diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp
index 611de6991f..7b5da9bfa8 100644
--- a/src/widgets/styles/qwindowsstyle.cpp
+++ b/src/widgets/styles/qwindowsstyle.cpp
@@ -86,7 +86,9 @@
 #include <private/qhighdpiscaling_p.h>
 
 #include <private/qstylehelper_p.h>
+#if QT_CONFIG(animation)
 #include <private/qstyleanimation_p.h>
+#endif
 
 #include <algorithm>
 
@@ -246,7 +248,7 @@ void QWindowsStyle::polish(QApplication *app)
     d->activeGradientCaptionColor = app->palette().highlight() .color();
     d->inactiveCaptionColor = app->palette().dark().color();
     d->inactiveGradientCaptionColor = app->palette().dark().color();
-    d->inactiveCaptionText = app->palette().background().color();
+    d->inactiveCaptionText = app->palette().window().color();
 
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) //fetch native title bar colors
     if(app->desktopSettingsAware()){
@@ -552,7 +554,7 @@ int QWindowsStyle::styleHint(StyleHint hint, const QStyleOption *opt, const QWid
     case SH_MenuBar_MouseTracking:
     case SH_Menu_MouseTracking:
     case SH_ComboBox_ListMouseTracking:
-    case SH_ScrollBar_StopMouseOverSlider:
+    case SH_Slider_StopMouseOverSlider:
     case SH_MainWindow_SpaceBelowMenuBar:
         ret = 1;
 
@@ -800,8 +802,10 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
         QPen oldPen = p->pen();
         p->setPen(QPen(opt->palette.shadow().color(), 0));
         QRectF rect = opt->rect;
-        rect.adjust(QStyleHelper::dpiScaled(0.5), QStyleHelper::dpiScaled(0.5),
-                    QStyleHelper::dpiScaled(-1.5), QStyleHelper::dpiScaled(-1.5));
+        const qreal topLevelAdjustment = QStyleHelper::dpiScaled(0.5);
+        const qreal bottomRightAdjustment = QStyleHelper::dpiScaled(-1.5);
+        rect.adjust(topLevelAdjustment, topLevelAdjustment,
+                    bottomRightAdjustment, bottomRightAdjustment);
         p->drawRect(rect);
         p->setPen(oldPen);
         break;
@@ -815,7 +819,7 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
         else if (opt->state & State_Enabled)
             fill = opt->palette.base();
         else
-            fill = opt->palette.background();
+            fill = opt->palette.window();
         p->save();
         doRestore = true;
         qDrawWinPanel(p, opt->rect, opt->palette, true, &fill);
@@ -825,13 +829,13 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
             p->setPen(opt->palette.text().color());
         }
         Q_FALLTHROUGH();
-    case PE_IndicatorViewItemCheck:
+    case PE_IndicatorItemViewItemCheck:
         if (!doRestore) {
             p->save();
             doRestore = true;
         }
 #if QT_CONFIG(itemviews)
-        if (pe == PE_IndicatorViewItemCheck) {
+        if (pe == PE_IndicatorItemViewItemCheck) {
             const QStyleOptionViewItem *itemViewOpt = qstyleoption_cast<const QStyleOptionViewItem *>(opt);
             p->setPen(itemViewOpt
                       && itemViewOpt->showDecorationSelected
@@ -949,14 +953,14 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
             if (frame->lineWidth == 2 || pe == PE_Frame) {
                 QPalette popupPal = frame->palette;
                 if (pe == PE_FrameMenu) {
-                    popupPal.setColor(QPalette::Light, frame->palette.background().color());
+                    popupPal.setColor(QPalette::Light, frame->palette.window().color());
                     popupPal.setColor(QPalette::Midlight, frame->palette.light().color());
                 }
                 if (pe == PE_Frame && (frame->state & State_Raised))
                     qDrawWinButton(p, frame->rect, popupPal, frame->state & State_Sunken);
                 else if (pe == PE_Frame && (frame->state & State_Sunken))
                 {
-                    popupPal.setColor(QPalette::Midlight, frame->palette.background().color());
+                    popupPal.setColor(QPalette::Midlight, frame->palette.window().color());
                     qDrawWinPanel(p, frame->rect, popupPal, frame->state & State_Sunken);
                 }
                 else
@@ -966,7 +970,7 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
             }
         } else {
             QPalette popupPal = opt->palette;
-            popupPal.setColor(QPalette::Light, opt->palette.background().color());
+            popupPal.setColor(QPalette::Light, opt->palette.window().color());
             popupPal.setColor(QPalette::Midlight, opt->palette.light().color());
             qDrawWinPanel(p, opt->rect, popupPal, opt->state & State_Sunken);
         }
@@ -994,7 +998,7 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
         break; }
     case PE_FrameWindow: {
          QPalette popupPal = opt->palette;
-         popupPal.setColor(QPalette::Light, opt->palette.background().color());
+         popupPal.setColor(QPalette::Light, opt->palette.window().color());
          popupPal.setColor(QPalette::Midlight, opt->palette.light().color());
          qDrawWinPanel(p, opt->rect, popupPal, opt->state & State_Sunken);
         break; }
@@ -1313,12 +1317,12 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
                     x2 -= onlyOne || lastTab ? borderThinkness : 0;
                 }
 
-                p->fillRect(QRect(x1 + 1, y1 + 1, (x2 - x1) - 1, (y2 - y1) - 2), tab->palette.background());
+                p->fillRect(QRect(x1 + 1, y1 + 1, (x2 - x1) - 1, (y2 - y1) - 2), tab->palette.window());
 
                 // Delete border
                 if (selected) {
-                    p->fillRect(QRect(x1,y2-1,x2-x1,1), tab->palette.background());
-                    p->fillRect(QRect(x1,y2,x2-x1,1), tab->palette.background());
+                    p->fillRect(QRect(x1,y2-1,x2-x1,1), tab->palette.window());
+                    p->fillRect(QRect(x1,y2,x2-x1,1), tab->palette.window());
                 }
                 // Left
                 if (firstTab || selected || onlyOne || !previousSelected) {
@@ -1349,12 +1353,12 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
                     x2 -= lastTab ? borderThinkness : 0;
                 }
 
-                p->fillRect(QRect(x1 + 1, y1 + 2, (x2 - x1) - 1, (y2 - y1) - 1), tab->palette.background());
+                p->fillRect(QRect(x1 + 1, y1 + 2, (x2 - x1) - 1, (y2 - y1) - 1), tab->palette.window());
 
                 // Delete border
                 if (selected) {
-                    p->fillRect(QRect(x1, y1 + 1, (x2 - 1)-x1, 1), tab->palette.background());
-                    p->fillRect(QRect(x1, y1, (x2 - 1)-x1, 1), tab->palette.background());
+                    p->fillRect(QRect(x1, y1 + 1, (x2 - 1)-x1, 1), tab->palette.window());
+                    p->fillRect(QRect(x1, y1, (x2 - 1)-x1, 1), tab->palette.window());
                 }
                 // Left
                 if (firstTab || selected || onlyOne || !previousSelected) {
@@ -1387,12 +1391,12 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
                     y2 -= lastTab ? borderThinkness : 0;
                 }
 
-                p->fillRect(QRect(x1 + 1, y1 + 1, (x2 - x1) - 2, (y2 - y1) - 1), tab->palette.background());
+                p->fillRect(QRect(x1 + 1, y1 + 1, (x2 - x1) - 2, (y2 - y1) - 1), tab->palette.window());
 
                 // Delete border
                 if (selected) {
-                    p->fillRect(QRect(x2 - 1, y1, 1, y2-y1), tab->palette.background());
-                    p->fillRect(QRect(x2, y1, 1, y2-y1), tab->palette.background());
+                    p->fillRect(QRect(x2 - 1, y1, 1, y2-y1), tab->palette.window());
+                    p->fillRect(QRect(x2, y1, 1, y2-y1), tab->palette.window());
                 }
                 // Top
                 if (firstTab || selected || onlyOne || !previousSelected) {
@@ -1425,12 +1429,12 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
                     y2 -= lastTab ? borderThinkness : 0;
                 }
 
-                p->fillRect(QRect(x1 + 2, y1 + 1, (x2 - x1) - 1, (y2 - y1) - 1), tab->palette.background());
+                p->fillRect(QRect(x1 + 2, y1 + 1, (x2 - x1) - 1, (y2 - y1) - 1), tab->palette.window());
 
                 // Delete border
                 if (selected) {
-                    p->fillRect(QRect(x1 + 1, y1, 1, (y2 - 1)-y1),tab->palette.background());
-                    p->fillRect(QRect(x1, y1, 1, (y2-1)-y1), tab->palette.background());
+                    p->fillRect(QRect(x1 + 1, y1, 1, (y2 - 1)-y1),tab->palette.window());
+                    p->fillRect(QRect(x1, y1, 1, (y2-1)-y1), tab->palette.window());
                 }
                 // Top
                 if (firstTab || selected || onlyOne || !previousSelected) {
@@ -1524,7 +1528,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
                         br = QBrush(paletteBrush.textureImage());
                 } else
                     br = QBrush(opt->palette.light().color(), Qt::Dense4Pattern);
-                p->setBackground(opt->palette.background().color());
+                p->setBackground(opt->palette.window().color());
                 p->setBrush(br);
             }
             p->drawRect(opt->rect);
@@ -1691,7 +1695,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
             }
             QPalette pal2 = pb->palette;
             // Correct the highlight color if it is the same as the background
-            if (pal2.highlight() == pal2.background())
+            if (pal2.highlight() == pal2.window())
                 pal2.setColor(QPalette::Highlight, pb->palette.color(QPalette::Active,
                                                                      QPalette::Highlight));
             bool reverse = ((!vertical && (pb->direction == Qt::RightToLeft)) || vertical);
@@ -1823,7 +1827,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
                                     titleRect.height(), titleRect.width());
                 }
                 proxy()->drawItemText(p, titleRect,
-                            Qt::AlignLeft | Qt::AlignVCenter | Qt::TextShowMnemonic, palette,
+                            Qt::AlignLeft | Qt::AlignVCenter, palette,
                             dwOpt->state & State_Enabled, dwOpt->title,
                             floating ? (active ? QPalette::BrightText : QPalette::Window) : QPalette::WindowText);
                 p->setFont(oldFont);
@@ -1841,7 +1845,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
                 p->setBackground(cb->palette.highlight());
             } else {
                 p->setPen(cb->palette.text().color());
-                p->setBackground(cb->palette.background());
+                p->setBackground(cb->palette.window());
             }
         }
         QCommonStyle::drawControl(ce, opt, p, widget);
@@ -2183,7 +2187,7 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp
 
                 } else {
                     p->setPen(cmb->palette.text().color());
-                    p->setBackground(cmb->palette.background());
+                    p->setBackground(cmb->palette.window());
                 }
 
                 if (cmb->state & State_HasFocus && !cmb->editable) {
diff --git a/src/widgets/styles/qwindowsstyle_p.h b/src/widgets/styles/qwindowsstyle_p.h
index 7993b9f1c6..b5f0bd68a1 100644
--- a/src/widgets/styles/qwindowsstyle_p.h
+++ b/src/widgets/styles/qwindowsstyle_p.h
@@ -77,32 +77,32 @@ public:
     void polish(QPalette &) override;
 
     void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p,
-                       const QWidget *w = 0) const override;
+                       const QWidget *w = nullptr) const override;
     void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p,
-                     const QWidget *w = 0) const override;
-    QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const override;
+                     const QWidget *w = nullptr) const override;
+    QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = nullptr) const override;
     void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p,
-                            const QWidget *w = 0) const override;
+                            const QWidget *w = nullptr) const override;
     QSize sizeFromContents(ContentsType ct, const QStyleOption *opt,
-                           const QSize &contentsSize, const QWidget *widget = 0) const override;
+                           const QSize &contentsSize, const QWidget *widget = nullptr) const override;
 
-    int pixelMetric(PixelMetric pm, const QStyleOption *option = 0, const QWidget *widget = 0) const override;
+    int pixelMetric(PixelMetric pm, const QStyleOption *option = nullptr, const QWidget *widget = nullptr) const override;
 
-    int styleHint(StyleHint hint, const QStyleOption *opt = 0, const QWidget *widget = 0,
-                  QStyleHintReturn *returnData = 0) const override;
+    int styleHint(StyleHint hint, const QStyleOption *opt = nullptr, const QWidget *widget = nullptr,
+                  QStyleHintReturn *returnData = nullptr) const override;
 
     QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt,
-                           const QWidget *widget = 0) const override;
+                           const QWidget *widget = nullptr) const override;
 
-    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0,
-                       const QWidget *widget = 0) const override;
+    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = nullptr,
+                       const QWidget *widget = nullptr) const override;
 
 protected:
     bool eventFilter(QObject *o, QEvent *e) override;
     QWindowsStyle(QWindowsStylePrivate &dd);
 
 private:
-    Q_DISABLE_COPY(QWindowsStyle)
+    Q_DISABLE_COPY_MOVE(QWindowsStyle)
     Q_DECLARE_PRIVATE(QWindowsStyle)
 };
 
diff --git a/src/widgets/styles/qwindowsstyle_p_p.h b/src/widgets/styles/qwindowsstyle_p_p.h
index 67fa6a2f86..e6ea809f11 100644
--- a/src/widgets/styles/qwindowsstyle_p_p.h
+++ b/src/widgets/styles/qwindowsstyle_p_p.h
@@ -69,9 +69,9 @@ public:
     enum { InvalidMetric = -23576 };
 
     QWindowsStylePrivate();
-    static int pixelMetricFromSystemDp(QStyle::PixelMetric pm, const QStyleOption *option = 0, const QWidget *widget = 0);
+    static int pixelMetricFromSystemDp(QStyle::PixelMetric pm, const QStyleOption *option = nullptr, const QWidget *widget = nullptr);
     static int fixedPixelMetric(QStyle::PixelMetric pm);
-    static qreal devicePixelRatio(const QWidget *widget = 0)
+    static qreal devicePixelRatio(const QWidget *widget = nullptr)
         { return widget ? widget->devicePixelRatioF() : QWindowsStylePrivate::appDevicePixelRatio(); }
     static qreal nativeMetricScaleFactor(const QWidget *widget = nullptr);
 
diff --git a/src/widgets/styles/styles.pri b/src/widgets/styles/styles.pri
index 0c0f8b7bc7..be535c1846 100644
--- a/src/widgets/styles/styles.pri
+++ b/src/widgets/styles/styles.pri
@@ -3,7 +3,6 @@
 HEADERS += \
         styles/qdrawutil.h \
         styles/qstyle.h \
-        styles/qstyleanimation_p.h \
         styles/qstylefactory.h \
         styles/qstyleoption.h \
         styles/qstyleplugin.h \
@@ -21,7 +20,6 @@ HEADERS += \
 SOURCES += \
         styles/qdrawutil.cpp \
         styles/qstyle.cpp \
-        styles/qstyleanimation.cpp \
         styles/qstylefactory.cpp \
         styles/qstyleoption.cpp \
         styles/qstyleplugin.cpp \
@@ -35,7 +33,10 @@ SOURCES += \
 
 RESOURCES += styles/qstyle.qrc
 
-include($$OUT_PWD/qtwidgets-config.pri)
+qtConfig(animation) {
+    HEADERS += styles/qstyleanimation_p.h
+    SOURCES += styles/qstyleanimation.cpp
+}
 
 qtConfig(style-windows) {
     HEADERS += styles/qwindowsstyle_p.h styles/qwindowsstyle_p_p.h
diff --git a/src/widgets/util/qcompleter_p.h b/src/widgets/util/qcompleter_p.h
index 765363744b..a52e63a6e2 100644
--- a/src/widgets/util/qcompleter_p.h
+++ b/src/widgets/util/qcompleter_p.h
@@ -75,7 +75,7 @@ class QCompleterPrivate : public QObjectPrivate
 public:
     QCompleterPrivate();
     ~QCompleterPrivate() { delete popup; }
-    void init(QAbstractItemModel *model = 0);
+    void init(QAbstractItemModel *model = nullptr);
 
     QPointer<QWidget> widget;
     QCompletionModel *proxy;
@@ -194,6 +194,7 @@ private:
                      const QIndexMapper& iv, QMatchData* m);
 };
 
+// ### Qt6: QStyledItemDelegate
 class QCompleterItemDelegate : public QItemDelegate
 {
 public:
diff --git a/src/widgets/util/qflickgesture.cpp b/src/widgets/util/qflickgesture.cpp
index b59fe0d504..a8b2a00a80 100644
--- a/src/widgets/util/qflickgesture.cpp
+++ b/src/widgets/util/qflickgesture.cpp
@@ -130,8 +130,6 @@ private:
         , mouseEventSource(Qt::MouseEventNotSynthesized)
     { }
 
-    static PressDelayHandler *inst;
-
 public:
     enum {
         UngrabMouseBefore = 1,
diff --git a/src/widgets/util/qflickgesture_p.h b/src/widgets/util/qflickgesture_p.h
index 74a0f2a0f3..0b47516047 100644
--- a/src/widgets/util/qflickgesture_p.h
+++ b/src/widgets/util/qflickgesture_p.h
@@ -71,14 +71,12 @@ class Q_WIDGETS_EXPORT QFlickGesture : public QGesture
     Q_DECLARE_PRIVATE(QFlickGesture)
 
 public:
-    QFlickGesture(QObject *receiver, Qt::MouseButton button, QObject *parent = 0);
+    QFlickGesture(QObject *receiver, Qt::MouseButton button, QObject *parent = nullptr);
     ~QFlickGesture();
 
     friend class QFlickGestureRecognizer;
 };
 
-class PressDelayHandler;
-
 class QFlickGesturePrivate : public QGesturePrivate
 {
     Q_DECLARE_PUBLIC(QFlickGesture)
@@ -89,7 +87,6 @@ public:
     QScroller *receiverScroller;
     Qt::MouseButton button; // NoButton == Touch
     bool macIgnoreWheel;
-    static PressDelayHandler *pressDelayHandler;
 };
 
 class QFlickGestureRecognizer : public QGestureRecognizer
diff --git a/src/widgets/util/qscroller.cpp b/src/widgets/util/qscroller.cpp
index 28504f5631..1e84237253 100644
--- a/src/widgets/util/qscroller.cpp
+++ b/src/widgets/util/qscroller.cpp
@@ -191,7 +191,7 @@ static qreal progressForValue(const QEasingCurve &curve, qreal value)
 }
 
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
 class QScrollTimer : public QAbstractAnimation
 {
 public:
@@ -230,7 +230,7 @@ private:
     bool ignoreUpdate;
     int skip;
 };
-#endif // QT_NO_ANIMATION
+#endif // animation
 
 /*!
     \class QScroller
@@ -249,18 +249,11 @@ private:
     scrolling speed and takes care of updates.
     QScroller can be triggered by a flick gesture
 
-    \code
-        QWidget *w = ...;
-        QScroller::grabGesture(w, QScroller::LeftMouseButtonGesture);
-    \endcode
+    \snippet code/src_widgets_util_qscroller.cpp 0
 
     or directly like this:
 
-    \code
-        QWidget *w = ...;
-        QScroller *scroller = QScroller::scroller(w);
-        scroller->scrollTo(QPointF(100, 100));
-    \endcode
+    \snippet code/src_widgets_util_qscroller.cpp 1
 
     The scrolled QObjects receive a QScrollPrepareEvent whenever the scroller needs to
     update its geometry information and a QScrollEvent whenever the content of the object should
@@ -495,6 +488,7 @@ QScroller::QScroller(QObject *target)
     : d_ptr(new QScrollerPrivate(this, target))
 {
     Q_ASSERT(target); // you can't create a scroller without a target in any normal way
+    setParent(target);
     Q_D(QScroller);
     d->init();
 }
@@ -896,7 +890,7 @@ QScrollerPrivate::QScrollerPrivate(QScroller *q, QObject *_target)
     , snapIntervalX(0.0)
     , snapFirstY(-1.0)
     , snapIntervalY(0.0)
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     , scrollTimer(new QScrollTimer(this))
 #endif
     , q_ptr(q)
@@ -938,7 +932,7 @@ const char *QScrollerPrivate::inputName(QScroller::Input input)
 
 void QScrollerPrivate::targetDestroyed()
 {
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     scrollTimer->stop();
 #endif
     delete q_ptr;
@@ -966,7 +960,7 @@ void QScrollerPrivate::timerTick()
         }
     }
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     scrollTimer->stop();
 #endif
 }
@@ -1690,7 +1684,7 @@ void QScrollerPrivate::setState(QScroller::State newstate)
 
     switch (newstate) {
     case QScroller::Inactive:
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
         scrollTimer->stop();
 #endif
 
@@ -1702,7 +1696,7 @@ void QScrollerPrivate::setState(QScroller::State newstate)
         break;
 
     case QScroller::Pressed:
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
         scrollTimer->stop();
 #endif
 
@@ -1712,14 +1706,14 @@ void QScrollerPrivate::setState(QScroller::State newstate)
 
     case QScroller::Dragging:
         dragDistance = QPointF(0, 0);
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
         if (state == QScroller::Pressed)
             scrollTimer->start();
 #endif
         break;
 
     case QScroller::Scrolling:
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
         scrollTimer->start();
 #endif
         break;
@@ -1732,10 +1726,12 @@ void QScrollerPrivate::setState(QScroller::State newstate)
         sendEvent(target, &se);
         firstScroll = true;
     }
-    if (state == QScroller::Dragging || state == QScroller::Scrolling)
-        qt_activeScrollers()->push_back(q);
-    else
+    if (state == QScroller::Dragging || state == QScroller::Scrolling) {
+        if (!qt_activeScrollers()->contains(q))
+            qt_activeScrollers()->push_back(q);
+    } else {
         qt_activeScrollers()->removeOne(q);
+    }
     emit q->stateChanged(state);
 }
 
diff --git a/src/widgets/util/qscroller_p.h b/src/widgets/util/qscroller_p.h
index 5e0c359514..13e2032a5c 100644
--- a/src/widgets/util/qscroller_p.h
+++ b/src/widgets/util/qscroller_p.h
@@ -64,7 +64,9 @@
 #include <qscroller.h>
 #include <qscrollerproperties.h>
 #include <private/qscrollerproperties_p.h>
+#if QT_CONFIG(animation)
 #include <QAbstractAnimation>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -72,7 +74,7 @@ QT_BEGIN_NAMESPACE
 class QFlickGestureRecognizer;
 #endif
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
 class QScrollTimer;
 #endif
 class QScrollerPrivate : public QObject
@@ -196,7 +198,7 @@ public:
     QElapsedTimer monotonicTimer;
 
     QPointF releaseVelocity; // the starting velocity of the scrolling state
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     QScrollTimer *scrollTimer;
 #endif
 
diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
index d15f5e5955..a38a50d3df 100644
--- a/src/widgets/util/qsystemtrayicon.cpp
+++ b/src/widgets/util/qsystemtrayicon.cpp
@@ -574,7 +574,7 @@ QBalloonTip::QBalloonTip(const QIcon &icon, const QString &title,
     layout->addWidget(msgLabel, 1, 0, 1, 3);
 #endif
     layout->setSizeConstraint(QLayout::SetFixedSize);
-    layout->setMargin(3);
+    layout->setContentsMargins(3, 3, 3, 3);
     setLayout(layout);
 
     QPalette pal = palette();
diff --git a/src/widgets/util/qundogroup.cpp b/src/widgets/util/qundogroup.cpp
index f9605c7a2f..9bd63d4232 100644
--- a/src/widgets/util/qundogroup.cpp
+++ b/src/widgets/util/qundogroup.cpp
@@ -242,7 +242,7 @@ void QUndoGroup::setActiveStack(QUndoStack *stack)
     Returns the active stack of this group.
 
     If none of the stacks are active, or if the group is empty, this function
-    returns 0.
+    returns \nullptr.
 
     \sa setActiveStack(), QUndoStack::setActive()
 */
diff --git a/src/widgets/util/qundostack.cpp b/src/widgets/util/qundostack.cpp
index e928b9fe37..8788c42252 100644
--- a/src/widgets/util/qundostack.cpp
+++ b/src/widgets/util/qundostack.cpp
@@ -102,9 +102,9 @@ QT_BEGIN_NAMESPACE
 /*!
     Constructs a QUndoCommand object with the given \a parent and \a text.
 
-    If \a parent is not 0, this command is appended to parent's child list.
-    The parent command then owns this command and will delete it in its
-    destructor.
+    If \a parent is not \nullptr, this command is appended to parent's
+    child list. The parent command then owns this command and will delete
+    it in its destructor.
 
     \sa ~QUndoCommand()
 */
@@ -118,9 +118,9 @@ QUndoCommand::QUndoCommand(const QString &text, QUndoCommand *parent)
 /*!
     Constructs a QUndoCommand object with parent \a parent.
 
-    If \a parent is not 0, this command is appended to parent's child list.
-    The parent command then owns this command and will delete it in its
-    destructor.
+    If \a parent is not \nullptr, this command is appended to parent's
+    child list. The parent command then owns this command and will delete
+    it in its destructor.
 
     \sa ~QUndoCommand()
 */
diff --git a/src/widgets/util/qundostack_p.h b/src/widgets/util/qundostack_p.h
index 04bc381114..05c9e0d27e 100644
--- a/src/widgets/util/qundostack_p.h
+++ b/src/widgets/util/qundostack_p.h
@@ -80,7 +80,7 @@ class QUndoStackPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QUndoStack)
 public:
-    QUndoStackPrivate() : index(0), clean_index(0), group(0), undo_limit(0) {}
+    QUndoStackPrivate() : index(0), clean_index(0), group(nullptr), undo_limit(0) {}
 
     QList<QUndoCommand*> command_list;
     QList<QUndoCommand*> macro_stack;
@@ -98,7 +98,7 @@ class QUndoAction : public QAction
 {
     Q_OBJECT
 public:
-    explicit QUndoAction(const QString &prefix, QObject *parent = 0);
+    explicit QUndoAction(const QString &prefix, QObject *parent = nullptr);
     void setTextFormat(const QString &textFormat, const QString &defaultText);
 public Q_SLOTS:
     void setPrefixedText(const QString &text);
diff --git a/src/widgets/util/qundoview.cpp b/src/widgets/util/qundoview.cpp
index 31f6c0dff2..c862cbcea5 100644
--- a/src/widgets/util/qundoview.cpp
+++ b/src/widgets/util/qundoview.cpp
@@ -412,7 +412,7 @@ void QUndoView::setGroup(QUndoGroup *group)
 /*!
     Returns the group displayed by this view.
 
-    If the view is not looking at group, this function returns 0.
+    If the view is not looking at group, this function returns \nullptr.
 
     \sa setGroup(), setStack()
 */
diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro
index e556cb8b10..6f807e1696 100644
--- a/src/widgets/widgets.pro
+++ b/src/widgets/widgets.pro
@@ -32,8 +32,6 @@ qtConfig(graphicseffect) {
 
 QMAKE_LIBS += $$QMAKE_LIBS_GUI
 
-contains(DEFINES,QT_EVAL):include($$QT_SOURCE_TREE/src/corelib/eval.pri)
-
 QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtWidgets.dynlist
 
 # Code coverage with TestCocoon
diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp
index 5854472ff0..f30a3bc7b8 100644
--- a/src/widgets/widgets/qabstractbutton.cpp
+++ b/src/widgets/widgets/qabstractbutton.cpp
@@ -805,7 +805,7 @@ bool QAbstractButton::autoExclusive() const
   Returns the group that this button belongs to.
 
   If the button is not a member of any QButtonGroup, this function
-  returns 0.
+  returns \nullptr.
 
   \sa QButtonGroup
 */
diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp
index fd5d7d8069..5ea8330db2 100644
--- a/src/widgets/widgets/qabstractscrollarea.cpp
+++ b/src/widgets/widgets/qabstractscrollarea.cpp
@@ -185,7 +185,7 @@ QAbstractScrollAreaScrollBarContainer::QAbstractScrollAreaScrollBarContainer(Qt:
      orientation(orientation)
 {
     setLayout(layout);
-    layout->setMargin(0);
+    layout->setContentsMargins(QMargins());
     layout->setSpacing(0);
     layout->addWidget(scrollBar);
     layout->setSizeConstraint(QLayout::SetMaximumSize);
@@ -820,7 +820,7 @@ QWidget *QAbstractScrollArea::cornerWidget() const
 
     All widgets set here will be deleted by the scroll area when it is
     destroyed unless you separately reparent the widget after setting
-    some other corner widget (or 0).
+    some other corner widget (or \nullptr).
 
     Any \e newly set widget should have no current parent.
 
diff --git a/src/widgets/widgets/qabstractslider.cpp b/src/widgets/widgets/qabstractslider.cpp
index 99ee1eccb7..2172ebc99c 100644
--- a/src/widgets/widgets/qabstractslider.cpp
+++ b/src/widgets/widgets/qabstractslider.cpp
@@ -829,7 +829,6 @@ void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
             break;
 #endif
 
-        // It seems we need to use invertedAppearance for Left and right, otherwise, things look weird.
         case Qt::Key_Left:
 #ifdef QT_KEYPAD_NAVIGATION
             // In QApplication::KeypadNavigationDirectional, we want to change the slider
@@ -848,9 +847,9 @@ void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
             else
 #endif
             if (isRightToLeft())
-                action = d->invertedAppearance ? SliderSingleStepSub : SliderSingleStepAdd;
+                action = d->invertedControls ? SliderSingleStepSub : SliderSingleStepAdd;
             else
-                action = !d->invertedAppearance ? SliderSingleStepSub : SliderSingleStepAdd;
+                action = !d->invertedControls ? SliderSingleStepSub : SliderSingleStepAdd;
             break;
         case Qt::Key_Right:
 #ifdef QT_KEYPAD_NAVIGATION
@@ -868,9 +867,9 @@ void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
             else
 #endif
             if (isRightToLeft())
-                action = d->invertedAppearance ? SliderSingleStepAdd : SliderSingleStepSub;
+                action = d->invertedControls ? SliderSingleStepAdd : SliderSingleStepSub;
             else
-                action = !d->invertedAppearance ? SliderSingleStepAdd : SliderSingleStepSub;
+                action = !d->invertedControls ? SliderSingleStepAdd : SliderSingleStepSub;
             break;
         case Qt::Key_Up:
 #ifdef QT_KEYPAD_NAVIGATION
diff --git a/src/widgets/widgets/qabstractslider_p.h b/src/widgets/widgets/qabstractslider_p.h
index 419ce2ba07..1b8c76c7ec 100644
--- a/src/widgets/widgets/qabstractslider_p.h
+++ b/src/widgets/widgets/qabstractslider_p.h
@@ -134,7 +134,7 @@ public:
     inline void setAdjustedSliderPosition(int position)
     {
         Q_Q(QAbstractSlider);
-        if (q->style()->styleHint(QStyle::SH_Slider_StopMouseOverSlider, 0, q)) {
+        if (q->style()->styleHint(QStyle::SH_Slider_StopMouseOverSlider, nullptr, q)) {
             if ((position > pressValue - 2 * pageStep) && (position < pressValue + 2 * pageStep)) {
                 repeatAction = QAbstractSlider::SliderNoAction;
                 q->setSliderPosition(pressValue);
diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp
index 1eafb73ba8..c617525c45 100644
--- a/src/widgets/widgets/qabstractspinbox.cpp
+++ b/src/widgets/widgets/qabstractspinbox.cpp
@@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE
     \li \l alignment: The alignment of the text in the QAbstractSpinBox.
 
     \li \l wrapping: Whether the QAbstractSpinBox wraps from the
-    minimum value to the maximum value and vica versa.
+    minimum value to the maximum value and vice versa.
 
     \endlist
 
@@ -252,7 +252,7 @@ QString QAbstractSpinBox::text() const
 
     All values are displayed with the prefix and suffix (if set), \e
     except for the special value, which only shows the special value
-    text. This special text is passed in the QSpinBox::valueChanged()
+    text. This special text is passed in the QSpinBox::textChanged()
     signal that passes a QString.
 
     To turn off the special-value text display, call this function
@@ -285,7 +285,7 @@ void QAbstractSpinBox::setSpecialValueText(const QString &specialValueText)
     \brief whether the spin box is circular.
 
     If wrapping is true stepping up from maximum() value will take you
-    to the minimum() value and vica versa. Wrapping only make sense if
+    to the minimum() value and vice versa. Wrapping only make sense if
     you have minimum() and maximum() values set.
 
     \snippet code/src_gui_widgets_qabstractspinbox.cpp 0
@@ -342,18 +342,18 @@ void QAbstractSpinBox::setReadOnly(bool enable)
     \since 4.3
 
     If keyboard tracking is enabled (the default), the spinbox
-    emits the valueChanged() signal while the new value is being
-    entered from the keyboard.
+    emits the valueChanged() and textChanged() signals while the
+    new value is being entered from the keyboard.
 
     E.g. when the user enters the value 600 by typing 6, 0, and 0,
     the spinbox emits 3 signals with the values 6, 60, and 600
     respectively.
 
     If keyboard tracking is disabled, the spinbox doesn't emit the
-    valueChanged() signal while typing. It emits the signal later,
-    when the return key is pressed, when keyboard focus is lost, or
-    when other spinbox functionality is used, e.g. pressing an arrow
-    key.
+    valueChanged() and textChanged() signals while typing. It emits
+    the signals later, when the return key is pressed, when keyboard
+    focus is lost, or when other spinbox functionality is used, e.g.
+    pressing an arrow key.
 */
 
 bool QAbstractSpinBox::keyboardTracking() const
@@ -688,11 +688,11 @@ QLineEdit *QAbstractSpinBox::lineEdit() const
     \fn void QAbstractSpinBox::setLineEdit(QLineEdit *lineEdit)
 
     Sets the line edit of the spinbox to be \a lineEdit instead of the
-    current line edit widget. \a lineEdit can not be 0.
+    current line edit widget. \a lineEdit cannot be \nullptr.
 
     QAbstractSpinBox takes ownership of the new lineEdit
 
-    If QLineEdit::validator() for the \a lineEdit returns 0, the internal
+    If QLineEdit::validator() for the \a lineEdit returns \nullptr, the internal
     validator of the spinbox will be set on the line edit.
 */
 
@@ -2030,8 +2030,8 @@ QVariant operator+(const QVariant &arg1, const QVariant &arg2)
 #if QT_CONFIG(datetimeparser)
     case QVariant::DateTime: {
         QDateTime a2 = arg2.toDateTime();
-        QDateTime a1 = arg1.toDateTime().addDays(QDATETIMEEDIT_DATETIME_MIN.daysTo(a2));
-        a1.setTime(a1.time().addMSecs(QTime().msecsTo(a2.time())));
+        QDateTime a1 = arg1.toDateTime().addDays(QDATETIMEEDIT_DATE_MIN.daysTo(a2.date()));
+        a1.setTime(a1.time().addMSecs(a2.time().msecsSinceStartOfDay()));
         ret = QVariant(a1);
         break;
     }
@@ -2093,11 +2093,11 @@ QVariant operator*(const QVariant &arg1, double multiplier)
 #if QT_CONFIG(datetimeparser)
     case QVariant::DateTime: {
         double days = QDATETIMEEDIT_DATE_MIN.daysTo(arg1.toDateTime().date()) * multiplier;
-        int daysInt = (int)days;
+        const qint64 daysInt = qint64(days);
         days -= daysInt;
-        long msecs = (long)((QDATETIMEEDIT_TIME_MIN.msecsTo(arg1.toDateTime().time()) * multiplier)
-                            + (days * (24 * 3600 * 1000)));
-        ret = QDateTime(QDate().addDays(int(days)), QTime().addMSecs(msecs));
+        qint64 msecs = qint64(arg1.toDateTime().time().msecsSinceStartOfDay() * multiplier
+                              + days * (24 * 3600 * 1000));
+        ret = QDateTime(QDATETIMEEDIT_DATE_MIN.addDays(daysInt), QTime::fromMSecsSinceStartOfDay(msecs));
         break;
     }
 #endif // datetimeparser
@@ -2127,8 +2127,8 @@ double operator/(const QVariant &arg1, const QVariant &arg2)
     case QVariant::DateTime:
         a1 = QDATETIMEEDIT_DATE_MIN.daysTo(arg1.toDate());
         a2 = QDATETIMEEDIT_DATE_MIN.daysTo(arg2.toDate());
-        a1 += (double)QDATETIMEEDIT_TIME_MIN.msecsTo(arg1.toDateTime().time()) / (long)(3600 * 24 * 1000);
-        a2 += (double)QDATETIMEEDIT_TIME_MIN.msecsTo(arg2.toDateTime().time()) / (long)(3600 * 24 * 1000);
+        a1 += arg1.toDateTime().time().msecsSinceStartOfDay() / (36e5 * 24);
+        a2 += arg2.toDateTime().time().msecsSinceStartOfDay() / (36e5 * 24);
         break;
 #endif // datetimeparser
     default: break;
diff --git a/src/widgets/widgets/qabstractspinbox_p.h b/src/widgets/widgets/qabstractspinbox_p.h
index fce88e43f4..ad169fde19 100644
--- a/src/widgets/widgets/qabstractspinbox_p.h
+++ b/src/widgets/widgets/qabstractspinbox_p.h
@@ -97,7 +97,7 @@ public:
     void init();
     void reset();
     void updateState(bool up, bool fromKeyboard = false);
-    QString stripped(const QString &text, int *pos = 0) const;
+    QString stripped(const QString &text, int *pos = nullptr) const;
     bool specialValue() const;
     virtual QVariant getZeroVariant() const;
     virtual void setRange(const QVariant &min, const QVariant &max);
diff --git a/src/widgets/widgets/qbuttongroup.cpp b/src/widgets/widgets/qbuttongroup.cpp
index fa1ccd347f..669faa92c7 100644
--- a/src/widgets/widgets/qbuttongroup.cpp
+++ b/src/widgets/widgets/qbuttongroup.cpp
@@ -291,8 +291,8 @@ QList<QAbstractButton*> QButtonGroup::buttons() const
 }
 
 /*!
-    Returns the button group's checked button, or 0 if no buttons are
-    checked.
+    Returns the button group's checked button, or \nullptr if no
+    buttons are checked.
 
     \sa buttonClicked()
 */
@@ -305,8 +305,8 @@ QAbstractButton *QButtonGroup::checkedButton() const
 /*!
     \since 4.1
 
-    Returns the button with the specified \a id, or 0 if no such button
-    exists.
+    Returns the button with the specified \a id, or \nullptr if no
+    such button exists.
 */
 QAbstractButton *QButtonGroup::button(int id) const
 {
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp
index 4946969360..510b34cb18 100644
--- a/src/widgets/widgets/qcalendarwidget.cpp
+++ b/src/widgets/widgets/qcalendarwidget.cpp
@@ -827,9 +827,9 @@ class StaticDayOfWeekAssociativeArray {
     bool contained[7];
     T data[7];
 
-    static Q_DECL_CONSTEXPR int day2idx(Qt::DayOfWeek day) Q_DECL_NOTHROW { return int(day) - 1; } // alt: day % 7
+    static Q_DECL_CONSTEXPR int day2idx(Qt::DayOfWeek day) noexcept { return int(day) - 1; } // alt: day % 7
 public:
-    Q_DECL_CONSTEXPR StaticDayOfWeekAssociativeArray() Q_DECL_NOEXCEPT_EXPR(noexcept(T()))
+    Q_DECL_CONSTEXPR StaticDayOfWeekAssociativeArray() noexcept(noexcept(T()))
 #ifdef Q_COMPILER_CONSTEXPR
         : contained{}, data{}   // arrays require uniform initialization
 #else
@@ -837,17 +837,17 @@ public:
 #endif
     {}
 
-    Q_DECL_CONSTEXPR bool contains(Qt::DayOfWeek day) const Q_DECL_NOTHROW { return contained[day2idx(day)]; }
-    Q_DECL_CONSTEXPR const T &value(Qt::DayOfWeek day) const Q_DECL_NOTHROW { return data[day2idx(day)]; }
+    Q_DECL_CONSTEXPR bool contains(Qt::DayOfWeek day) const noexcept { return contained[day2idx(day)]; }
+    Q_DECL_CONSTEXPR const T &value(Qt::DayOfWeek day) const noexcept { return data[day2idx(day)]; }
 
-    Q_DECL_RELAXED_CONSTEXPR T &operator[](Qt::DayOfWeek day) Q_DECL_NOTHROW
+    Q_DECL_RELAXED_CONSTEXPR T &operator[](Qt::DayOfWeek day) noexcept
     {
         const int idx = day2idx(day);
         contained[idx] = true;
         return data[idx];
     }
 
-    Q_DECL_RELAXED_CONSTEXPR void insert(Qt::DayOfWeek day, T v) Q_DECL_NOTHROW
+    Q_DECL_RELAXED_CONSTEXPR void insert(Qt::DayOfWeek day, T v) noexcept
     {
         operator[](day).swap(v);
     }
@@ -1178,9 +1178,9 @@ QVariant QCalendarModel::data(const QModelIndex &index, int role) const
     }
 
     QTextCharFormat fmt = formatForCell(row, column);
-    if (role == Qt::BackgroundColorRole)
+    if (role == Qt::BackgroundRole)
         return fmt.background().color();
-    if (role == Qt::TextColorRole)
+    if (role == Qt::ForegroundRole)
         return fmt.foreground().color();
     if (role == Qt::FontRole)
         return fmt.font();
@@ -1555,6 +1555,7 @@ void QCalendarView::mouseReleaseEvent(QMouseEvent *event)
     }
 }
 
+// ### Qt6: QStyledItemDelegate
 class QCalendarDelegate : public QItemDelegate
 {
     Q_OBJECT
@@ -1777,7 +1778,7 @@ void QCalendarWidgetPrivate::createNavigationBar(QWidget *widget)
     spaceHolder = new QSpacerItem(0,0);
 
     QHBoxLayout *headerLayout = new QHBoxLayout;
-    headerLayout->setMargin(0);
+    headerLayout->setContentsMargins(QMargins());
     headerLayout->setSpacing(0);
     headerLayout->addWidget(prevMonth);
     headerLayout->insertStretch(headerLayout->count());
@@ -2100,7 +2101,7 @@ QCalendarWidget::QCalendarWidget(QWidget *parent)
     setBackgroundRole(QPalette::Window);
 
     QVBoxLayout *layoutV = new QVBoxLayout(this);
-    layoutV->setMargin(0);
+    layoutV->setContentsMargins(QMargins());
     d->m_model = new QCalendarModel(this);
     QTextCharFormat fmt;
     fmt.setForeground(QBrush(Qt::red));
@@ -2147,7 +2148,7 @@ QCalendarWidget::QCalendarWidget(QWidget *parent)
     connect(d->yearEdit, SIGNAL(editingFinished()),
             this, SLOT(_q_yearEditingFinished()));
 
-    layoutV->setMargin(0);
+    layoutV->setContentsMargins(QMargins());
     layoutV->setSpacing(0);
     layoutV->addWidget(d->navBarBackground);
     layoutV->addWidget(d->m_view);
@@ -3063,19 +3064,22 @@ bool QCalendarWidget::eventFilter(QObject *watched, QEvent *event)
 {
     Q_D(QCalendarWidget);
     if (event->type() == QEvent::MouseButtonPress && d->yearEdit->hasFocus()) {
+        // We can get filtered press events that were intended for Qt Virtual Keyboard's
+        // input panel (QQuickView), so we have to make sure that the window is indeed a QWidget - no static_cast.
+        // In addition, as we have a event filter on the whole application we first make sure that the top level widget
+        // of both this and the watched widget are the same to decide if we should finish the year edition.
         QWidget *tlw = window();
-        QWidget *widget = static_cast<QWidget*>(watched);
-        //as we have a event filter on the whole application we first make sure that the top level widget
-        //of both this and the watched widget are the same to decide if we should finish the year edition.
-        if (widget->window() == tlw) {
-            QPoint mousePos = widget->mapTo(tlw, static_cast<QMouseEvent *>(event)->pos());
-            QRect geom = QRect(d->yearEdit->mapTo(tlw, QPoint(0, 0)), d->yearEdit->size());
-            if (!geom.contains(mousePos)) {
-                event->accept();
-                d->_q_yearEditingFinished();
-                setFocus();
-                return true;
-            }
+        QWidget *widget = qobject_cast<QWidget *>(watched);
+        if (!widget || widget->window() != tlw)
+            return QWidget::eventFilter(watched, event);
+
+        QPoint mousePos = widget->mapTo(tlw, static_cast<QMouseEvent *>(event)->pos());
+        QRect geom = QRect(d->yearEdit->mapTo(tlw, QPoint(0, 0)), d->yearEdit->size());
+        if (!geom.contains(mousePos)) {
+            event->accept();
+            d->_q_yearEditingFinished();
+            setFocus();
+            return true;
         }
     }
     return QWidget::eventFilter(watched, event);
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index 645b1a8c9e..17090efb56 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -80,6 +80,7 @@
 #if QT_CONFIG(effects)
 # include <private/qeffects_p.h>
 #endif
+#include <private/qstyle_p.h>
 #ifndef QT_NO_ACCESSIBILITY
 #include "qaccessible.h"
 #endif
@@ -166,7 +167,7 @@ QStyleOptionMenuItem QComboMenuDelegate::getStyleOption(const QStyleOptionViewIt
         break;
     }
     if (index.data(Qt::BackgroundRole).canConvert<QBrush>()) {
-        menuOption.palette.setBrush(QPalette::All, QPalette::Background,
+        menuOption.palette.setBrush(QPalette::All, QPalette::Window,
                                     qvariant_cast<QBrush>(index.data(Qt::BackgroundRole)));
     }
     menuOption.text = index.model()->data(index, Qt::DisplayRole).toString()
@@ -261,16 +262,11 @@ void QComboBoxPrivate::_q_modelDestroyed()
     model = QAbstractItemModelPrivate::staticEmptyModel();
 }
 
-
-//Windows and KDE allows menus to cover the taskbar, while GNOME and Mac don't
 QRect QComboBoxPrivate::popupGeometry(int screen) const
 {
-    bool useFullScreenForPopupMenu = false;
-    if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme())
-        useFullScreenForPopupMenu = theme->themeHint(QPlatformTheme::UseFullScreenForPopupMenu).toBool();
-    return useFullScreenForPopupMenu ?
-           QDesktopWidgetPrivate::screenGeometry(screen) :
-           QDesktopWidgetPrivate::availableGeometry(screen);
+    return QStylePrivate::useFullScreenForPopup()
+        ? QDesktopWidgetPrivate::screenGeometry(screen)
+        : QDesktopWidgetPrivate::availableGeometry(screen);
 }
 
 bool QComboBoxPrivate::updateHoverControl(const QPoint &pos)
@@ -472,7 +468,7 @@ QComboBoxPrivateContainer::QComboBoxPrivateContainer(QAbstractItemView *itemView
     // we need a vertical layout
     QBoxLayout *layout =  new QBoxLayout(QBoxLayout::TopToBottom, this);
     layout->setSpacing(0);
-    layout->setMargin(0);
+    layout->setContentsMargins(QMargins());
 
     // set item view
     setItemView(itemView);
@@ -895,14 +891,21 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
     currentIndex was reset.
 */
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \fn void QComboBox::currentIndexChanged(const QString &text)
     \since 4.1
 
+    \obsolete
+
+    Use currentTextChanged(const QString &) or currentIndexChanged(int)
+    instead.
+
     This signal is sent whenever the currentIndex in the combobox
     changes either through user interaction or programmatically.  The
     item's \a text is passed.
 */
+#endif
 
 /*!
     \fn void QComboBox::currentTextChanged(const QString &text)
@@ -1357,7 +1360,13 @@ void QComboBoxPrivate::emitActivated(const QModelIndex &index)
         return;
     QString text(itemText(index));
     emit q->activated(index.row());
+    emit q->textActivated(text);
+#if QT_DEPRECATED_SINCE(5, 15)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
     emit q->activated(text);
+QT_WARNING_POP
+#endif
 }
 
 void QComboBoxPrivate::_q_emitHighlighted(const QModelIndex &index)
@@ -1367,7 +1376,13 @@ void QComboBoxPrivate::_q_emitHighlighted(const QModelIndex &index)
         return;
     QString text(itemText(index));
     emit q->highlighted(index.row());
+    emit q->textHighlighted(text);
+#if QT_DEPRECATED_SINCE(5, 15)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
     emit q->highlighted(text);
+QT_WARNING_POP
+#endif
 }
 
 void QComboBoxPrivate::_q_emitCurrentIndexChanged(const QModelIndex &index)
@@ -1375,7 +1390,12 @@ void QComboBoxPrivate::_q_emitCurrentIndexChanged(const QModelIndex &index)
     Q_Q(QComboBox);
     const QString text = itemText(index);
     emit q->currentIndexChanged(index.row());
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     emit q->currentIndexChanged(text);
+    QT_WARNING_POP
+#endif
     // signal lineEdit.textChanged already connected to signal currentTextChanged, so don't emit double here
     if (!lineEdit)
         emit q->currentTextChanged(text);
@@ -1483,6 +1503,7 @@ int QComboBox::maxCount() const
 }
 
 #if QT_CONFIG(completer)
+#if QT_DEPRECATED_SINCE(5, 13)
 
 /*!
     \property QComboBox::autoCompletion
@@ -1576,6 +1597,7 @@ void QComboBox::setAutoCompletionCaseSensitivity(Qt::CaseSensitivity sensitivity
     if (d->lineEdit && d->lineEdit->completer())
         d->lineEdit->completer()->setCaseSensitivity(sensitivity);
 }
+#endif  //  QT_DEPRECATED_SINCE(5, 13)
 
 #endif // QT_CONFIG(completer)
 
@@ -1888,8 +1910,8 @@ void QComboBox::setLineEdit(QLineEdit *edit)
 }
 
 /*!
-    Returns the line edit used to edit items in the combobox, or 0 if there
-    is no line edit.
+    Returns the line edit used to edit items in the combobox, or
+    \nullptr if there is no line edit.
 
     Only editable combo boxes have a line edit.
 */
@@ -2020,7 +2042,7 @@ QAbstractItemModel *QComboBox::model() const
 }
 
 /*!
-    Sets the model to be \a model. \a model must not be 0.
+    Sets the model to be \a model. \a model must not be \nullptr.
     If you want to clear the contents of a model, call clear().
 
     \sa clear()
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h
index 671c883584..6a87a675a4 100644
--- a/src/widgets/widgets/qcombobox.h
+++ b/src/widgets/widgets/qcombobox.h
@@ -73,8 +73,10 @@ class Q_WIDGETS_EXPORT QComboBox : public QWidget
     Q_PROPERTY(QSize iconSize READ iconSize WRITE setIconSize)
 
 #if QT_CONFIG(completer)
+#if QT_DEPRECATED_SINCE(5, 13)
     Q_PROPERTY(bool autoCompletion READ autoCompletion WRITE setAutoCompletion DESIGNABLE false)
     Q_PROPERTY(Qt::CaseSensitivity autoCompletionCaseSensitivity READ autoCompletionCaseSensitivity WRITE setAutoCompletionCaseSensitivity DESIGNABLE false)
+#endif
 #endif // QT_CONFIG(completer)
 
     Q_PROPERTY(bool duplicatesEnabled READ duplicatesEnabled WRITE setDuplicatesEnabled)
@@ -93,12 +95,14 @@ public:
     int maxCount() const;
 
 #if QT_CONFIG(completer)
+#if QT_DEPRECATED_SINCE(5, 13)
     bool autoCompletion() const;
     void setAutoCompletion(bool enable);
 
     Qt::CaseSensitivity autoCompletionCaseSensitivity() const;
     void setAutoCompletionCaseSensitivity(Qt::CaseSensitivity sensitivity);
 #endif
+#endif
 
     bool duplicatesEnabled() const;
     void setDuplicatesEnabled(bool enable);
@@ -216,12 +220,21 @@ public Q_SLOTS:
 Q_SIGNALS:
     void editTextChanged(const QString &);
     void activated(int index);
-    void activated(const QString &);
+    void textActivated(const QString &);
     void highlighted(int index);
-    void highlighted(const QString &);
+    void textHighlighted(const QString &);
     void currentIndexChanged(int index);
-    void currentIndexChanged(const QString &);
     void currentTextChanged(const QString &);
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use currentTextChanged() instead")
+    void currentIndexChanged(const QString &);
+#endif
+#if QT_DEPRECATED_SINCE(5, 15)
+    QT_DEPRECATED_X("Use textActivated() instead")
+    void activated(const QString &);
+    QT_DEPRECATED_X("Use textHighlighted() instead")
+    void highlighted(const QString &);
+#endif
 
 protected:
     void focusInEvent(QFocusEvent *e) override;
diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h
index 3f75a357e4..eadb21628f 100644
--- a/src/widgets/widgets/qcombobox_p.h
+++ b/src/widgets/widgets/qcombobox_p.h
@@ -86,7 +86,7 @@ class QComboBoxListView : public QListView
 {
     Q_OBJECT
 public:
-    QComboBoxListView(QComboBox *cmb = 0) : combo(cmb) {}
+    QComboBoxListView(QComboBox *cmb = nullptr) : combo(cmb) {}
 
 protected:
     void resizeEvent(QResizeEvent *event) override
@@ -277,7 +277,7 @@ protected:
                const QStyleOptionViewItem &option,
                const QModelIndex &index) const override {
         QStyleOptionMenuItem opt = getStyleOption(option, index);
-        painter->fillRect(option.rect, opt.palette.background());
+        painter->fillRect(option.rect, opt.palette.window());
         mCombo->style()->drawControl(QStyle::CE_MenuItem, &opt, painter, mCombo);
     }
     QSize sizeHint(const QStyleOptionViewItem &option,
@@ -293,6 +293,7 @@ private:
     QComboBox *mCombo;
 };
 
+// ### Qt6: QStyledItemDelegate ?
 // Note that this class is intentionally not using QStyledItemDelegate
 // Vista does not use the new theme for combo boxes and there might
 // be other side effects from using the new class
@@ -330,7 +331,7 @@ protected:
     QSize sizeHint(const QStyleOptionViewItem &option,
                    const QModelIndex &index) const override {
         if (isSeparator(index)) {
-            int pm = mCombo->style()->pixelMetric(QStyle::PM_DefaultFrameWidth, 0, mCombo);
+            int pm = mCombo->style()->pixelMetric(QStyle::PM_DefaultFrameWidth, nullptr, mCombo);
             return QSize(pm, pm);
         }
         return QItemDelegate::sizeHint(option, index);
diff --git a/src/widgets/widgets/qcommandlinkbutton.h b/src/widgets/widgets/qcommandlinkbutton.h
index 2d01d63df8..3d2dd5784d 100644
--- a/src/widgets/widgets/qcommandlinkbutton.h
+++ b/src/widgets/widgets/qcommandlinkbutton.h
@@ -66,10 +66,16 @@ public:
     QString description() const;
     void setDescription(const QString &description);
 
+    // QTBUG-68722
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 protected:
+#else
+public:
+#endif
     QSize sizeHint() const override;
     int heightForWidth(int) const override;
     QSize minimumSizeHint() const override;
+protected:
     bool event(QEvent *e) override;
     void paintEvent(QPaintEvent *) override;
 
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp
index fca81bec48..b874e4e3a9 100644
--- a/src/widgets/widgets/qdatetimeedit.cpp
+++ b/src/widgets/widgets/qdatetimeedit.cpp
@@ -273,7 +273,13 @@ void QDateTimeEdit::setDate(const QDate &date)
             setDateRange(date, date);
 
         d->clearCache();
-        d->setValue(QDateTime(date, d->value.toTime(), d->spec), EmitIfChanged);
+        QDateTime when(date, d->value.toTime(), d->spec);
+        // The specified time might not exist on the specified day,
+        // i.e. the time is in the gap a spring-forward jumps over.
+        if (!when.isValid())
+            when = QDateTime::fromMSecsSinceEpoch(when.toMSecsSinceEpoch(), d->spec);
+        Q_ASSERT(when.isValid());
+        d->setValue(when, EmitIfChanged);
         d->updateTimeSpec();
     }
 }
@@ -547,7 +553,7 @@ void QDateTimeEdit::setMaximumTime(const QTime &max)
 {
     Q_D(QDateTimeEdit);
     if (max.isValid()) {
-        const QDateTime m(d->maximum.toDate(), max);
+        const QDateTime m(d->maximum.toDate(), max, d->spec);
         setMaximumDateTime(m);
     }
 }
@@ -1086,6 +1092,7 @@ void QDateTimeEdit::keyPressEvent(QKeyEvent *event)
         d->setSelected(d->currentSectionIndex, true);
         event->ignore();
         emit editingFinished();
+        emit d->edit->returnPressed();
         return;
     default:
 #ifdef QT_KEYPAD_NAVIGATION
@@ -2592,7 +2599,7 @@ void QCalendarPopup::setCalendarWidget(QCalendarWidget *cw)
     QVBoxLayout *widgetLayout = qobject_cast<QVBoxLayout*>(layout());
     if (!widgetLayout) {
         widgetLayout = new QVBoxLayout(this);
-        widgetLayout->setMargin(0);
+        widgetLayout->setContentsMargins(QMargins());
         widgetLayout->setSpacing(0);
     }
     delete calendar.data();
diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h
index 1ebc98dedf..c05e7d9b48 100644
--- a/src/widgets/widgets/qdatetimeedit_p.h
+++ b/src/widgets/widgets/qdatetimeedit_p.h
@@ -123,7 +123,7 @@ public:
     static QDateTimeEdit::Sections convertSections(QDateTimeParser::Sections s);
     static QDateTimeEdit::Section convertToPublic(QDateTimeParser::Section s);
 
-    void initCalendarPopup(QCalendarWidget *cw = 0);
+    void initCalendarPopup(QCalendarWidget *cw = nullptr);
     void positionCalendarPopup();
 
     QDateTimeEdit::Sections sections;
@@ -145,7 +145,7 @@ class QCalendarPopup : public QWidget
 {
     Q_OBJECT
 public:
-    explicit QCalendarPopup(QWidget *parent = 0, QCalendarWidget *cw = 0);
+    explicit QCalendarPopup(QWidget *parent = nullptr, QCalendarWidget *cw = nullptr);
     QDate selectedDate() { return verifyCalendarInstance()->selectedDate(); }
     void setDate(const QDate &date);
     void setDateRange(const QDate &min, const QDate &max);
diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp
index d93e71e32f..28f6cdc7bd 100644
--- a/src/widgets/widgets/qdialogbuttonbox.cpp
+++ b/src/widgets/widgets/qdialogbuttonbox.cpp
@@ -387,12 +387,25 @@ QPushButton *QDialogButtonBoxPrivate::createButton(QDialogButtonBox::StandardBut
         icon = QStyle::SP_DialogNoButton;
         break;
     case QDialogButtonBox::YesToAll:
+        icon = QStyle::SP_DialogYesToAllButton;
+        break;
     case QDialogButtonBox::NoToAll:
+        icon = QStyle::SP_DialogNoToAllButton;
+        break;
     case QDialogButtonBox::SaveAll:
+        icon = QStyle::SP_DialogSaveAllButton;
+        break;
     case QDialogButtonBox::Abort:
+        icon = QStyle::SP_DialogAbortButton;
+        break;
     case QDialogButtonBox::Retry:
+        icon = QStyle::SP_DialogRetryButton;
+        break;
     case QDialogButtonBox::Ignore:
+        icon = QStyle::SP_DialogIgnoreButton;
+        break;
     case QDialogButtonBox::RestoreDefaults:
+        icon = QStyle::SP_RestoreDefaultsButton;
         break;
     case QDialogButtonBox::NoButton:
         return 0;
@@ -820,7 +833,7 @@ QDialogButtonBox::StandardButtons QDialogButtonBox::standardButtons() const
 
 /*!
     Returns the QPushButton corresponding to the standard button \a which,
-    or 0 if the standard button doesn't exist in this button box.
+    or \nullptr if the standard button doesn't exist in this button box.
 
     \sa standardButton(), standardButtons(), buttons()
 */
diff --git a/src/widgets/widgets/qdockarealayout_p.h b/src/widgets/widgets/qdockarealayout_p.h
index 49bd157179..ab9c0c476c 100644
--- a/src/widgets/widgets/qdockarealayout_p.h
+++ b/src/widgets/widgets/qdockarealayout_p.h
@@ -89,7 +89,7 @@ struct QDockAreaLayoutItem
 {
     enum ItemFlags { NoFlags = 0, GapItem = 1, KeepSize = 2 };
 
-    explicit QDockAreaLayoutItem(QLayoutItem *_widgetItem = 0);
+    explicit QDockAreaLayoutItem(QLayoutItem *_widgetItem = nullptr);
     explicit QDockAreaLayoutItem(QDockAreaLayoutInfo *_subinfo);
     explicit QDockAreaLayoutItem(QPlaceHolderItem *_placeHolderItem);
     QDockAreaLayoutItem(const QDockAreaLayoutItem &other);
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
index 6c871aae2c..4041c730b8 100644
--- a/src/widgets/widgets/qdockwidget.cpp
+++ b/src/widgets/widgets/qdockwidget.cpp
@@ -55,6 +55,7 @@
 
 #include <private/qwidgetresizehandler_p.h>
 #include <private/qstylesheetstyle_p.h>
+#include <qpa/qplatformtheme.h>
 
 #include "qdockwidget_p.h"
 #include "qmainwindowlayout_p.h"
@@ -66,18 +67,21 @@ extern QString qt_setWindowTitle_helperHelper(const QString&, const QWidget*); /
 // qmainwindow.cpp
 extern QMainWindowLayout *qt_mainwindow_layout(const QMainWindow *window);
 
-static inline QMainWindowLayout *qt_mainwindow_layout_from_dock(const QDockWidget *dock)
+static const QMainWindow *mainwindow_from_dock(const QDockWidget *dock)
 {
-    const QWidget *p = dock->parentWidget();
-    while (p) {
-        const QMainWindow *window = qobject_cast<const QMainWindow*>(p);
-        if (window)
-            return qt_mainwindow_layout(window);
-        p = p->parentWidget();
+    for (const QWidget *p = dock->parentWidget(); p; p = p->parentWidget()) {
+        if (const QMainWindow *window = qobject_cast<const QMainWindow*>(p))
+            return window;
     }
     return nullptr;
 }
 
+static inline QMainWindowLayout *qt_mainwindow_layout_from_dock(const QDockWidget *dock)
+{
+    auto mainWindow = mainwindow_from_dock(dock);
+    return mainWindow ? qt_mainwindow_layout(mainWindow) : nullptr;
+}
+
 static inline bool hasFeature(const QDockWidgetPrivate *priv, QDockWidget::DockWidgetFeature feature)
 { return (priv->features & feature) == feature; }
 
@@ -838,8 +842,9 @@ void QDockWidgetPrivate::endDrag(bool abort)
     q->releaseMouse();
 
     if (state->dragging) {
-        QMainWindowLayout *mwLayout = qt_mainwindow_layout_from_dock(q);
-        Q_ASSERT(mwLayout != 0);
+        const QMainWindow *mainWindow = mainwindow_from_dock(q);
+        Q_ASSERT(mainWindow != nullptr);
+        QMainWindowLayout *mwLayout = qt_mainwindow_layout(mainWindow);
 
         if (abort || !mwLayout->plug(state->widgetItem)) {
             if (hasFeature(this, QDockWidget::DockWidgetFloatable)) {
@@ -860,8 +865,12 @@ void QDockWidgetPrivate::endDrag(bool abort)
                 } else {
                     setResizerActive(false);
                 }
-                if (q->isFloating()) // Might not be floating when dragging a QDockWidgetGroupWindow
+                if (q->isFloating()) { // Might not be floating when dragging a QDockWidgetGroupWindow
                     undockedGeometry = q->geometry();
+#if QT_CONFIG(tabwidget)
+                    tabPosition = mwLayout->tabPosition(mainWindow->dockWidgetArea(q));
+#endif
+                }
                 q->activateWindow();
             } else {
                 // The tab was not plugged back in the QMainWindow but the QDockWidget cannot
@@ -922,7 +931,8 @@ bool QDockWidgetPrivate::mousePressEvent(QMouseEvent *event)
         initDrag(event->pos(), false);
 
         if (state)
-            state->ctrlDrag = hasFeature(this, QDockWidget::DockWidgetFloatable) && event->modifiers() & Qt::ControlModifier;
+            state->ctrlDrag = (hasFeature(this, QDockWidget::DockWidgetFloatable) && event->modifiers() & Qt::ControlModifier) ||
+                              (!hasFeature(this, QDockWidget::DockWidgetMovable) && q->isFloating());
 
         return true;
     }
@@ -1044,7 +1054,8 @@ void QDockWidgetPrivate::nonClientAreaMouseEvent(QMouseEvent *event)
             initDrag(event->pos(), true);
             if (state == 0)
                 break;
-            state->ctrlDrag = event->modifiers() & Qt::ControlModifier;
+            state->ctrlDrag = (event->modifiers() & Qt::ControlModifier) ||
+                              (!hasFeature(this, QDockWidget::DockWidgetMovable) && q->isFloating());
             startDrag();
             break;
         case QEvent::NonClientAreaMouseMove:
@@ -1729,8 +1740,8 @@ void QDockWidget::setTitleBarWidget(QWidget *widget)
 
 /*!
     \since 4.3
-    Returns the custom title bar widget set on the QDockWidget, or 0 if no
-    custom title bar has been set.
+    Returns the custom title bar widget set on the QDockWidget, or
+    \nullptr if no custom title bar has been set.
 
     \sa setTitleBarWidget()
 */
diff --git a/src/widgets/widgets/qdockwidget_p.h b/src/widgets/widgets/qdockwidget_p.h
index 766e4ed161..bc6ac86c45 100644
--- a/src/widgets/widgets/qdockwidget_p.h
+++ b/src/widgets/widgets/qdockwidget_p.h
@@ -57,6 +57,10 @@
 #include "QtWidgets/qboxlayout.h"
 #include "QtWidgets/qdockwidget.h"
 
+#if QT_CONFIG(tabwidget)
+#  include "QtWidgets/qtabwidget.h"
+#endif
+
 QT_REQUIRE_CONFIG(dockwidget);
 
 QT_BEGIN_NAMESPACE
@@ -81,33 +85,32 @@ class QDockWidgetPrivate : public QWidgetPrivate
     };
 
 public:
-    inline QDockWidgetPrivate()
-        : QWidgetPrivate(), state(0),
-          features(QDockWidget::DockWidgetClosable
-                   | QDockWidget::DockWidgetMovable
-                   | QDockWidget::DockWidgetFloatable),
-          allowedAreas(Qt::AllDockWidgetAreas), resizer(0)
-    { }
-
     void init();
     void _q_toggleView(bool); // private slot
     void _q_toggleTopLevel(); // private slot
 
     void updateButtons();
-    DragState *state;
 
-    QDockWidget::DockWidgetFeatures features;
-    Qt::DockWidgetAreas allowedAreas;
+#if QT_CONFIG(tabwidget)
+    QTabWidget::TabPosition tabPosition = QTabWidget::North;
+#endif
+
+    DragState *state = nullptr;
+
+    QDockWidget::DockWidgetFeatures features = QDockWidget::DockWidgetClosable
+        | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable;
+    Qt::DockWidgetAreas allowedAreas = Qt::AllDockWidgetAreas;
 
     QFont font;
 
 #ifndef QT_NO_ACTION
-    QAction *toggleViewAction;
+    QAction *toggleViewAction = nullptr;
 #endif
 
 //    QMainWindow *findMainWindow(QWidget *widget) const;
     QRect undockedGeometry;
     QString fixedWindowTitle;
+    QString dockedWindowTitle;
 
     bool mousePressEvent(QMouseEvent *event);
     bool mouseDoubleClickEvent(QMouseEvent *event);
@@ -128,14 +131,14 @@ public:
     bool isAnimating() const;
 
 private:
-    QWidgetResizeHandler *resizer;
+    QWidgetResizeHandler *resizer = nullptr;
 };
 
 class Q_WIDGETS_EXPORT QDockWidgetLayout : public QLayout
 {
     Q_OBJECT
 public:
-    QDockWidgetLayout(QWidget *parent = 0);
+    QDockWidgetLayout(QWidget *parent = nullptr);
     ~QDockWidgetLayout();
     void addItem(QLayoutItem *item) override;
     QLayoutItem *itemAt(int index) const override;
@@ -193,15 +196,15 @@ inline QLayoutItem *QDockWidgetItem::dockWidgetChildItem() const
 {
     if (QDockWidgetLayout *layout = dockWidgetLayout())
         return layout->itemForRole(QDockWidgetLayout::Content);
-    return 0;
+    return nullptr;
 }
 
 inline QDockWidgetLayout *QDockWidgetItem::dockWidgetLayout() const
 {
     QWidget *w = const_cast<QDockWidgetItem*>(this)->widget();
-    if (w != 0)
+    if (w != nullptr)
         return qobject_cast<QDockWidgetLayout*>(w->layout());
-    return 0;
+    return nullptr;
 }
 
 QT_END_NAMESPACE
diff --git a/src/widgets/widgets/qfocusframe.cpp b/src/widgets/widgets/qfocusframe.cpp
index 8b8f4db86e..0992becdf0 100644
--- a/src/widgets/widgets/qfocusframe.cpp
+++ b/src/widgets/widgets/qfocusframe.cpp
@@ -335,7 +335,25 @@ QFocusFrame::eventFilter(QObject *o, QEvent *e)
 /*! \reimp */
 bool QFocusFrame::event(QEvent *e)
 {
-    return QWidget::event(e);
+    Q_D(QFocusFrame);
+
+    switch (e->type()) {
+    case QEvent::Move:
+    case QEvent::Resize:
+        if (d->widget) {
+            // When we're tracking a widget, we don't allow anyone to move the focus frame around.
+            // We do our best with event filters to make it stay on top of the widget, so trying to
+            // move the frame somewhere else will be flaky at best. This can e.g happen for general
+            // purpose code, like QAbstractScrollView, that bulk-moves all children a certain distance.
+            // So we need to call updateSize() when that happens to ensure that the focus frame stays
+            // on top of the widget.
+            d->updateSize();
+        }
+        break;
+    default:
+        return QWidget::event(e);
+    }
+    return true;
 }
 
 QT_END_NAMESPACE
diff --git a/src/widgets/widgets/qfontcombobox.cpp b/src/widgets/widgets/qfontcombobox.cpp
index 957a464b71..4a99b0f962 100644
--- a/src/widgets/widgets/qfontcombobox.cpp
+++ b/src/widgets/widgets/qfontcombobox.cpp
@@ -236,9 +236,10 @@ void QFontFamilyDelegate::paint(QPainter *painter,
     if (QFontDatabase().isSmoothlyScalable(text)) {
         icon = &truetype;
     }
-    QSize actualSize = icon->actualSize(r.size());
-
-    icon->paint(painter, r, Qt::AlignLeft|Qt::AlignVCenter);
+    const QSize actualSize = icon->actualSize(r.size());
+    const QRect iconRect = QStyle::alignedRect(option.direction, option.displayAlignment,
+                                               actualSize, r);
+    icon->paint(painter, iconRect, Qt::AlignLeft|Qt::AlignVCenter);
     if (option.direction == Qt::RightToLeft)
         r.setRight(r.right() - actualSize.width() - 4);
     else
@@ -247,6 +248,7 @@ void QFontFamilyDelegate::paint(QPainter *painter,
     QFont old = painter->font();
     painter->setFont(font);
 
+    const Qt::Alignment textAlign = QStyle::visualAlignment(option.direction, option.displayAlignment);
     // If the ascent of the font is larger than the height of the rect,
     // we will clip the text, so it's better to align the tight bounding rect in this case
     // This is specifically for fonts where the ascent is very large compared to
@@ -254,9 +256,11 @@ void QFontFamilyDelegate::paint(QPainter *painter,
     QFontMetricsF fontMetrics(font);
     if (fontMetrics.ascent() > r.height()) {
         QRectF tbr = fontMetrics.tightBoundingRect(text);
-        painter->drawText(r.x(), r.y() + (r.height() + tbr.height()) / 2.0, text);
+        QRect textRect(r);
+        textRect.setHeight(textRect.height() + (r.height() - tbr.height()));
+        painter->drawText(textRect, Qt::AlignBottom|Qt::TextSingleLine|textAlign, text);
     } else {
-        painter->drawText(r, Qt::AlignVCenter|Qt::AlignLeading|Qt::TextSingleLine, text);
+        painter->drawText(r, Qt::AlignVCenter|Qt::TextSingleLine|textAlign, text);
     }
 
     if (writingSystem != QFontDatabase::Any)
@@ -270,7 +274,7 @@ void QFontFamilyDelegate::paint(QPainter *painter,
             r.setRight(r.right() - w);
         else
             r.setLeft(r.left() + w);
-        painter->drawText(r, Qt::AlignVCenter|Qt::AlignLeading|Qt::TextSingleLine, sample);
+        painter->drawText(r, Qt::AlignVCenter|Qt::TextSingleLine|textAlign, sample);
     }
     painter->setFont(old);
 
diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp
index 242a4405ca..02aa703289 100644
--- a/src/widgets/widgets/qlineedit.cpp
+++ b/src/widgets/widgets/qlineedit.cpp
@@ -315,7 +315,7 @@ QString QLineEdit::text() const
 void QLineEdit::setText(const QString& text)
 {
     Q_D(QLineEdit);
-    d->control->setText(text);
+    d->setText(text);
 }
 
 /*!
@@ -488,7 +488,10 @@ void QLineEdit::setClearButtonEnabled(bool enable)
         QAction *clearAction = new QAction(d->clearButtonIcon(), QString(), this);
         clearAction->setEnabled(!isReadOnly());
         clearAction->setObjectName(QLatin1String(clearButtonActionNameC));
-        d->addAction(clearAction, 0, QLineEdit::TrailingPosition, QLineEditPrivate::SideWidgetClearButton | QLineEditPrivate::SideWidgetFadeInWithText);
+
+        int flags = QLineEditPrivate::SideWidgetClearButton | QLineEditPrivate::SideWidgetFadeInWithText;
+        auto widgetAction = d->addAction(clearAction, nullptr, QLineEdit::TrailingPosition, flags);
+        widgetAction->setVisible(!text().isEmpty());
     } else {
         QAction *clearAction = findChild<QAction *>(QLatin1String(clearButtonActionNameC));
         Q_ASSERT(clearAction);
@@ -583,7 +586,7 @@ void QLineEdit::setEchoMode(EchoMode mode)
 
 #ifndef QT_NO_VALIDATOR
 /*!
-    Returns a pointer to the current input validator, or 0 if no
+    Returns a pointer to the current input validator, or \nullptr if no
     validator has been set.
 
     \sa setValidator()
@@ -1480,8 +1483,11 @@ bool QLineEdit::event(QEvent * e)
         } else if (e->type() == QEvent::LeaveEditFocus) {
             d->setCursorVisible(false);
             d->control->setCursorBlinkEnabled(false);
-            if (d->control->hasAcceptableInput() || d->control->fixup())
+            if (d->edited && (d->control->hasAcceptableInput()
+                              || d->control->fixup())) {
                 emit editingFinished();
+                d->edited = false;
+            }
         }
     }
 #endif
@@ -1678,6 +1684,7 @@ void QLineEdit::mouseDoubleClickEvent(QMouseEvent* e)
 
 /*!
     \fn void QLineEdit::inputRejected()
+    \since 5.12
 
     This signal is emitted when the user presses a key that is not
     considered to be acceptable input. For example, if a key press
@@ -1887,7 +1894,6 @@ void QLineEdit::focusInEvent(QFocusEvent *e)
 
 /*!\reimp
 */
-
 void QLineEdit::focusOutEvent(QFocusEvent *e)
 {
     Q_D(QLineEdit);
@@ -1910,8 +1916,10 @@ void QLineEdit::focusOutEvent(QFocusEvent *e)
 #endif
     if (reason != Qt::PopupFocusReason
         || !(QApplication::activePopupWidget() && QApplication::activePopupWidget()->parentWidget() == this)) {
-            if (hasAcceptableInput() || d->control->fixup())
+            if (d->edited && (hasAcceptableInput() || d->control->fixup())) {
                 emit editingFinished();
+                d->edited = false;
+            }
     }
 #ifdef QT_KEYPAD_NAVIGATION
     d->control->setCancelText(QString());
diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp
index fce3d47b17..21e70db0ac 100644
--- a/src/widgets/widgets/qlineedit_p.cpp
+++ b/src/widgets/widgets/qlineedit_p.cpp
@@ -57,7 +57,9 @@
 #include "qlist.h"
 #endif
 #include <qpainter.h>
+#if QT_CONFIG(animation)
 #include <qpropertyanimation.h>
+#endif
 #include <qstylehints.h>
 #include <qvalidator.h>
 
@@ -125,6 +127,7 @@ void QLineEditPrivate::_q_handleWindowActivate()
 void QLineEditPrivate::_q_textEdited(const QString &text)
 {
     Q_Q(QLineEdit);
+    edited = true;
     emit q->textEdited(text);
 #if QT_CONFIG(completer)
     if (control->completer()
@@ -270,6 +273,12 @@ void QLineEditPrivate::setCursorVisible(bool visible)
         q->update();
 }
 
+void QLineEditPrivate::setText(const QString& text)
+{
+    edited = true;
+    control->setText(text);
+}
+
 void QLineEditPrivate::updatePasswordEchoEditing(bool editing)
 {
     Q_Q(QLineEdit);
@@ -322,7 +331,7 @@ void QLineEditPrivate::drag()
     data->setText(control->selectedText());
     QDrag *drag = new QDrag(q);
     drag->setMimeData(data);
-    Qt::DropAction action = drag->start();
+    Qt::DropAction action = drag->exec(Qt::CopyAction);
     if (action == Qt::MoveAction && !control->isReadOnly() && drag->target() != q)
         control->removeSelection();
 }
@@ -389,10 +398,48 @@ void QLineEditIconButton::setOpacity(qreal value)
     }
 }
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
+bool QLineEditIconButton::shouldHideWithText() const
+{
+    return m_hideWithText;
+}
+
+void QLineEditIconButton::setHideWithText(bool hide)
+{
+    m_hideWithText = hide;
+}
+
+void QLineEditIconButton::onAnimationFinished()
+{
+    if (shouldHideWithText() && isVisible() && !m_wasHidden) {
+        hide();
+
+        // Invalidate previous geometry to take into account new size of side widgets
+        if (auto le = lineEditPrivate())
+            le->updateGeometry_helper(true);
+    }
+}
+
+void QLineEditIconButton::animateShow(bool visible)
+{
+    m_wasHidden = visible;
+
+    if (shouldHideWithText() && !isVisible()) {
+        show();
+
+        // Invalidate previous geometry to take into account new size of side widgets
+        if (auto le = lineEditPrivate())
+            le->updateGeometry_helper(true);
+    }
+
+    startOpacityAnimation(visible ? 1.0 : 0.0);
+}
+
 void QLineEditIconButton::startOpacityAnimation(qreal endValue)
 {
     QPropertyAnimation *animation = new QPropertyAnimation(this, QByteArrayLiteral("opacity"));
+    connect(animation, &QPropertyAnimation::finished, this, &QLineEditIconButton::onAnimationFinished);
+
     animation->setDuration(160);
     animation->setEndValue(endValue);
     animation->start(QAbstractAnimation::DeleteWhenStopped);
@@ -407,6 +454,16 @@ void QLineEditIconButton::updateCursor()
 }
 #endif // QT_CONFIG(toolbutton)
 
+#if QT_CONFIG(animation) && QT_CONFIG(toolbutton)
+static void displayWidgets(const QLineEditPrivate::SideWidgetEntryList &widgets, bool display)
+{
+    for (const auto &e : widgets) {
+        if (e.flags & QLineEditPrivate::SideWidgetFadeInWithText)
+            static_cast<QLineEditIconButton *>(e.widget)->animateShow(display);
+    }
+}
+#endif
+
 void QLineEditPrivate::_q_textChanged(const QString &text)
 {
     if (hasSideWidgets()) {
@@ -414,15 +471,9 @@ void QLineEditPrivate::_q_textChanged(const QString &text)
         if (!newTextSize || !lastTextSize) {
             lastTextSize = newTextSize;
 #if QT_CONFIG(animation) && QT_CONFIG(toolbutton)
-            const bool fadeIn = newTextSize > 0;
-            for (const SideWidgetEntry &e : leadingSideWidgets) {
-                if (e.flags & SideWidgetFadeInWithText)
-                   static_cast<QLineEditIconButton *>(e.widget)->animateShow(fadeIn);
-            }
-            for (const SideWidgetEntry &e : trailingSideWidgets) {
-                if (e.flags & SideWidgetFadeInWithText)
-                   static_cast<QLineEditIconButton *>(e.widget)->animateShow(fadeIn);
-            }
+            const bool display = newTextSize > 0;
+            displayWidgets(leadingSideWidgets, display);
+            displayWidgets(trailingSideWidgets, display);
 #endif
         }
     }
@@ -539,8 +590,15 @@ QWidget *QLineEditPrivate::addAction(QAction *newAction, QAction *before, QLineE
         QLineEditIconButton *toolButton = new QLineEditIconButton(q);
         toolButton->setIcon(newAction->icon());
         toolButton->setOpacity(lastTextSize > 0 || !(flags & SideWidgetFadeInWithText) ? 1 : 0);
-        if (flags & SideWidgetClearButton)
+        if (flags & SideWidgetClearButton) {
             QObject::connect(toolButton, SIGNAL(clicked()), q, SLOT(_q_clearButtonClicked()));
+
+#if QT_CONFIG(animation)
+            // The clear button is handled only by this widget. The button should be really
+            // shown/hidden in order to calculate size hints correctly.
+            toolButton->setHideWithText(true);
+#endif
+        }
         toolButton->setDefaultAction(newAction);
         w = toolButton;
 #else
@@ -604,33 +662,26 @@ void QLineEditPrivate::removeAction(QAction *action)
 #endif // QT_CONFIG(action)
 }
 
-static bool isSideWidgetVisible(const QLineEditPrivate::SideWidgetEntry &e)
+static int effectiveTextMargin(int defaultMargin, const QLineEditPrivate::SideWidgetEntryList &widgets,
+                               const QLineEditPrivate::SideWidgetParameters &parameters)
 {
-   return e.widget->isVisible();
+    if (widgets.empty())
+        return defaultMargin;
+
+    return defaultMargin + (parameters.margin + parameters.widgetWidth) *
+           int(std::count_if(widgets.begin(), widgets.end(),
+                             [](const QLineEditPrivate::SideWidgetEntry &e) {
+                                 return e.widget->isVisibleTo(e.widget->parentWidget()); }));
 }
 
 int QLineEditPrivate::effectiveLeftTextMargin() const
 {
-    int result = leftTextMargin;
-    if (!leftSideWidgetList().empty()) {
-        const SideWidgetParameters p = sideWidgetParameters();
-        result += (p.margin + p.widgetWidth)
-            * int(std::count_if(leftSideWidgetList().begin(), leftSideWidgetList().end(),
-                                isSideWidgetVisible));
-    }
-    return result;
+    return effectiveTextMargin(leftTextMargin, leftSideWidgetList(), sideWidgetParameters());
 }
 
 int QLineEditPrivate::effectiveRightTextMargin() const
 {
-    int result = rightTextMargin;
-    if (!rightSideWidgetList().empty()) {
-        const SideWidgetParameters p = sideWidgetParameters();
-        result += (p.margin + p.widgetWidth)
-            * int(std::count_if(rightSideWidgetList().begin(), rightSideWidgetList().end(),
-                                isSideWidgetVisible));
-    }
-    return result;
+    return effectiveTextMargin(rightTextMargin, rightSideWidgetList(), sideWidgetParameters());
 }
 
 
diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h
index 71a67e3d10..3f98aab901 100644
--- a/src/widgets/widgets/qlineedit_p.h
+++ b/src/widgets/widgets/qlineedit_p.h
@@ -85,12 +85,15 @@ class Q_AUTOTEST_EXPORT QLineEditIconButton : public QToolButton
     Q_OBJECT
     Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity)
 public:
-    explicit QLineEditIconButton(QWidget *parent =  0);
+    explicit QLineEditIconButton(QWidget *parent =  nullptr);
 
     qreal opacity() const { return m_opacity; }
     void setOpacity(qreal value);
-#ifndef QT_NO_ANIMATION
-    void animateShow(bool visible) { startOpacityAnimation(visible ? 1.0 : 0.0); }
+#if QT_CONFIG(animation)
+    void animateShow(bool visible);
+
+    bool shouldHideWithText() const;
+    void setHideWithText(bool hide);
 #endif
 
 protected:
@@ -100,13 +103,23 @@ protected:
 private slots:
     void updateCursor();
 
+#if QT_CONFIG(animation)
+    void onAnimationFinished();
+#endif
+
 private:
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     void startOpacityAnimation(qreal endValue);
 #endif
     QLineEditPrivate *lineEditPrivate() const;
 
     qreal m_opacity;
+
+#if QT_CONFIG(animation)
+    bool m_hideWithText = false;
+    bool m_wasHidden = false;
+#endif
+
 };
 #endif // QT_CONFIG(toolbutton)
 
@@ -121,7 +134,7 @@ public:
     };
 
     struct SideWidgetEntry {
-        explicit SideWidgetEntry(QWidget *w = 0, QAction *a = 0, int _flags = 0) : widget(w), action(a), flags(_flags) {}
+        explicit SideWidgetEntry(QWidget *w = nullptr, QAction *a = nullptr, int _flags = 0) : widget(w), action(a), flags(_flags) {}
 
         QWidget *widget;
         QAction *action;
@@ -138,7 +151,7 @@ public:
 
     QLineEditPrivate()
         : control(0), frame(1), contextMenuEnabled(1), cursorVisible(0),
-        dragEnabled(0), clickCausedFocus(0), hscroll(0), vscroll(0),
+        dragEnabled(0), clickCausedFocus(0), edited(0), hscroll(0), vscroll(0),
         alignment(Qt::AlignLeading | Qt::AlignVCenter),
         leftTextMargin(0), topTextMargin(0), rightTextMargin(0), bottomTextMargin(0),
         lastTextSize(0), mouseYThreshold(0)
@@ -163,6 +176,7 @@ public:
     bool inSelection(int x) const;
     QRect cursorRect() const;
     void setCursorVisible(bool visible);
+    void setText(const QString& text);
 
     void updatePasswordEchoEditing(bool);
 
@@ -189,6 +203,7 @@ public:
     uint cursorVisible : 1;
     uint dragEnabled : 1;
     uint clickCausedFocus : 1;
+    uint edited : 1;
     int hscroll;
     int vscroll;
     uint alignment;
diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp
index 9172168761..fae3aebba4 100644
--- a/src/widgets/widgets/qmainwindow.cpp
+++ b/src/widgets/widgets/qmainwindow.cpp
@@ -249,14 +249,7 @@ void QMainWindowPrivate::init()
 
     An example of how to create menus follows:
 
-    \code
-    void MainWindow::createMenus()
-    {
-        fileMenu = menuBar()->addMenu(tr("&File"));
-        fileMenu->addAction(newAct);
-        fileMenu->addAction(openAct);
-        fileMenu->addAction(saveAct);
-    \endcode
+    \snippet code/src_widgets_widgets_qmainwindow.cpp 0
 
     The \c createPopupMenu() function creates popup menus when the
     main window receives context menu events.  The default
@@ -283,12 +276,7 @@ void QMainWindowPrivate::init()
 
     An example of toolbar creation follows:
 
-    \code
-    void MainWindow::createToolBars()
-    {
-        fileToolBar = addToolBar(tr("File"));
-        fileToolBar->addAction(newAct);
-    \endcode
+    \snippet code/src_widgets_widgets_qmainwindow.cpp 1
 
     \section2 Creating Dock Widgets
 
@@ -1231,9 +1219,8 @@ Qt::DockWidgetArea QMainWindow::dockWidgetArea(QDockWidget *dockwidget) const
     to the relative weight of the sizes.
 
     Example:
-    \code
-    resizeDocks({blueWidget, yellowWidget}, {20 , 40}, Qt::Horizontal);
-    \endcode
+    \snippet code/src_widgets_widgets_qmainwindow.cpp 2
+
     If the blue and the yellow widget are nested on the same level they will be
     resized such that the yellowWidget is twice as big as the blueWidget
 
diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp
index ed054c7e9a..f54835f23b 100644
--- a/src/widgets/widgets/qmainwindowlayout.cpp
+++ b/src/widgets/widgets/qmainwindowlayout.cpp
@@ -2525,6 +2525,30 @@ void QMainWindowLayout::updateGapIndicator()
 #endif // QT_CONFIG(rubberband)
 }
 
+static QTabBar::Shape tabwidgetPositionToTabBarShape(QWidget *w)
+{
+    QTabBar::Shape result = QTabBar::RoundedSouth;
+#if QT_CONFIG(tabwidget)
+    if (qobject_cast<QDockWidget *>(w)) {
+        switch (static_cast<QDockWidgetPrivate *>(qt_widget_private(w))->tabPosition) {
+        case QTabWidget::North:
+            result = QTabBar::RoundedNorth;
+            break;
+        case QTabWidget::South:
+            result = QTabBar::RoundedSouth;
+            break;
+        case QTabWidget::West:
+            result = QTabBar::RoundedWest;
+            break;
+        case QTabWidget::East:
+            result = QTabBar::RoundedEast;
+            break;
+        }
+    }
+#endif // tabwidget
+    return result;
+}
+
 void QMainWindowLayout::hover(QLayoutItem *widgetItem, const QPoint &mousePos)
 {
     if (!parentWidget()->isVisible() || parentWidget()->isMinimized()
@@ -2573,8 +2597,9 @@ void QMainWindowLayout::hover(QLayoutItem *widgetItem, const QPoint &mousePos)
                 QDockWidgetGroupWindow *floatingTabs = createTabbedDockWindow(); // FIXME
                 floatingTabs->setGeometry(dropTo->geometry());
                 QDockAreaLayoutInfo *info = floatingTabs->layoutInfo();
+                const QTabBar::Shape shape = tabwidgetPositionToTabBarShape(dropTo);
                 *info = QDockAreaLayoutInfo(&layoutState.dockAreaLayout.sep, QInternal::LeftDock,
-                                            Qt::Horizontal, QTabBar::RoundedSouth,
+                                            Qt::Horizontal, shape,
                                             static_cast<QMainWindow *>(parentWidget()));
                 info->tabbed = true;
                 QLayout *parentLayout = dropTo->parentWidget()->layout();
diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h
index a375d856bb..7cdb8ead2f 100644
--- a/src/widgets/widgets/qmainwindowlayout_p.h
+++ b/src/widgets/widgets/qmainwindowlayout_p.h
@@ -122,7 +122,7 @@ template <typename Layout>
 QCursor QMainWindowLayoutSeparatorHelper<Layout>::separatorCursor(const QList<int> &path)
 {
     const QDockAreaLayoutInfo *info = layout()->dockAreaLayoutInfo()->info(path);
-    Q_ASSERT(info != 0);
+    Q_ASSERT(info != nullptr);
     if (path.size() == 1) { // is this the "top-level" separator which separates a dock area
                             // from the central widget?
         switch (path.first()) {
@@ -334,7 +334,7 @@ class QDockWidgetGroupWindow : public QWidget
 {
     Q_OBJECT
 public:
-    explicit QDockWidgetGroupWindow(QWidget* parent = 0, Qt::WindowFlags f = 0)
+    explicit QDockWidgetGroupWindow(QWidget* parent = nullptr, Qt::WindowFlags f = nullptr)
         : QWidget(parent, f) {}
     QDockAreaLayoutInfo *layoutInfo() const;
     const QDockAreaLayoutInfo *tabLayoutInfo() const;
@@ -430,7 +430,7 @@ public:
     bool isValid() const;
 
     QLayoutItem *plug(const QList<int> &path);
-    QLayoutItem *unplug(const QList<int> &path, QMainWindowLayoutState *savedState = 0);
+    QLayoutItem *unplug(const QList<int> &path, QMainWindowLayoutState *savedState = nullptr);
 
     void saveState(QDataStream &stream) const;
     bool checkFormat(QDataStream &stream);
diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp
index f32cd26478..0ce561860e 100644
--- a/src/widgets/widgets/qmdiarea.cpp
+++ b/src/widgets/widgets/qmdiarea.cpp
@@ -954,14 +954,6 @@ void QMdiAreaPrivate::rearrange(Rearranger *rearranger)
         }
     }
 
-    if (active && rearranger->type() == Rearranger::RegularTiler && !tileCalledFromResizeEvent) {
-        // Move active window in front if necessary. That's the case if we
-        // have any windows with staysOnTopHint set.
-        int indexToActive = widgets.indexOf((QWidget *)active);
-        if (indexToActive > 0)
-            widgets.move(indexToActive, 0);
-    }
-
     QRect domain = viewport->rect();
     if (rearranger->type() == Rearranger::RegularTiler && !widgets.isEmpty())
         domain = resizeToMinimumTileSize(minSubWindowSize, widgets.count());
@@ -1296,7 +1288,11 @@ QRect QMdiAreaPrivate::resizeToMinimumTileSize(const QSize &minSubWindowSize, in
             minAreaHeight += 2 * frame;
         }
         const QSize diff = QSize(minAreaWidth, minAreaHeight).expandedTo(q->size()) - q->size();
-        topLevel->resize(topLevel->size() + diff);
+        // Only resize topLevel widget if scroll bars are disabled.
+        if (hbarpolicy == Qt::ScrollBarAlwaysOff)
+            topLevel->resize(topLevel->size().width() + diff.width(), topLevel->size().height());
+        if (vbarpolicy == Qt::ScrollBarAlwaysOff)
+            topLevel->resize(topLevel->size().width(), topLevel->size().height() + diff.height());
     }
 
     QRect domain = viewport->rect();
@@ -1778,7 +1774,7 @@ QSize QMdiArea::minimumSizeHint() const
 }
 
 /*!
-    Returns a pointer to the current subwindow, or 0 if there is
+    Returns a pointer to the current subwindow, or \nullptr if there is
     no current subwindow.
 
     This function will return the same as activeSubWindow() if
@@ -1790,13 +1786,13 @@ QMdiSubWindow *QMdiArea::currentSubWindow() const
 {
     Q_D(const QMdiArea);
     if (d->childWindows.isEmpty())
-        return 0;
+        return nullptr;
 
     if (d->active)
         return d->active;
 
     if (d->isActivated && !window()->isMinimized())
-        return 0;
+        return nullptr;
 
     Q_ASSERT(d->indicesToActivatedChildren.count() > 0);
     int index = d->indicesToActivatedChildren.at(0);
@@ -1808,7 +1804,7 @@ QMdiSubWindow *QMdiArea::currentSubWindow() const
 
 /*!
     Returns a pointer to the current active subwindow. If no
-    window is currently active, 0 is returned.
+    window is currently active, \nullptr is returned.
 
     Subwindows are treated as top-level windows with respect to
     window state, i.e., if a widget outside the MDI area is the active
@@ -1825,7 +1821,7 @@ QMdiSubWindow *QMdiArea::activeSubWindow() const
 }
 
 /*!
-    Activates the subwindow \a window. If \a window is 0, any
+    Activates the subwindow \a window. If \a window is \nullptr, any
     current active window is deactivated.
 
     \sa activeSubWindow()
@@ -1834,7 +1830,7 @@ void QMdiArea::setActiveSubWindow(QMdiSubWindow *window)
 {
     Q_D(QMdiArea);
     if (!window) {
-        d->activateWindow(0);
+        d->activateWindow(nullptr);
         return;
     }
 
@@ -1992,9 +1988,11 @@ QMdiSubWindow *QMdiArea::addSubWindow(QWidget *widget, Qt::WindowFlags windowFla
         Q_ASSERT(child->testAttribute(Qt::WA_DeleteOnClose));
     }
 
+    d->appendChild(child);
+
     if (childFocus)
         childFocus->setFocus();
-    d->appendChild(child);
+
     return child;
 }
 
@@ -2640,7 +2638,11 @@ bool QMdiArea::eventFilter(QObject *object, QEvent *event)
 #endif // QT_CONFIG(tabbar)
         Q_FALLTHROUGH();
     case QEvent::Hide:
-        d->isSubWindowsTiled = false;
+        // Do not reset the isSubWindowsTiled flag if the event is a spontaneous system window event.
+        // This ensures that tiling will be performed during the resizeEvent after an application
+        // window minimize (hide) and then restore (show).
+        if (!event->spontaneous())
+            d->isSubWindowsTiled = false;
         break;
 #if QT_CONFIG(rubberband)
     case QEvent::Close:
diff --git a/src/widgets/widgets/qmdiarea_p.h b/src/widgets/widgets/qmdiarea_p.h
index fd00118ec6..0a6368044a 100644
--- a/src/widgets/widgets/qmdiarea_p.h
+++ b/src/widgets/widgets/qmdiarea_p.h
@@ -183,7 +183,7 @@ public:
     int tabToPreviousTimerId;
 
     // Slots.
-    void _q_deactivateAllWindows(QMdiSubWindow *aboutToActivate = 0);
+    void _q_deactivateAllWindows(QMdiSubWindow *aboutToActivate = nullptr);
     void _q_processWindowStateChanged(Qt::WindowStates oldState, Qt::WindowStates newState);
     void _q_currentTabChanged(int index);
     void _q_closeTab(int index);
@@ -198,7 +198,7 @@ public:
     void activateCurrentWindow();
     void activateHighlightedWindow();
     void emitWindowActivated(QMdiSubWindow *child);
-    void resetActiveWindow(QMdiSubWindow *child = 0);
+    void resetActiveWindow(QMdiSubWindow *child = nullptr);
     void updateActiveWindow(int removedIndex, bool activeRemoved);
     void updateScrollBars();
     void internalRaise(QMdiSubWindow *child) const;
diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp
index 794674c427..e25bc6de7a 100644
--- a/src/widgets/widgets/qmdisubwindow.cpp
+++ b/src/widgets/widgets/qmdisubwindow.cpp
@@ -2268,7 +2268,7 @@ QMdiSubWindow::QMdiSubWindow(QWidget *parent, Qt::WindowFlags flags)
     setMouseTracking(true);
     setLayout(new QVBoxLayout);
     setFocusPolicy(Qt::StrongFocus);
-    layout()->setMargin(0);
+    layout()->setContentsMargins(QMargins());
     d->updateGeometryConstraints();
     setAttribute(Qt::WA_Resized, false);
     d->titleBarPalette = d->desktopPalette();
@@ -2576,7 +2576,8 @@ void QMdiSubWindow::showSystemMenu()
 /*!
     \since 4.4
 
-    Returns the area containing this sub-window, or 0 if there is none.
+    Returns the area containing this sub-window, or \nullptr if there
+    is none.
 
     \sa QMdiArea::addSubWindow()
 */
@@ -2590,7 +2591,7 @@ QMdiArea *QMdiSubWindow::mdiArea() const
         }
         parent = parent->parentWidget();
     }
-    return 0;
+    return nullptr;
 }
 
 /*!
@@ -3341,8 +3342,11 @@ void QMdiSubWindow::mouseMoveEvent(QMouseEvent *mouseEvent)
     }
 
     if ((mouseEvent->buttons() & Qt::LeftButton) || d->isInInteractiveMode) {
-        if ((d->isResizeOperation() && d->resizeEnabled) || (d->isMoveOperation() && d->moveEnabled))
-            d->setNewGeometry(mapToParent(mouseEvent->pos()));
+        if ((d->isResizeOperation() && d->resizeEnabled) || (d->isMoveOperation() && d->moveEnabled)) {
+            // As setNewGeometry moves the window, it invalidates the pos() value of any mouse move events that are
+            // currently queued in the event loop. Map to parent using globalPos() instead.
+            d->setNewGeometry(parentWidget()->mapFromGlobal(mouseEvent->globalPos()));
+        }
         return;
     }
 
diff --git a/src/widgets/widgets/qmdisubwindow_p.h b/src/widgets/widgets/qmdisubwindow_p.h
index 719984c8d4..d3513b6708 100644
--- a/src/widgets/widgets/qmdisubwindow_p.h
+++ b/src/widgets/widgets/qmdisubwindow_p.h
@@ -78,7 +78,7 @@ template<typename T>
 class ControlElement : public T
 {
 public:
-    ControlElement(QMdiSubWindow *child) : T(child, 0)
+    ControlElement(QMdiSubWindow *child) : T(child, nullptr)
     {
         Q_ASSERT(child);
         mdiChild = child;
@@ -88,7 +88,7 @@ public:
     {
         if (classname && strcmp(classname, "ControlElement") == 0)
             return this;
-        return 0;
+        return nullptr;
     }
 
     QPointer<QMdiSubWindow> mdiChild;
@@ -102,7 +102,7 @@ public:
 
 #if QT_CONFIG(menubar)
     void showButtonsInMenuBar(QMenuBar *menuBar);
-    void removeButtonsFromMenuBar(QMenuBar *menuBar = 0);
+    void removeButtonsFromMenuBar(QMenuBar *menuBar = nullptr);
     QMenuBar *menuBar() const { return m_menuBar; }
 #endif
     void updateWindowIcon(const QIcon &windowIcon);
@@ -331,7 +331,7 @@ public:
     inline bool autoRaise() const
     {
         Q_Q(const QMdiSubWindow);
-        return q->style()->styleHint(QStyle::SH_TitleBar_AutoRaise, 0, q);
+        return q->style()->styleHint(QStyle::SH_TitleBar_AutoRaise, nullptr, q);
     }
 
     inline bool isResizeOperation() const
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index c79e88f094..14964a696d 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -78,6 +78,7 @@
 #include <private/qguiapplication_p.h>
 #include <qpa/qplatformtheme.h>
 #include <private/qdesktopwidget_p.h>
+#include <private/qstyle_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -307,29 +308,26 @@ int QMenuPrivate::scrollerHeight() const
     return qMax(QApplication::globalStrut().height(), q->style()->pixelMetric(QStyle::PM_MenuScrollerHeight, 0, q));
 }
 
-//Windows and KDE allow menus to cover the taskbar, while GNOME and Mac don't
+// Windows and KDE allow menus to cover the taskbar, while GNOME and macOS
+// don't. Torn-off menus are again different
+inline bool QMenuPrivate::useFullScreenForPopup() const
+{
+    return !tornoff && QStylePrivate::useFullScreenForPopup();
+}
+
 QRect QMenuPrivate::popupGeometry() const
 {
     Q_Q(const QMenu);
-    if (!tornoff && // Torn-off menus are different
-            QGuiApplicationPrivate::platformTheme() &&
-            QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::UseFullScreenForPopupMenu).toBool()) {
-        return QDesktopWidgetPrivate::screenGeometry(q);
-    } else {
-        return QDesktopWidgetPrivate::availableGeometry(q);
-    }
+    return useFullScreenForPopup()
+        ? QDesktopWidgetPrivate::screenGeometry(q)
+        : QDesktopWidgetPrivate::availableGeometry(q);
 }
 
-//Windows and KDE allow menus to cover the taskbar, while GNOME and Mac don't
 QRect QMenuPrivate::popupGeometry(int screen) const
 {
-    if (!tornoff && // Torn-off menus are different
-            QGuiApplicationPrivate::platformTheme() &&
-            QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::UseFullScreenForPopupMenu).toBool()) {
-        return QDesktopWidgetPrivate::screenGeometry(screen);
-    } else {
-        return QDesktopWidgetPrivate::availableGeometry(screen);
-    }
+    return useFullScreenForPopup()
+        ? QDesktopWidgetPrivate::screenGeometry(screen)
+        : QDesktopWidgetPrivate::availableGeometry(screen);
 }
 
 QVector<QPointer<QWidget> > QMenuPrivate::calcCausedStack() const
@@ -896,23 +894,6 @@ void QMenuPrivate::_q_overrideMenuActionDestroyed()
     menuAction=defaultMenuAction;
 }
 
-void QMenuPrivate::adjustMenuScreen(const QPoint &p)
-{
-    Q_Q(QMenu);
-    // The windowHandle must point to the screen where the menu will be shown.
-    // The (item) size calculations depend on the menu screen,
-    // so a wrong screen would often cause wrong sizes (on high DPI)
-    const QScreen *currentScreen = q->windowHandle() ? q->windowHandle()->screen() : nullptr;
-    QScreen *actualScreen = QGuiApplication::screenAt(p);
-    if (actualScreen && currentScreen != actualScreen) {
-        if (!q->windowHandle()) // Try to create a window handle if not created.
-            createWinId();
-        if (q->windowHandle())
-            q->windowHandle()->setScreen(actualScreen);
-        itemsDirty = true;
-    }
-}
-
 void QMenuPrivate::updateLayoutDirection()
 {
     Q_Q(QMenu);
@@ -1800,21 +1781,6 @@ QAction *QMenu::addAction(const QString &text, const QObject *receiver, const ch
     return action;
 }
 
-/*!\fn template<typename PointerToMemberFunction> QAction *QMenu::addAction(const QString &text, const QObject *receiver, PointerToMemberFunction method, const QKeySequence &shortcut = 0)
-
-    \since 5.6
-
-    \overload
-
-    This convenience function creates a new action with the text \a
-    text and an optional shortcut \a shortcut. The action's
-    \l{QAction::triggered()}{triggered()} signal is connected to the
-    \a method of the \a receiver. The function adds the newly created
-    action to the menu's list of actions and returns it.
-
-    QMenu takes ownership of the returned QAction.
-*/
-
 /*!\fn template<typename Functor> QAction *QMenu::addAction(const QString &text, Functor functor, const QKeySequence &shortcut = 0)
 
     \since 5.6
@@ -1839,25 +1805,11 @@ QAction *QMenu::addAction(const QString &text, const QObject *receiver, const ch
     This convenience function creates a new action with the text \a
     text and an optional shortcut \a shortcut. The action's
     \l{QAction::triggered()}{triggered()} signal is connected to the
-    \a functor. The function adds the newly created
-    action to the menu's list of actions and returns it.
+    \a functor. The functor can be a pointer to a member function of
+    the \a context object. The newly created action is added to the
+    menu's list of actions and a pointer to it is returned.
 
-    If \a context is destroyed, the functor will not be called.
-
-    QMenu takes ownership of the returned QAction.
-*/
-
-/*!\fn template<typename PointerToMemberFunction> QAction *QMenu::addAction(const QIcon &icon, const QString &text, const QObject *receiver, PointerToMemberFunction method, const QKeySequence &shortcut = 0)
-
-    \since 5.6
-
-    \overload
-
-    This convenience function creates a new action with an \a icon
-    and some \a text and an optional shortcut \a shortcut. The action's
-    \l{QAction::triggered()}{triggered()} signal is connected to the
-    \a method of the \a receiver. The function adds the newly created
-    action to the menu's list of actions and returns it.
+    If the \a context object is destroyed, the functor will not be called.
 
     QMenu takes ownership of the returned QAction.
 */
@@ -1886,8 +1838,9 @@ QAction *QMenu::addAction(const QString &text, const QObject *receiver, const ch
     This convenience function creates a new action with an \a icon
     and some \a text and an optional shortcut \a shortcut. The action's
     \l{QAction::triggered()}{triggered()} signal is connected to the
-    \a functor. The function adds the newly created
-    action to the menu's list of actions and returns it.
+    \a functor. The \a functor can be a pointer to a member function
+    of the \a context object. The newly created action is added to the
+    menu's list of actions and a pointer to it is returned.
 
     If \a context is destroyed, the functor will not be called.
 
@@ -2241,7 +2194,7 @@ void QMenu::setActiveAction(QAction *act)
 
 
 /*!
-    Returns the currently highlighted action, or 0 if no
+    Returns the currently highlighted action, or \nullptr if no
     action is currently highlighted.
 */
 QAction *QMenu::activeAction() const
@@ -2300,7 +2253,7 @@ int QMenu::columnCount() const
 }
 
 /*!
-  Returns the item at \a pt; returns 0 if there is no item there.
+  Returns the item at \a pt; returns \nullptr if there is no item there.
 */
 QAction *QMenu::actionAt(const QPoint &pt) const
 {
@@ -2375,7 +2328,8 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
     d->motions = 0;
     d->doChildEffects = true;
     d->updateLayoutDirection();
-    d->adjustMenuScreen(p);
+    // Ensure that we get correct sizeHints by placing this window on the right screen.
+    d->setScreenForPoint(p);
 
     const bool contextMenu = d->isContextMenu();
     if (d->lastContextMenu != contextMenu) {
@@ -2608,8 +2562,8 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
     This is equivalent to \c{exec(pos())}.
 
     This returns the triggered QAction in either the popup menu or one
-    of its submenus, or 0 if no item was triggered (normally because
-    the user pressed Esc).
+    of its submenus, or \nullptr if no item was triggered (normally
+    because the user pressed Esc).
 
     In most situations you'll want to specify the position yourself,
     for example, the current mouse position:
@@ -2635,8 +2589,8 @@ QAction *QMenu::exec()
     coordinates into global coordinates, use QWidget::mapToGlobal().
 
     This returns the triggered QAction in either the popup menu or one
-    of its submenus, or 0 if no item was triggered (normally because
-    the user pressed Esc).
+    of its submenus, or \nullptr if no item was triggered (normally
+    because the user pressed Esc).
 
     Note that all signals are emitted as usual. If you connect a
     QAction to a slot and call the menu's exec(), you get the result
@@ -2672,11 +2626,11 @@ QAction *QMenu::exec(const QPoint &p, QAction *action)
     QPointer<QObject> guard = this;
     (void) eventLoop.exec();
     if (guard.isNull())
-        return 0;
+        return nullptr;
 
     action = d->syncAction;
-    d->syncAction = 0;
-    d->eventLoop = 0;
+    d->syncAction = nullptr;
+    d->eventLoop = nullptr;
     return action;
 }
 
@@ -2694,7 +2648,7 @@ QAction *QMenu::exec(const QPoint &p, QAction *action)
     QGraphicsView).
 
     The function returns the triggered QAction in either the popup
-    menu or one of its submenus, or 0 if no item was triggered
+    menu or one of its submenus, or \nullptr if no item was triggered
     (normally because the user pressed Esc).
 
     This is equivalent to:
diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h
index 628f818b5e..84ab9e027a 100644
--- a/src/widgets/widgets/qmenu.h
+++ b/src/widgets/widgets/qmenu.h
@@ -82,14 +82,10 @@ public:
     QAction *addAction(const QIcon &icon, const QString &text, const QObject *receiver, const char* member, const QKeySequence &shortcut = 0);
 
 #ifdef Q_CLANG_QDOC
-    template<typename PointerToMemberFunction>
-    QAction *addAction(const QString &text, const QObject *receiver, PointerToMemberFunction method, const QKeySequence &shortcut = 0);
     template<typename Functor>
     QAction *addAction(const QString &text, Functor functor, const QKeySequence &shortcut = 0);
     template<typename Functor>
     QAction *addAction(const QString &text, const QObject *context, Functor functor, const QKeySequence &shortcut = 0);
-    template<typename PointerToMemberFunction>
-    QAction *addAction(const QIcon &icon, const QString &text, const QObject *receiver, PointerToMemberFunction method, const QKeySequence &shortcut = 0);
     template<typename Functor>
     QAction *addAction(const QIcon &icon, const QString &text, Functor functor, const QKeySequence &shortcut = 0);
     template<typename Functor>
diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h
index 721a35bf90..ef152cd71b 100644
--- a/src/widgets/widgets/qmenu_p.h
+++ b/src/widgets/widgets/qmenu_p.h
@@ -95,6 +95,12 @@ static inline int &rperp(Qt::Orientation o, QPoint &pos)
 static inline int &rperp(Qt::Orientation o, QSize &size)
 { return o == Qt::Vertical ? size.rwidth() : size.rheight(); }
 
+static inline int pick(Qt::Orientation o, const QMargins &m)
+{ return o == Qt::Horizontal ? (m.left() + m.right()) : (m.top() + m.bottom()); }
+
+static inline int perp(Qt::Orientation o, const QMargins &m)
+{ return o == Qt::Vertical ? (m.left() + m.right()) : (m.top() + m.bottom()); }
+
 class QTornOffMenu;
 class QEventLoop;
 
@@ -115,7 +121,7 @@ private:
 
 class QMenuSloppyState
 {
-    Q_DISABLE_COPY(QMenuSloppyState)
+    Q_DISABLE_COPY_MOVE(QMenuSloppyState)
 public:
     QMenuSloppyState()
         : m_enabled(false)
@@ -129,9 +135,9 @@ public:
     void initialize(QMenu *menu)
     {
         m_menu = menu;
-        m_uni_directional = menu->style()->styleHint(QStyle::SH_Menu_SubMenuUniDirection, 0, menu);
-        m_uni_dir_fail_at_count = short(menu->style()->styleHint(QStyle::SH_Menu_SubMenuUniDirectionFailCount, 0, menu));
-        m_select_other_actions = menu->style()->styleHint(QStyle::SH_Menu_SubMenuSloppySelectOtherActions, 0 , menu);
+        m_uni_directional = menu->style()->styleHint(QStyle::SH_Menu_SubMenuUniDirection, nullptr, menu);
+        m_uni_dir_fail_at_count = short(menu->style()->styleHint(QStyle::SH_Menu_SubMenuUniDirectionFailCount, nullptr, menu));
+        m_select_other_actions = menu->style()->styleHint(QStyle::SH_Menu_SubMenuSloppySelectOtherActions, nullptr , menu);
         m_timeout = short(menu->style()->styleHint(QStyle::SH_Menu_SubMenuSloppyCloseTimeout));
         m_discard_state_when_entering_parent = menu->style()->styleHint(QStyle::SH_Menu_SubMenuResetWhenReenteringParent);
         m_dont_start_time_on_leave = menu->style()->styleHint(QStyle::SH_Menu_SubMenuDontStartSloppyOnLeave);
@@ -343,6 +349,7 @@ public:
     void updateActionRects(const QRect &screen) const;
     QRect popupGeometry() const;
     QRect popupGeometry(int screen) const;
+    bool useFullScreenForPopup() const;
     int getLastVisibleAction() const;
 
     //selection
@@ -371,7 +378,7 @@ public:
         }
         void stop()
         {
-            action = 0;
+            action = nullptr;
             timer.stop();
         }
 
@@ -456,7 +463,6 @@ public:
 
     bool hasMouseMoved(const QPoint &globalPos);
 
-    void adjustMenuScreen(const QPoint &p);
     void updateLayoutDirection();
 
     QPointer<QPlatformMenu> platformMenu;
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index ce74a4c2ff..e7984078de 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -1581,7 +1581,7 @@ bool QMenuBar::eventFilter(QObject *object, QEvent *event)
 }
 
 /*!
-  Returns the QAction at \a pt. Returns 0 if there is no action at \a pt or if
+  Returns the QAction at \a pt. Returns \nullptr if there is no action at \a pt or if
 the location has a separator.
 
     \sa addAction(), addSeparator()
diff --git a/src/widgets/widgets/qmenubar_p.h b/src/widgets/widgets/qmenubar_p.h
index c276a4512d..e3db16d190 100644
--- a/src/widgets/widgets/qmenubar_p.h
+++ b/src/widgets/widgets/qmenubar_p.h
@@ -65,9 +65,9 @@ class QMenuBarPrivate : public QWidgetPrivate
 {
     Q_DECLARE_PUBLIC(QMenuBar)
 public:
-    QMenuBarPrivate() : itemsDirty(0), currentAction(0), mouseDown(0),
+    QMenuBarPrivate() : itemsDirty(0), currentAction(nullptr), mouseDown(0),
                          closePopupMode(0), defaultPopDown(1), popupState(0), keyboardState(0), altPressed(0),
-                         doChildEffects(false), platformMenuBar(0)
+                         doChildEffects(false), platformMenuBar(nullptr)
     { }
 
     ~QMenuBarPrivate()
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp
index 36a150396c..dc8765ad88 100644
--- a/src/widgets/widgets/qplaintextedit.cpp
+++ b/src/widgets/widgets/qplaintextedit.cpp
@@ -294,6 +294,7 @@ void QPlainTextDocumentLayout::documentChanged(int from, int charsRemoved, int c
 
     QTextBlock changeStartBlock = doc->findBlock(from);
     QTextBlock changeEndBlock = doc->findBlock(qMax(0, from + charsChanged - 1));
+    bool blockVisibilityChanged = false;
 
     if (changeStartBlock == changeEndBlock && newBlockCount == d->blockCount) {
         QTextBlock block = changeStartBlock;
@@ -311,14 +312,19 @@ void QPlainTextDocumentLayout::documentChanged(int from, int charsRemoved, int c
         QTextBlock block = changeStartBlock;
         do {
             block.clearLayout();
+            if (block.isVisible()
+                    ? (block.lineCount() == 0)
+                    : (block.lineCount() > 0)) {
+                blockVisibilityChanged = true;
+                block.setLineCount(block.isVisible() ? 1 : 0);
+            }
             if (block == changeEndBlock)
                 break;
             block = block.next();
         } while(block.isValid());
     }
 
-    if (newBlockCount != d->blockCount) {
-
+    if (newBlockCount != d->blockCount || blockVisibilityChanged) {
         int changeEnd = changeEndBlock.blockNumber();
         int blockDiff = newBlockCount - d->blockCount;
         int oldChangeEnd = changeEnd - blockDiff;
@@ -2033,7 +2039,7 @@ void QPlainTextEdit::paintEvent(QPaintEvent *e)
 
     if (backgroundVisible() && !block.isValid() && offset.y() <= er.bottom()
         && (centerOnScroll() || verticalScrollBar()->maximum() == verticalScrollBar()->minimum())) {
-        painter.fillRect(QRect(QPoint((int)er.left(), (int)offset.y()), er.bottomRight()), palette().background());
+        painter.fillRect(QRect(QPoint((int)er.left(), (int)offset.y()), er.bottomRight()), palette().window());
     }
 }
 
@@ -2924,7 +2930,7 @@ bool QPlainTextEdit::find(const QRegExp &exp, QTextDocument::FindFlags options)
 #endif
 
 /*!
-    \fn bool QTextEdit::find(const QRegularExpression &exp, QTextDocument::FindFlags options)
+    \fn bool QPlainTextEdit::find(const QRegularExpression &exp, QTextDocument::FindFlags options)
 
     \since 5.13
     \overload
diff --git a/src/widgets/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp
index 8f7271c2dc..b578aa0b18 100644
--- a/src/widgets/widgets/qpushbutton.cpp
+++ b/src/widgets/widgets/qpushbutton.cpp
@@ -545,8 +545,8 @@ void QPushButton::setMenu(QMenu* menu)
 }
 
 /*!
-    Returns the button's associated popup menu or 0 if no popup menu
-    has been set.
+    Returns the button's associated popup menu or \nullptr if no popup
+    menu has been set.
 
     \sa setMenu()
 */
diff --git a/src/widgets/widgets/qscrollarea.cpp b/src/widgets/widgets/qscrollarea.cpp
index 0bfc56f7fa..9994344d79 100644
--- a/src/widgets/widgets/qscrollarea.cpp
+++ b/src/widgets/widgets/qscrollarea.cpp
@@ -217,7 +217,7 @@ void QScrollAreaPrivate::updateScrollBars()
 }
 
 /*!
-    Returns the scroll area's widget, or 0 if there is none.
+    Returns the scroll area's widget, or \nullptr if there is none.
 
     \sa setWidget()
 */
diff --git a/src/widgets/widgets/qscrollarea_p.h b/src/widgets/widgets/qscrollarea_p.h
index fa2e0241cf..2bdf9ed596 100644
--- a/src/widgets/widgets/qscrollarea_p.h
+++ b/src/widgets/widgets/qscrollarea_p.h
@@ -65,7 +65,7 @@ class QScrollAreaPrivate: public QAbstractScrollAreaPrivate
     Q_DECLARE_PUBLIC(QScrollArea)
 
 public:
-    QScrollAreaPrivate(): resizable(false), alignment(0){}
+    QScrollAreaPrivate(): resizable(false), alignment(nullptr){}
     void updateScrollBars();
     void updateWidgetPosition();
     QPointer<QWidget> widget;
diff --git a/src/widgets/widgets/qspinbox.cpp b/src/widgets/widgets/qspinbox.cpp
index dcf3906dd7..97a3a12336 100644
--- a/src/widgets/widgets/qspinbox.cpp
+++ b/src/widgets/widgets/qspinbox.cpp
@@ -128,9 +128,10 @@ public:
     manually. The spin box supports integer values but can be extended to
     use different strings with validate(), textFromValue() and valueFromText().
 
-    Every time the value changes QSpinBox emits two valueChanged() signals,
-    one providing an int and the other a QString. The QString overload
-    provides the value with both prefix() and suffix().
+    Every time the value changes QSpinBox emits valueChanged() and
+    textChanged() signals, the former providing a int and the latter
+    a QString. The textChanged() signal provides the value with both
+    prefix() and suffix().
     The current value can be fetched with value() and set with setValue().
 
     Clicking the up/down buttons or using the keyboard accelerator's
@@ -183,12 +184,23 @@ public:
 */
 
 /*!
+    \fn void QSpinBox::textChanged(const QString &text)
+    \since 5.14
+
+    This signal is emitted whenever the spin box's text is changed.
+    The new text is passed in \a text with prefix() and suffix().
+*/
+
+#if QT_DEPRECATED_SINCE(5, 14)
+/*!
     \fn void QSpinBox::valueChanged(const QString &text)
 
     \overload
+    \obsolete Use textChanged(QString) instead
 
     The new value is passed in \a text with prefix() and suffix().
 */
+#endif
 
 /*!
     Constructs a spin box with 0 as minimum value and 99 as maximum value, a
@@ -594,9 +606,9 @@ void QSpinBox::fixup(QString &input) const
     values but can be extended to use different strings with
     validate(), textFromValue() and valueFromText().
 
-    Every time the value changes QDoubleSpinBox emits two
-    valueChanged() signals, one taking providing a double and the other
-    a QString. The QString overload provides the value with both
+    Every time the value changes QDoubleSpinBox emits valueChanged() and
+    textChanged() signals, the former providing a double and the latter
+    a QString. The textChanged() signal provides the value with both
     prefix() and suffix(). The current value can be fetched with
     value() and set with setValue().
 
@@ -644,12 +656,23 @@ void QSpinBox::fixup(QString &input) const
 */
 
 /*!
+    \fn void QDoubleSpinBox::textChanged(const QString &text)
+    \since 5.14
+
+    This signal is emitted whenever the spin box's text is changed.
+    The new text is passed in \a text with prefix() and suffix().
+*/
+
+#if QT_DEPRECATED_SINCE(5, 14)
+/*!
     \fn void QDoubleSpinBox::valueChanged(const QString &text);
 
     \overload
+    \obsolete Use textChanged(QString) instead
 
     The new value is passed in \a text with prefix() and suffix().
 */
+#endif
 
 /*!
     Constructs a spin box with 0.0 as minimum value and 99.99 as maximum value,
@@ -728,6 +751,10 @@ void QDoubleSpinBox::setPrefix(const QString &prefix)
 
     d->prefix = prefix;
     d->updateEdit();
+
+    d->cachedSizeHint = QSize();
+    d->cachedMinimumSizeHint = QSize(); // minimumSizeHint cares about the prefix
+    updateGeometry();
 }
 
 /*!
@@ -1068,7 +1095,13 @@ void QSpinBoxPrivate::emitSignals(EmitPolicy ep, const QVariant &old)
     if (ep != NeverEmit) {
         pendingEmit = false;
         if (ep == AlwaysEmit || value != old) {
+#if QT_DEPRECATED_SINCE(5, 14)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
             emit q->valueChanged(edit->displayText());
+QT_WARNING_POP
+#endif
+            emit q->textChanged(edit->displayText());
             emit q->valueChanged(value.toInt());
         }
     }
@@ -1134,10 +1167,14 @@ QVariant QSpinBoxPrivate::validateAndInterpret(QString &input, int &pos,
             num = copy.toInt(&ok, displayIntegerBase);
         } else {
             num = locale.toInt(copy, &ok);
-            if (!ok && copy.contains(locale.groupSeparator()) && (max >= 1000 || min <= -1000)) {
-                QString copy2 = copy;
-                copy2.remove(locale.groupSeparator());
-                num = locale.toInt(copy2, &ok);
+            if (!ok && (max >= 1000 || min <= -1000)) {
+                const QChar sep = locale.groupSeparator();
+                const QChar doubleSep[2] = {sep, sep};
+                if (copy.contains(sep) && !copy.contains(QString(doubleSep, 2))) {
+                    QString copy2 = copy;
+                    copy2.remove(locale.groupSeparator());
+                    num = locale.toInt(copy2, &ok);
+                }
             }
         }
         QSBDEBUG() << __FILE__ << __LINE__<< "num is set to" << num;
@@ -1215,7 +1252,13 @@ void QDoubleSpinBoxPrivate::emitSignals(EmitPolicy ep, const QVariant &old)
     if (ep != NeverEmit) {
         pendingEmit = false;
         if (ep == AlwaysEmit || value != old) {
+#if QT_DEPRECATED_SINCE(5, 14)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
             emit q->valueChanged(edit->displayText());
+QT_WARNING_POP
+#endif
+            emit q->textChanged(edit->displayText());
             emit q->valueChanged(value.toDouble());
         }
     }
diff --git a/src/widgets/widgets/qspinbox.h b/src/widgets/widgets/qspinbox.h
index d2eac903fb..762dd4a46a 100644
--- a/src/widgets/widgets/qspinbox.h
+++ b/src/widgets/widgets/qspinbox.h
@@ -106,7 +106,11 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void valueChanged(int);
+    void textChanged(const QString &);
+#if QT_DEPRECATED_SINCE(5, 14)
+    QT_DEPRECATED_X("Use textChanged(QString) instead")
     void valueChanged(const QString &);
+#endif
 
 private:
     Q_DISABLE_COPY(QSpinBox)
@@ -168,7 +172,11 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void valueChanged(double);
+    void textChanged(const QString &);
+#if QT_DEPRECATED_SINCE(5, 14)
+    QT_DEPRECATED_X("Use textChanged(QString) instead")
     void valueChanged(const QString &);
+#endif
 
 private:
     Q_DISABLE_COPY(QDoubleSpinBox)
diff --git a/src/widgets/widgets/qsplashscreen.cpp b/src/widgets/widgets/qsplashscreen.cpp
index 277d2fd99f..bf6bf1c7c9 100644
--- a/src/widgets/widgets/qsplashscreen.cpp
+++ b/src/widgets/widgets/qsplashscreen.cpp
@@ -46,6 +46,7 @@
 #include "qpixmap.h"
 #include "qtextdocument.h"
 #include "qtextcursor.h"
+#include <QtGui/qscreen.h>
 #include <QtGui/qwindow.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qelapsedtimer.h>
@@ -69,6 +70,10 @@ public:
     int currAlign;
 
     inline QSplashScreenPrivate();
+
+    void setPixmap(const QPixmap &p, const QScreen *screen = nullptr);
+
+    static const QScreen *screenFor(const QWidget *w);
 };
 
 /*!
@@ -143,8 +148,9 @@ QSplashScreen::QSplashScreen(const QPixmap &pixmap, Qt::WindowFlags f)
 QSplashScreen::QSplashScreen(QWidget *parent, const QPixmap &pixmap, Qt::WindowFlags f)
     : QWidget(*new QSplashScreenPrivate, parent, Qt::SplashScreen | Qt::FramelessWindowHint | f)
 {
-    d_func()->pixmap = pixmap;
-    setPixmap(d_func()->pixmap);  // Does an implicit repaint
+    // Does an implicit repaint. Explicitly pass parent as QObject::parent()
+    // is still 0 here due to QWidget's special handling.
+    d_func()->setPixmap(pixmap, QSplashScreenPrivate::screenFor(parent));
 }
 
 /*!
@@ -276,16 +282,54 @@ void QSplashScreen::finish(QWidget *mainWin)
 */
 void QSplashScreen::setPixmap(const QPixmap &pixmap)
 {
-    Q_D(QSplashScreen);
+    d_func()->setPixmap(pixmap, QSplashScreenPrivate::screenFor(this));
+}
+
+// In setPixmap(), resize and try to position on a screen according to:
+// 1) If a QDesktopScreenWidget is found in the parent hierarchy, use that (see docs on
+//    QSplashScreen(QWidget *, QPixmap).
+// 2) If a widget with associated QWindow is found, use that
+// 3) When nothing can be found, try to center it over the cursor
+
+static inline int screenNumberOf(const QDesktopScreenWidget *dsw)
+{
+    auto desktopWidgetPrivate =
+        static_cast<QDesktopWidgetPrivate *>(qt_widget_private(QApplication::desktop()));
+    return desktopWidgetPrivate->screens.indexOf(const_cast<QDesktopScreenWidget *>(dsw));
+}
+
+const QScreen *QSplashScreenPrivate::screenFor(const QWidget *w)
+{
+    for (const QWidget *p = w; p !=nullptr ; p = p->parentWidget()) {
+        if (auto dsw = qobject_cast<const QDesktopScreenWidget *>(p))
+            return QGuiApplication::screens().value(screenNumberOf(dsw));
+        if (QWindow *window = p->windowHandle())
+            return window->screen();
+    }
+#if QT_CONFIG(cursor)
+    // Note: We could rely on QPlatformWindow::initialGeometry() to center it
+    // over the cursor, but not all platforms (namely Android) use that.
+    if (QGuiApplication::screens().size() > 1) {
+        if (auto screenAtCursor = QGuiApplication::screenAt(QCursor::pos()))
+            return screenAtCursor;
+    }
+#endif // cursor
+    return QGuiApplication::primaryScreen();
+}
+
+void QSplashScreenPrivate::setPixmap(const QPixmap &p, const QScreen *screen)
+{
+    Q_Q(QSplashScreen);
 
-    d->pixmap = pixmap;
-    setAttribute(Qt::WA_TranslucentBackground, pixmap.hasAlpha());
+    pixmap = p;
+    q->setAttribute(Qt::WA_TranslucentBackground, pixmap.hasAlpha());
 
-    QRect r(QPoint(), d->pixmap.size()  / d->pixmap.devicePixelRatio());
-    resize(r.size());
-    move(QDesktopWidgetPrivate::screenGeometry().center() - r.center());
-    if (isVisible())
-        repaint();
+    QRect r(QPoint(), pixmap.size() / pixmap.devicePixelRatio());
+    q->resize(r.size());
+    if (screen)
+        q->move(screen->geometry().center() - r.center());
+    if (q->isVisible())
+        q->repaint();
 }
 
 /*!
diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp
index 9e38c8f18a..de838a8f93 100644
--- a/src/widgets/widgets/qsplitter.cpp
+++ b/src/widgets/widgets/qsplitter.cpp
@@ -161,11 +161,10 @@ Qt::Orientation QSplitterHandle::orientation() const
 
 
 /*!
-    Returns \c true if widgets are resized dynamically (opaquely), otherwise
-    returns \c false. This value is controlled by the QSplitter.
+    Returns \c true if widgets are resized dynamically (opaquely) while interactively moving the
+    splitter. Otherwise returns \c false. This value is controlled by the QSplitter.
 
     \sa QSplitter::opaqueResize()
-
 */
 bool QSplitterHandle::opaqueResize() const
 {
@@ -1232,7 +1231,7 @@ QSplitterHandle *QSplitter::createHandle()
 
 /*!
     Returns the handle to the left of (or above) the item in the
-    splitter's layout at the given \a index, or \c nullptr if there is no such item.
+    splitter's layout at the given \a index, or \nullptr if there is no such item.
     The handle at index 0 is always hidden.
 
     For right-to-left languages such as Arabic and Hebrew, the layout
@@ -1251,7 +1250,7 @@ QSplitterHandle *QSplitter::handle(int index) const
 
 /*!
     Returns the widget at the given \a index in the splitter's layout,
-    or \c nullptr if there is no such widget.
+    or \nullptr if there is no such widget.
 
     \sa count(), handle(), indexOf(), insertWidget()
 */
@@ -1483,7 +1482,8 @@ int QSplitter::closestLegalPosition(int pos, int index)
 
 /*!
     \property QSplitter::opaqueResize
-    \brief whether resizing is opaque
+    Returns \c true if widgets are resized dynamically (opaquely) while interactively moving the
+    splitter. Otherwise returns \c false.
 
     The default resize behavior is style dependent (determined by the
     SH_Splitter_OpaqueResize style hint). However, you can override it
@@ -1783,6 +1783,7 @@ void QSplitter::setStretchFactor(int index, int stretch)
 }
 
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \relates QSplitter
     \obsolete
@@ -1813,6 +1814,7 @@ QTextStream& operator>>(QTextStream& ts, QSplitter& splitter)
     splitter.restoreState(std::move(line).toLatin1());
     return ts;
 }
+#endif
 
 QT_END_NAMESPACE
 
diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h
index 16fac48d1c..ec980d9ee3 100644
--- a/src/widgets/widgets/qsplitter.h
+++ b/src/widgets/widgets/qsplitter.h
@@ -129,8 +129,12 @@ private:
     friend class QSplitterHandle;
 };
 
+#if QT_DEPRECATED_SINCE(5, 13)
+QT_DEPRECATED_X("Use QSplitter::saveState() instead")
 Q_WIDGETS_EXPORT QTextStream& operator<<(QTextStream&, const QSplitter&);
+QT_DEPRECATED_X("Use QSplitter::restoreState() instead")
 Q_WIDGETS_EXPORT QTextStream& operator>>(QTextStream&, QSplitter&);
+#endif
 
 class QSplitterHandlePrivate;
 class Q_WIDGETS_EXPORT QSplitterHandle : public QWidget
diff --git a/src/widgets/widgets/qsplitter_p.h b/src/widgets/widgets/qsplitter_p.h
index f0d621004f..871406a51d 100644
--- a/src/widgets/widgets/qsplitter_p.h
+++ b/src/widgets/widgets/qsplitter_p.h
@@ -70,7 +70,7 @@ public:
     QWidget *widget;
     QSplitterHandle *handle;
 
-    QSplitterLayoutStruct() : sizer(-1), collapsed(false), collapsible(Default), widget(0), handle(0) {}
+    QSplitterLayoutStruct() : sizer(-1), collapsed(false), collapsible(Default), widget(nullptr), handle(nullptr) {}
     ~QSplitterLayoutStruct() { delete handle; }
     int getWidgetSize(Qt::Orientation orient);
     int getHandleSize(Qt::Orientation orient);
@@ -84,7 +84,7 @@ class QSplitterPrivate : public QFramePrivate
 public:
     QSplitterPrivate() :
 #if QT_CONFIG(rubberband)
-                         rubberBand(0),
+                         rubberBand(nullptr),
 #endif
                          opaque(true), firstShow(true),
                          childrenCollapsible(true), compatMode(false), handleWidth(-1), blockChildAdd(false), opaqueResizeSet(false) {}
@@ -140,7 +140,7 @@ class QSplitterHandlePrivate : public QWidgetPrivate
 {
     Q_DECLARE_PUBLIC(QSplitterHandle)
 public:
-    QSplitterHandlePrivate() : s(0), orient(Qt::Horizontal), mouseOffset(0), opaq(false), hover(false), pressed(false) {}
+    QSplitterHandlePrivate() : s(nullptr), orient(Qt::Horizontal), mouseOffset(0), opaq(false), hover(false), pressed(false) {}
 
     inline int pick(const QPoint &pos) const
     { return orient == Qt::Horizontal ? pos.x() : pos.y(); }
diff --git a/src/widgets/widgets/qstackedwidget.cpp b/src/widgets/widgets/qstackedwidget.cpp
index 2217dab870..f863964c58 100644
--- a/src/widgets/widgets/qstackedwidget.cpp
+++ b/src/widgets/widgets/qstackedwidget.cpp
@@ -220,7 +220,7 @@ int QStackedWidget::currentIndex() const
 }
 
 /*!
-    Returns the current widget, or 0 if there are no child widgets.
+    Returns the current widget, or \nullptr if there are no child widgets.
 
     \sa currentIndex(), setCurrentWidget()
 */
@@ -260,8 +260,8 @@ int QStackedWidget::indexOf(QWidget *widget) const
 }
 
 /*!
-    Returns the widget at the given \a index, or 0 if there is no such
-    widget.
+    Returns the widget at the given \a index, or \nullptr if there is
+    no such widget.
 
     \sa currentWidget(), indexOf()
 */
diff --git a/src/widgets/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp
index ef98bb6950..e9044e6cad 100644
--- a/src/widgets/widgets/qstatusbar.cpp
+++ b/src/widgets/widgets/qstatusbar.cpp
@@ -482,14 +482,14 @@ void QStatusBar::reformat()
 #if QT_CONFIG(sizegrip)
     if (d->resizer) {
         d->box = new QHBoxLayout(this);
-        d->box->setMargin(0);
+        d->box->setContentsMargins(QMargins());
         vbox = new QVBoxLayout;
         d->box->addLayout(vbox);
     } else
 #endif
     {
         vbox = d->box = new QVBoxLayout(this);
-        d->box->setMargin(0);
+        d->box->setContentsMargins(QMargins());
     }
     vbox->addSpacing(3);
     QBoxLayout* l = new QHBoxLayout;
@@ -689,7 +689,7 @@ void QStatusBar::paintEvent(QPaintEvent *event)
         }
     }
     if (haveMessage) {
-        p.setPen(palette().foreground().color());
+        p.setPen(palette().windowText().color());
         p.drawText(d->messageRect(), Qt::AlignLeading | Qt::AlignVCenter | Qt::TextSingleLine, d->tempItem);
     }
 }
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp
index 5959dd0ae4..b13f4da9d2 100644
--- a/src/widgets/widgets/qtabbar.cpp
+++ b/src/widgets/widgets/qtabbar.cpp
@@ -2093,7 +2093,6 @@ void QTabBarPrivate::setupMovableTab()
     grabImage.setDevicePixelRatio(q->devicePixelRatioF());
     grabImage.fill(Qt::transparent);
     QStylePainter p(&grabImage, q);
-    p.initFrom(q);
 
     QStyleOptionTab tab;
     q->initStyleOption(&tab, pressedIndex);
@@ -2126,13 +2125,13 @@ void QTabBarPrivate::moveTabFinished(int index)
     Q_Q(QTabBar);
     bool cleanup = (pressedIndex == index) || (pressedIndex == -1) || !validIndex(index);
     bool allAnimationsFinished = true;
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     for(int i = 0; allAnimationsFinished && i < tabList.count(); ++i) {
         const Tab &t = tabList.at(i);
         if (t.animation && t.animation->state() == QAbstractAnimation::Running)
             allAnimationsFinished = false;
     }
-#endif //QT_NO_ANIMATION
+#endif // animation
     if (allAnimationsFinished && cleanup) {
         if(movingTab)
             movingTab->setVisible(false); // We might not get a mouse release
@@ -2567,7 +2566,7 @@ void QTabBar::setChangeCurrentOnDrag(bool change)
 
     The tab bar will take ownership of the widget and so all widgets set here
     will be deleted by the tab bar when it is destroyed unless you separately
-    reparent the widget after setting some other widget (or 0).
+    reparent the widget after setting some other widget (or \nullptr).
 
     \sa tabsClosable()
   */
@@ -2597,14 +2596,14 @@ void QTabBar::setTabButton(int index, ButtonPosition position, QWidget *widget)
 }
 
 /*!
-    Returns the widget set a tab \a index and \a position or 0 if
-    one is not set.
+    Returns the widget set a tab \a index and \a position or \nullptr
+    if one is not set.
   */
 QWidget *QTabBar::tabButton(int index, ButtonPosition position) const
 {
     Q_D(const QTabBar);
     if (index < 0 || index >= d->tabList.count())
-        return 0;
+        return nullptr;
     if (position == LeftSide)
         return d->tabList.at(index).leftWidget;
     else
@@ -2697,7 +2696,7 @@ void CloseButton::paintEvent(QPaintEvent *)
     style()->drawPrimitive(QStyle::PE_IndicatorTabClose, &opt, &p, this);
 }
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
 void QTabBarPrivate::Tab::TabBarAnimation::updateCurrentValue(const QVariant &current)
 {
     priv->moveTab(priv->tabList.indexOf(*tab), current.toInt());
diff --git a/src/widgets/widgets/qtabbar_p.h b/src/widgets/widgets/qtabbar_p.h
index 3948b42bc1..458d486b10 100644
--- a/src/widgets/widgets/qtabbar_p.h
+++ b/src/widgets/widgets/qtabbar_p.h
@@ -58,7 +58,9 @@
 #include <qicon.h>
 #include <qtoolbutton.h>
 #include <qdebug.h>
+#if QT_CONFIG(animation)
 #include <qvariantanimation.h>
+#endif
 
 #define ANIMATION_DURATION 250
 
@@ -90,7 +92,7 @@ public:
         drawBase(true), scrollOffset(0), hoverIndex(-1), elideModeSetByUser(false), useScrollButtonsSetByUser(false), expanding(true), closeButtonOnTabs(false),
         selectionBehaviorOnRemove(QTabBar::SelectRightTab), paintWithOffsets(true), movable(false),
         dragInProgress(false), documentMode(false), autoHide(false), changeCurrentOnDrag(false),
-        switchTabCurrentIndex(-1), switchTabTimerId(0), movingTab(0)
+        switchTabCurrentIndex(-1), switchTabTimerId(0), movingTab(nullptr)
 #if 0 // Used to be included in Qt4 for Q_WS_MAC
         , previousPressedIndex(-1)
 #endif
@@ -107,9 +109,9 @@ public:
         inline Tab(const QIcon &ico, const QString &txt)
             : enabled(true) , shortcutId(0), text(txt), icon(ico),
             leftWidget(0), rightWidget(0), lastTab(-1), dragOffset(0)
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
             , animation(0)
-#endif //QT_NO_ANIMATION
+#endif // animation
         {}
         bool operator==(const Tab &other) const { return &other == this; }
         bool enabled;
@@ -136,7 +138,7 @@ public:
         QString accessibleName;
 #endif
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
         ~Tab() { delete animation; }
         struct TabBarAnimation : public QVariantAnimation {
             TabBarAnimation(Tab *t, QTabBarPrivate *_priv) : tab(t), priv(_priv)
@@ -166,7 +168,7 @@ public:
 #else
         void startAnimation(QTabBarPrivate *priv, int duration)
         { Q_UNUSED(duration); priv->moveTabFinished(priv->tabList.indexOf(*this)); }
-#endif //QT_NO_ANIMATION
+#endif // animation
     };
     QList<Tab> tabList;
     mutable QHash<QString, QSize> textSizes;
@@ -180,7 +182,7 @@ public:
 
     int indexAtPos(const QPoint &p) const;
 
-    inline bool isAnimated() const { Q_Q(const QTabBar); return q->style()->styleHint(QStyle::SH_Widget_Animation_Duration, 0, q) > 0; }
+    inline bool isAnimated() const { Q_Q(const QTabBar); return q->style()->styleHint(QStyle::SH_Widget_Animation_Duration, nullptr, q) > 0; }
     inline bool validIndex(int index) const { return index >= 0 && index < tabList.count(); }
     void setCurrentNextEnabledIndex(int offset);
 
diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp
index 8a848554e3..547b8a82f9 100644
--- a/src/widgets/widgets/qtabwidget.cpp
+++ b/src/widgets/widgets/qtabwidget.cpp
@@ -579,7 +579,7 @@ void QTabWidget::setTabEnabled(int index, bool enable)
 
   All widgets set here will be deleted by the tab widget when it is
   destroyed unless you separately reparent the widget after setting
-  some other corner widget (or 0).
+  some other corner widget (or \nullptr).
 
   Note: Corner widgets are designed for \l North and \l South tab positions;
   other orientations are known to not work properly.
@@ -605,7 +605,7 @@ void QTabWidget::setCornerWidget(QWidget * widget, Qt::Corner corner)
 }
 
 /*!
-    Returns the widget shown in the \a corner of the tab widget or 0.
+    Returns the widget shown in the \a corner of the tab widget or \nullptr.
 */
 QWidget * QTabWidget::cornerWidget(Qt::Corner corner) const
 {
@@ -1146,8 +1146,8 @@ void QTabWidget::keyPressEvent(QKeyEvent *e)
 }
 
 /*!
-    Returns the tab page at index position \a index or 0 if the \a
-    index is out of range.
+    Returns the tab page at index position \a index or \nullptr if the
+    \a index is out of range.
 */
 QWidget *QTabWidget::widget(int index) const
 {
diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp
index 46b973bae7..bb9a4fed91 100644
--- a/src/widgets/widgets/qtextbrowser.cpp
+++ b/src/widgets/widgets/qtextbrowser.cpp
@@ -47,7 +47,9 @@
 #include <qdebug.h>
 #include <qabstracttextdocumentlayout.h>
 #include "private/qtextdocumentlayout_p.h"
+#if QT_CONFIG(textcodec)
 #include <qtextcodec.h>
+#endif
 #include <qpainter.h>
 #include <qdir.h>
 #if QT_CONFIG(whatsthis)
@@ -274,7 +276,7 @@ void QTextBrowserPrivate::setSource(const QUrl &url)
     Q_Q(QTextBrowser);
 #ifndef QT_NO_CURSOR
     if (q->isVisible())
-        QApplication::setOverrideCursor(Qt::WaitCursor);
+        QGuiApplication::setOverrideCursor(Qt::WaitCursor);
 #endif
     textOrSourceChanged = true;
 
@@ -293,7 +295,7 @@ void QTextBrowserPrivate::setSource(const QUrl &url)
         if (data.type() == QVariant::String) {
             txt = data.toString();
         } else if (data.type() == QVariant::ByteArray) {
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
             QByteArray ba = data.toByteArray();
             QTextCodec *codec = Qt::codecForHtml(ba);
             txt = codec->toUnicode(ba);
@@ -308,7 +310,7 @@ void QTextBrowserPrivate::setSource(const QUrl &url)
             const QStringRef firstTag = txt.leftRef(txt.indexOf(QLatin1Char('>')) + 1);
             if (firstTag.startsWith(QLatin1String("<qt")) && firstTag.contains(QLatin1String("type")) && firstTag.contains(QLatin1String("detail"))) {
 #ifndef QT_NO_CURSOR
-                QApplication::restoreOverrideCursor();
+                QGuiApplication::restoreOverrideCursor();
 #endif
 #if QT_CONFIG(whatsthis)
                 QWhatsThis::showText(QCursor::pos(), txt, q);
@@ -353,7 +355,7 @@ void QTextBrowserPrivate::setSource(const QUrl &url)
 
 #ifndef QT_NO_CURSOR
     if (q->isVisible())
-        QApplication::restoreOverrideCursor();
+        QGuiApplication::restoreOverrideCursor();
 #endif
     emit q->sourceChanged(url);
 }
diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp
index 4af71c126e..bcf5a40ae3 100644
--- a/src/widgets/widgets/qtoolbar.cpp
+++ b/src/widgets/widgets/qtoolbar.cpp
@@ -799,18 +799,6 @@ QAction *QToolBar::addAction(const QIcon &icon, const QString &text,
     return action;
 }
 
-/*!\fn template<typename PointerToMemberFunction> QAction *QToolBar::addAction(const QString &text, const QObject *receiver, PointerToMemberFunction method)
-
-    \since 5.6
-
-    \overload
-
-    Creates a new action with the given \a text. This action is added to
-    the end of the toolbar. The action's
-    \l{QAction::triggered()}{triggered()} signal is connected to the
-    \a method of the \a receiver.
-*/
-
 /*!\fn template<typename Functor> QAction *QToolBar::addAction(const QString &text, Functor functor)
 
     \since 5.6
@@ -829,24 +817,13 @@ QAction *QToolBar::addAction(const QIcon &icon, const QString &text,
 
     \overload
 
-    Creates a new action with the given \a text. This action is added to
-    the end of the toolbar. The action's
+    Creates a new action with the given \a text. This action is added
+    to the end of the toolbar. The action's
     \l{QAction::triggered()}{triggered()} signal is connected to the
-    \a functor.
-
-    If \a context is destroyed, the functor will not be called.
-*/
-
-/*!\fn template<typename PointerToMemberFunction> QAction *QToolBar::addAction(const QIcon &icon, const QString &text, const QObject *receiver, PointerToMemberFunction method)
-
-    \since 5.6
+    \a functor. The \a functor can be a pointer to a member function
+    in the \a context object.
 
-    \overload
-
-    Creates a new action with the given \a icon and \a text. This
-    action is added to the end of the toolbar. The action's
-    \l{QAction::triggered()}{triggered()} signal is connected to the
-    \a method of the \a receiver.
+    If the \a context object is destroyed, the \a functor will not be called.
 */
 
 /*!\fn template<typename Functor> QAction *QToolBar::addAction(const QIcon &icon, const QString &text, Functor functor)
@@ -870,9 +847,10 @@ QAction *QToolBar::addAction(const QIcon &icon, const QString &text,
     Creates a new action with the given \a icon and \a text. This
     action is added to the end of the toolbar. The action's
     \l{QAction::triggered()}{triggered()} signal is connected to the
-    \a functor.
+    \a functor. The \a functor can be a pointer to a member function
+    of the \a context object.
 
-    If \a context is destroyed, the functor will not be called.
+    If the \a context object is destroyed, the \a functor will not be called.
 */
 
 /*!
@@ -1067,7 +1045,7 @@ void QToolBar::paintEvent(QPaintEvent *)
     if (d->layout->expanded || d->layout->animating || isWindow()) {
         //if the toolbar is expended, we need to fill the background with the window color
         //because some styles may expects that.
-        p.fillRect(opt.rect, palette().background());
+        p.fillRect(opt.rect, palette().window());
         style->drawControl(QStyle::CE_ToolBar, &opt, &p, this);
         style->drawPrimitive(QStyle::PE_FrameMenu, &opt, &p, this);
     } else {
diff --git a/src/widgets/widgets/qtoolbar.h b/src/widgets/widgets/qtoolbar.h
index 4ae83190d1..0c434e8d1d 100644
--- a/src/widgets/widgets/qtoolbar.h
+++ b/src/widgets/widgets/qtoolbar.h
@@ -99,15 +99,11 @@ public:
     QAction *addAction(const QString &text, const QObject *receiver, const char* member);
     QAction *addAction(const QIcon &icon, const QString &text,
                        const QObject *receiver, const char* member);
-#ifdef Q_QDOC
-    template<typename PointerToMemberFunction>
-    QAction *addAction(const QString &text, const QObject *receiver, PointerToMemberFunction method);
+#ifdef Q_CLANG_QDOC
     template<typename Functor>
     QAction *addAction(const QString &text, Functor functor);
     template<typename Functor>
     QAction *addAction(const QString &text, const QObject *context, Functor functor);
-    template<typename PointerToMemberFunction>
-    QAction *addAction(const QIcon &icon, const QString &text, const QObject *receiver, PointerToMemberFunction method);
     template<typename Functor>
     QAction *addAction(const QIcon &icon, const QString &text, Functor functor);
     template<typename Functor>
@@ -149,7 +145,7 @@ public:
         connect(result, &QAction::triggered, slot);
         return result;
     }
-#endif // !Q_QDOC
+#endif // !Q_CLANG_QDOC
 
     QAction *addSeparator();
     QAction *insertSeparator(QAction *before);
diff --git a/src/widgets/widgets/qtoolbar_p.h b/src/widgets/widgets/qtoolbar_p.h
index 4db75762c8..8cb5850903 100644
--- a/src/widgets/widgets/qtoolbar_p.h
+++ b/src/widgets/widgets/qtoolbar_p.h
@@ -73,7 +73,7 @@ public:
         : explicitIconSize(false), explicitToolButtonStyle(false), movable(true), floatable(true),
           allowedAreas(Qt::AllToolBarAreas), orientation(Qt::Horizontal),
           toolButtonStyle(Qt::ToolButtonIconOnly),
-          layout(0), state(0)
+          layout(nullptr), state(nullptr)
 #ifdef Q_OS_OSX
         , macWindowDragging(false)
 #endif
diff --git a/src/widgets/widgets/qtoolbararealayout.cpp b/src/widgets/widgets/qtoolbararealayout.cpp
index 884eface3c..adc329131c 100644
--- a/src/widgets/widgets/qtoolbararealayout.cpp
+++ b/src/widgets/widgets/qtoolbararealayout.cpp
@@ -1078,7 +1078,11 @@ bool QToolBarAreaLayout::insertGap(const QList<int> &path, QLayoutItem *item)
 void QToolBarAreaLayout::remove(const QList<int> &path)
 {
     Q_ASSERT(path.count() == 3);
-    docks[path.at(0)].lines[path.at(1)].toolBarItems.removeAt(path.at(2));
+    QToolBarAreaLayoutInfo &dock = docks[path.at(0)];
+    QToolBarAreaLayoutLine &line = dock.lines[path.at(1)];
+    line.toolBarItems.removeAt(path.at(2));
+    if (line.toolBarItems.isEmpty())
+        dock.lines.removeAt(path.at(1));
 }
 
 void QToolBarAreaLayout::remove(QLayoutItem *item)
diff --git a/src/widgets/widgets/qtoolbararealayout_p.h b/src/widgets/widgets/qtoolbararealayout_p.h
index 17747ef29b..5df95a3038 100644
--- a/src/widgets/widgets/qtoolbararealayout_p.h
+++ b/src/widgets/widgets/qtoolbararealayout_p.h
@@ -69,7 +69,7 @@ class QStyleOptionToolBar;
 class QToolBarAreaLayoutItem
 {
 public:
-    QToolBarAreaLayoutItem(QLayoutItem *item = 0)
+    QToolBarAreaLayoutItem(QLayoutItem *item = nullptr)
         : widgetItem(item), pos(0), size(-1), preferredSize(-1), gap(false) {}
 
     bool skip() const;
diff --git a/src/widgets/widgets/qtoolbarlayout.cpp b/src/widgets/widgets/qtoolbarlayout.cpp
index f2d329d59d..d50e19a5ed 100644
--- a/src/widgets/widgets/qtoolbarlayout.cpp
+++ b/src/widgets/widgets/qtoolbarlayout.cpp
@@ -119,8 +119,9 @@ void QToolBarLayout::updateMarginAndSpacing()
     QStyle *style = tb->style();
     QStyleOptionToolBar opt;
     tb->initStyleOption(&opt);
-    setMargin(style->pixelMetric(QStyle::PM_ToolBarItemMargin, &opt, tb)
-                + style->pixelMetric(QStyle::PM_ToolBarFrameWidth, &opt, tb));
+    const int margin = style->pixelMetric(QStyle::PM_ToolBarItemMargin, &opt, tb)
+            + style->pixelMetric(QStyle::PM_ToolBarFrameWidth, &opt, tb);
+    setContentsMargins(margin, margin, margin, margin);
     setSpacing(style->pixelMetric(QStyle::PM_ToolBarItemSpacing, &opt, tb));
 }
 
@@ -268,7 +269,7 @@ void QToolBarLayout::updateGeomArray() const
     tb->initStyleOption(&opt);
     const int handleExtent = movable()
             ? style->pixelMetric(QStyle::PM_ToolBarHandleExtent, &opt, tb) : 0;
-    const int margin = this->margin();
+    const QMargins margins = contentsMargins();
     const int spacing = this->spacing();
     const int extensionExtent = style->pixelMetric(QStyle::PM_ToolBarExtensionExtent, &opt, tb);
     Qt::Orientation o = tb->orientation();
@@ -330,12 +331,12 @@ void QToolBarLayout::updateGeomArray() const
     that->empty = count == 0;
 
     rpick(o, that->minSize) += handleExtent;
-    that->minSize += QSize(2*margin, 2*margin);
+    that->minSize += QSize(pick(Qt::Horizontal, margins), pick(Qt::Vertical, margins));
     if (items.count() > 1)
         rpick(o, that->minSize) += spacing + extensionExtent;
 
     rpick(o, that->hint) += handleExtent;
-    that->hint += QSize(2*margin, 2*margin);
+    that->hint += QSize(pick(Qt::Horizontal, margins), pick(Qt::Vertical, margins));
     that->dirty = false;
 }
 
@@ -384,7 +385,7 @@ void QToolBarLayout::setGeometry(const QRect &rect)
     QStyle *style = tb->style();
     QStyleOptionToolBar opt;
     tb->initStyleOption(&opt);
-    const int margin = this->margin();
+    const QMargins margins = contentsMargins();
     const int extensionExtent = style->pixelMetric(QStyle::PM_ToolBarExtensionExtent, &opt, tb);
     Qt::Orientation o = tb->orientation();
 
@@ -403,14 +404,18 @@ void QToolBarLayout::setGeometry(const QRect &rect)
         QSize hint = sizeHint();
 
         QPoint pos;
-        rpick(o, pos) = pick(o, rect.bottomRight()) - margin - extensionExtent + 2;
+        rpick(o, pos) = pick(o, rect.bottomRight()) -
+                pick(o, QSize(margins.bottom(), margins.right())) - extensionExtent + 2;
         if (area == Qt::LeftToolBarArea || area == Qt::TopToolBarArea)
-            rperp(o, pos) = perp(o, rect.topLeft()) + margin;
+            rperp(o, pos) = perp(o, rect.topLeft()) +
+                    perp(o, QSize(margins.top(), margins.left()));
         else
-            rperp(o, pos) = perp(o, rect.bottomRight()) - margin - (perp(o, hint) - 2*margin) + 1;
+            rperp(o, pos) = perp(o, rect.bottomRight()) -
+                    perp(o, QSize(margins.bottom(), margins.right())) -
+                    (perp(o, hint) - perp(o, margins)) + 1;
         QSize size;
         rpick(o, size) = extensionExtent;
-        rperp(o, size) = perp(o, hint) - 2*margin;
+        rperp(o, size) = perp(o, hint) - perp(o, margins);
         QRect r(pos, size);
 
         if (o == Qt::Horizontal)
@@ -443,13 +448,13 @@ bool QToolBarLayout::layoutActions(const QSize &size)
     tb->initStyleOption(&opt);
     const int handleExtent = movable()
             ? style->pixelMetric(QStyle::PM_ToolBarHandleExtent, &opt, tb) : 0;
-    const int margin = this->margin();
+    const QMargins margins = contentsMargins();
     const int spacing = this->spacing();
     const int extensionExtent = style->pixelMetric(QStyle::PM_ToolBarExtensionExtent, &opt, tb);
     Qt::Orientation o = tb->orientation();
     bool extensionMenuContainsOnlyWidgetActions = true;
 
-    int space = pick(o, rect.size()) - 2*margin - handleExtent;
+    int space = pick(o, rect.size()) - pick(o, margins) - handleExtent;
     if (space <= 0)
         return false;  // nothing to do.
 
@@ -458,7 +463,7 @@ bool QToolBarLayout::layoutActions(const QSize &size)
 
     bool ranOutOfSpace = false;
     int rows = 0;
-    int rowPos = perp(o, rect.topLeft()) + margin;
+    int rowPos = perp(o, rect.topLeft()) + perp(o, QSize(margins.top(), margins.left()));
     int i = 0;
     while (i < items.count()) {
         QVector<QLayoutStruct> a = geomArray;
@@ -521,14 +526,14 @@ bool QToolBarLayout::layoutActions(const QSize &size)
             }
 
             QPoint pos;
-            rpick(o, pos) = margin + handleExtent + a[j].pos;
+            rpick(o, pos) = pick(o, QSize(margins.top(), margins.left())) + handleExtent + a[j].pos;
             rperp(o, pos) = rowPos;
             QSize size;
             rpick(o, size) = a[j].size;
             if (expanded)
                 rperp(o, size) = rowHeight;
             else
-                rperp(o, size) = perp(o, rect.size()) - 2*margin;
+                rperp(o, size) = perp(o, rect.size()) - perp(o, QSize(margins.top(), margins.left()));
             QRect r(pos, size);
 
             if (o == Qt::Horizontal)
@@ -589,7 +594,7 @@ QSize QToolBarLayout::expandedSize(const QSize &size) const
     tb->initStyleOption(&opt);
     const int handleExtent = movable()
             ? style->pixelMetric(QStyle::PM_ToolBarHandleExtent, &opt, tb) : 0;
-    const int margin = this->margin();
+    const QMargins margins = contentsMargins();
     const int spacing = this->spacing();
     const int extensionExtent = style->pixelMetric(QStyle::PM_ToolBarExtensionExtent, &opt, tb);
 
@@ -609,9 +614,9 @@ QSize QToolBarLayout::expandedSize(const QSize &size) const
     if (rows == 1)
         ++rows;      // we want to expand to at least two rows
     int space = total_w/rows + spacing + extensionExtent;
-    space = qMax(space, min_w - 2*margin - handleExtent);
+    space = qMax(space, min_w - pick(o, margins) - handleExtent);
     if (win != 0)
-        space = qMin(space, pick(o, win->size()) - 2*margin - handleExtent);
+        space = qMin(space, pick(o, win->size()) - pick(o, margins) - handleExtent);
 
     int w = 0;
     int h = 0;
@@ -644,11 +649,11 @@ QSize QToolBarLayout::expandedSize(const QSize &size) const
         h += rowHeight + spacing;
     }
 
-    w += 2*margin + handleExtent + spacing + extensionExtent;
+    w += pick(Qt::Horizontal, margins) + handleExtent + spacing + extensionExtent;
     w = qMax(w, min_w);
     if (win != 0)
         w = qMin(w, pick(o, win->size()));
-    h += 2*margin - spacing; //there is no spacing before the first row
+    h += pick(Qt::Vertical, margins) - spacing; //there is no spacing before the first row
 
     QSize result;
     rpick(o, result) = w;
diff --git a/src/widgets/widgets/qtoolbarlayout_p.h b/src/widgets/widgets/qtoolbarlayout_p.h
index a788d30450..b5dc121b93 100644
--- a/src/widgets/widgets/qtoolbarlayout_p.h
+++ b/src/widgets/widgets/qtoolbarlayout_p.h
@@ -79,7 +79,7 @@ class QToolBarLayout : public QLayout
     Q_OBJECT
 
 public:
-    QToolBarLayout(QWidget *parent = 0);
+    QToolBarLayout(QWidget *parent = nullptr);
     ~QToolBarLayout();
 
     void addItem(QLayoutItem *item) override;
diff --git a/src/widgets/widgets/qtoolbox.cpp b/src/widgets/widgets/qtoolbox.cpp
index 46ade0277c..1c83485bff 100644
--- a/src/widgets/widgets/qtoolbox.cpp
+++ b/src/widgets/widgets/qtoolbox.cpp
@@ -294,7 +294,7 @@ QToolBox::QToolBox(QWidget *parent, Qt::WindowFlags f)
 {
     Q_D(QToolBox);
     d->layout = new QVBoxLayout(this);
-    d->layout->setMargin(0);
+    d->layout->setContentsMargins(QMargins());
     setBackgroundRole(QPalette::Button);
 }
 
@@ -437,7 +437,7 @@ void QToolBoxPrivate::relayout()
     Q_Q(QToolBox);
     delete layout;
     layout = new QVBoxLayout(q);
-    layout->setMargin(0);
+    layout->setContentsMargins(QMargins());
     for (QToolBoxPrivate::PageList::ConstIterator i = pageList.constBegin(); i != pageList.constEnd(); ++i) {
         layout->addWidget((*i).button);
         layout->addWidget((*i).sv);
@@ -504,7 +504,8 @@ int QToolBox::currentIndex() const
 }
 
 /*!
-    Returns a pointer to the current widget, or 0 if there is no such item.
+    Returns a pointer to the current widget, or \nullptr if there is
+    no such item.
 
     \sa currentIndex(), setCurrentWidget()
 */
@@ -512,7 +513,7 @@ int QToolBox::currentIndex() const
 QWidget * QToolBox::currentWidget() const
 {
     Q_D(const QToolBox);
-    return d->currentPage ? d->currentPage->widget : 0;
+    return d->currentPage ? d->currentPage->widget : nullptr;
 }
 
 /*!
@@ -530,15 +531,15 @@ void QToolBox::setCurrentWidget(QWidget *widget)
 }
 
 /*!
-    Returns the widget at position \a index, or 0 if there is no such
-    item.
+    Returns the widget at position \a index, or \nullptr if there is
+    no such item.
 */
 
 QWidget *QToolBox::widget(int index) const
 {
     Q_D(const QToolBox);
     if (index < 0 || index >= (int) d->pageList.size())
-        return 0;
+        return nullptr;
     return d->pageList.at(index).widget;
 }
 
diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp
index 03950ef44b..b00b219386 100644
--- a/src/widgets/widgets/qtoolbutton.cpp
+++ b/src/widgets/widgets/qtoolbutton.cpp
@@ -669,7 +669,8 @@ void QToolButton::setMenu(QMenu* menu)
 }
 
 /*!
-    Returns the associated menu, or 0 if no menu has been defined.
+    Returns the associated menu, or \nullptr if no menu has been
+    defined.
 
     \sa setMenu()
 */
@@ -678,7 +679,7 @@ QMenu* QToolButton::menu() const
     Q_D(const QToolButton);
     if (d->menuAction)
         return d->menuAction->menu();
-    return 0;
+    return nullptr;
 }
 
 /*!
@@ -898,7 +899,23 @@ bool QToolButton::autoRaise() const
   Sets the default action to \a action.
 
   If a tool button has a default action, the action defines the
-  button's properties like text, icon, tool tip, etc.
+  following properties of the button:
+
+  \list
+  \li \l {QAbstractButton::}{checkable}
+  \li \l {QAbstractButton::}{checked}
+  \li \l {QWidget::}{enabled}
+  \li \l {QWidget::}{font}
+  \li \l {QAbstractButton::}{icon}
+  \li \l {QToolButton::}{popupMode} (assuming the action has a menu)
+  \li \l {QWidget::}{statusTip}
+  \li \l {QAbstractButton::}{text}
+  \li \l {QWidget::}{toolTip}
+  \li \l {QWidget::}{whatsThis}
+  \endlist
+
+  Other properties, such as \l autoRepeat, are not affected
+  by actions.
  */
 void QToolButton::setDefaultAction(QAction *action)
 {
diff --git a/src/widgets/widgets/qwidgetanimator.cpp b/src/widgets/widgets/qwidgetanimator.cpp
index b6828a14ef..b1e527e3b6 100644
--- a/src/widgets/widgets/qwidgetanimator.cpp
+++ b/src/widgets/widgets/qwidgetanimator.cpp
@@ -37,15 +37,17 @@
 **
 ****************************************************************************/
 
+#include "qwidgetanimator_p.h"
+
+#if QT_CONFIG(animation)
 #include <QtCore/qpropertyanimation.h>
+#endif
 #include <QtWidgets/qwidget.h>
 #include <QtWidgets/qstyle.h>
 #if QT_CONFIG(mainwindow)
 #include <private/qmainwindowlayout_p.h>
 #endif
 
-#include "qwidgetanimator_p.h"
-
 QT_BEGIN_NAMESPACE
 
 QWidgetAnimator::QWidgetAnimator(QMainWindowLayout *layout) : m_mainWindowLayout(layout)
@@ -54,7 +56,7 @@ QWidgetAnimator::QWidgetAnimator(QMainWindowLayout *layout) : m_mainWindowLayout
 
 void QWidgetAnimator::abort(QWidget *w)
 {
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     const auto it = m_animation_map.constFind(w);
     if (it == m_animation_map.cend())
         return;
@@ -68,16 +70,16 @@ void QWidgetAnimator::abort(QWidget *w)
 #endif
 #else
     Q_UNUSED(w); //there is no animation to abort
-#endif //QT_NO_ANIMATION
+#endif // animation
 }
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
 void QWidgetAnimator::animationFinished()
 {
     QPropertyAnimation *anim = qobject_cast<QPropertyAnimation*>(sender());
     abort(static_cast<QWidget*>(anim->targetObject()));
 }
-#endif //QT_NO_ANIMATION
+#endif // animation
 
 void QWidgetAnimator::animate(QWidget *widget, const QRect &_final_geometry, bool animate)
 {
@@ -91,7 +93,7 @@ void QWidgetAnimator::animate(QWidget *widget, const QRect &_final_geometry, boo
     const QRect final_geometry = _final_geometry.isValid() || widget->isWindow() ? _final_geometry :
         QRect(QPoint(-500 - widget->width(), -500 - widget->height()), widget->size());
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     //If the QStyle has animations, animate
     if (const int animationDuration = widget->style()->styleHint(QStyle::SH_Widget_Animation_Duration, 0, widget)) {
         AnimationMap::const_iterator it = m_animation_map.constFind(widget);
@@ -106,7 +108,7 @@ void QWidgetAnimator::animate(QWidget *widget, const QRect &_final_geometry, boo
         connect(anim, SIGNAL(finished()), SLOT(animationFinished()));
         anim->start(QPropertyAnimation::DeleteWhenStopped);
     } else
-#endif //QT_NO_ANIMATION
+#endif // animation
     {
     //we do it in one shot
     widget->setGeometry(final_geometry);
diff --git a/src/widgets/widgets/qwidgetanimator_p.h b/src/widgets/widgets/qwidgetanimator_p.h
index 90be22c271..920cc3ffc8 100644
--- a/src/widgets/widgets/qwidgetanimator_p.h
+++ b/src/widgets/widgets/qwidgetanimator_p.h
@@ -73,7 +73,7 @@ public:
 
     void abort(QWidget *widget);
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
 private Q_SLOTS:
     void animationFinished();
 #endif
diff --git a/src/widgets/widgets/qwidgetlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h
index 3e33bc0605..940a17714f 100644
--- a/src/widgets/widgets/qwidgetlinecontrol_p.h
+++ b/src/widgets/widgets/qwidgetlinecontrol_p.h
@@ -91,7 +91,7 @@ public:
         m_dragEnabled(0), m_echoMode(0), m_textDirty(0), m_selDirty(0),
         m_validInput(1), m_blinkStatus(0), m_blinkEnabled(false), m_blinkTimer(0), m_deleteAllTimer(0),
         m_ascent(0), m_maxLength(32767), m_lastCursorPos(-1),
-        m_tripleClickTimer(0), m_maskData(0), m_modifiedState(0), m_undoState(0),
+        m_tripleClickTimer(0), m_maskData(nullptr), m_modifiedState(0), m_undoState(0),
         m_selstart(0), m_selend(0), m_passwordEchoEditing(false)
         , m_passwordEchoTimer(0)
         , m_passwordMaskDelay(-1)
@@ -103,13 +103,19 @@ public:
         , m_passwordMaskDelayOverride(-1)
 #endif
         , m_keyboardScheme(0)
-        , m_accessibleObject(0)
+        , m_accessibleObject(nullptr)
     {
         init(txt);
     }
 
     ~QWidgetLineControl()
     {
+        // If this control is used for password input, we don't want the
+        // password data to stay in the process memory, therefore we need
+        // to zero it out
+        if (m_echoMode != QLineEdit::Normal)
+            m_text.fill('\0');
+
         delete [] m_maskData;
     }
 
@@ -274,6 +280,13 @@ public:
         cancelPasswordEchoTimer();
         m_echoMode = mode;
         m_passwordEchoEditing = false;
+
+        // If this control is used for password input, we want to minimize
+        // the possibility of string reallocation not to leak (parts of)
+        // the password.
+        if (m_echoMode != QLineEdit::Normal)
+            m_text.reserve(30);
+
         updateDisplayText();
     }
 
diff --git a/src/widgets/widgets/qwidgetresizehandler_p.h b/src/widgets/widgets/qwidgetresizehandler_p.h
index b87bbd6229..df3ac7cb8a 100644
--- a/src/widgets/widgets/qwidgetresizehandler_p.h
+++ b/src/widgets/widgets/qwidgetresizehandler_p.h
@@ -73,7 +73,7 @@ public:
         Any        = Move|Resize
     };
 
-    explicit QWidgetResizeHandler(QWidget *parent, QWidget *cw = 0);
+    explicit QWidgetResizeHandler(QWidget *parent, QWidget *cw = nullptr);
     void setActive(bool b) { setActive(Any, b); }
     void setActive(Action ac, bool b);
     bool isActive() const { return isActive(Any); }
@@ -100,7 +100,7 @@ protected:
     void keyPressEvent(QKeyEvent *e);
 
 private:
-    Q_DISABLE_COPY(QWidgetResizeHandler)
+    Q_DISABLE_COPY_MOVE(QWidgetResizeHandler)
 
     enum MousePosition {
         Nowhere,
diff --git a/src/widgets/widgets/qwidgettextcontrol_p.h b/src/widgets/widgets/qwidgettextcontrol_p.h
index 5431298387..9c80d53728 100644
--- a/src/widgets/widgets/qwidgettextcontrol_p.h
+++ b/src/widgets/widgets/qwidgettextcontrol_p.h
@@ -97,9 +97,9 @@ class Q_WIDGETS_EXPORT QWidgetTextControl : public QInputControl
     Q_PROPERTY(bool openExternalLinks READ openExternalLinks WRITE setOpenExternalLinks)
     Q_PROPERTY(bool ignoreUnusedNavigationEvents READ ignoreUnusedNavigationEvents WRITE setIgnoreUnusedNavigationEvents)
 public:
-    explicit QWidgetTextControl(QObject *parent = 0);
-    explicit QWidgetTextControl(const QString &text, QObject *parent = 0);
-    explicit QWidgetTextControl(QTextDocument *doc, QObject *parent = 0);
+    explicit QWidgetTextControl(QObject *parent = nullptr);
+    explicit QWidgetTextControl(const QString &text, QObject *parent = nullptr);
+    explicit QWidgetTextControl(QTextDocument *doc, QObject *parent = nullptr);
     virtual ~QWidgetTextControl();
 
     void setDocument(QTextDocument *document);
@@ -116,12 +116,12 @@ public:
     void setCurrentCharFormat(const QTextCharFormat &format);
     QTextCharFormat currentCharFormat() const;
 
-    bool find(const QString &exp, QTextDocument::FindFlags options = 0);
+    bool find(const QString &exp, QTextDocument::FindFlags options = nullptr);
 #ifndef QT_NO_REGEXP
-    bool find(const QRegExp &exp, QTextDocument::FindFlags options = 0);
+    bool find(const QRegExp &exp, QTextDocument::FindFlags options = nullptr);
 #endif
 #if QT_CONFIG(regularexpression)
-    bool find(const QRegularExpression &exp, QTextDocument::FindFlags options = 0);
+    bool find(const QRegularExpression &exp, QTextDocument::FindFlags options = nullptr);
 #endif
 
     QString toPlainText() const;
@@ -243,11 +243,11 @@ public:
     QPalette palette() const;
     void setPalette(const QPalette &pal);
 
-    virtual void processEvent(QEvent *e, const QMatrix &matrix, QWidget *contextWidget = 0);
-    void processEvent(QEvent *e, const QPointF &coordinateOffset = QPointF(), QWidget *contextWidget = 0);
+    virtual void processEvent(QEvent *e, const QMatrix &matrix, QWidget *contextWidget = nullptr);
+    void processEvent(QEvent *e, const QPointF &coordinateOffset = QPointF(), QWidget *contextWidget = nullptr);
 
     // control methods
-    void drawContents(QPainter *painter, const QRectF &rect = QRectF(), QWidget *widget = 0);
+    void drawContents(QPainter *painter, const QRectF &rect = QRectF(), QWidget *widget = nullptr);
 
     void setFocus(bool focus, Qt::FocusReason = Qt::OtherFocusReason);
 
@@ -267,7 +267,7 @@ protected:
     virtual bool event(QEvent *e) override;
 
 private:
-    Q_DISABLE_COPY(QWidgetTextControl)
+    Q_DISABLE_COPY_MOVE(QWidgetTextControl)
     Q_PRIVATE_SLOT(d_func(), void _q_updateCurrentCharFormatAndSelection())
     Q_PRIVATE_SLOT(d_func(), void _q_emitCursorPosChanged(const QTextCursor &))
     Q_PRIVATE_SLOT(d_func(), void _q_deleteSelected())
diff --git a/src/widgets/widgets/qwidgettextcontrol_p_p.h b/src/widgets/widgets/qwidgettextcontrol_p_p.h
index 232dab180f..6a1ee564cd 100644
--- a/src/widgets/widgets/qwidgettextcontrol_p_p.h
+++ b/src/widgets/widgets/qwidgettextcontrol_p_p.h
@@ -89,9 +89,9 @@ public:
     void createAutoBulletList();
 
     void init(Qt::TextFormat format = Qt::RichText, const QString &text = QString(),
-              QTextDocument *document = 0);
+              QTextDocument *document = nullptr);
     void setContent(Qt::TextFormat format = Qt::RichText, const QString &text = QString(),
-                    QTextDocument *document = 0);
+                    QTextDocument *document = nullptr);
     void startDrag();
 
     void paste(const QMimeData *source);
author	Tobias Hunger <tobias.hunger@qt.io>	2019-04-16 16:32:08 +0200
committer	Tobias Hunger <tobias.hunger@qt.io>	2019-04-16 16:32:08 +0200
commit	6630937e63ae5797487b86743a7733c8ae5cc42c (patch)
tree	3d53dacf6430f9099e1fb20835881205de674961 /src/widgets
parent	37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff)
parent	c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff)