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

 Conflicts:
	src/corelib/tools/qhash.h
	src/gui/kernel/qevent.h
	src/widgets/kernel/qshortcut.cpp
	src/widgets/kernel/qshortcut.h

Change-Id: If61c206ee43ad1d97f5b07f58ac93c4583ce5620

31 files changed, 122 insertions, 63 deletions

diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp
index c2f8538ab7..8e6c2cb882 100644
--- a/src/widgets/widgets/qabstractbutton.cpp
+++ b/src/widgets/widgets/qabstractbutton.cpp
@@ -467,7 +467,7 @@ void QAbstractButtonPrivate::emitToggled(bool checked)
     Constructs an abstract button with a \a parent.
 */
 QAbstractButton::QAbstractButton(QWidget *parent)
-    : QWidget(*new QAbstractButtonPrivate, parent, 0)
+    : QWidget(*new QAbstractButtonPrivate, parent, { })
 {
     Q_D(QAbstractButton);
     d->init();
@@ -489,7 +489,7 @@ QAbstractButton::QAbstractButton(QWidget *parent)
 /*! \internal
  */
 QAbstractButton::QAbstractButton(QAbstractButtonPrivate &dd, QWidget *parent)
-    : QWidget(dd, parent, 0)
+    : QWidget(dd, parent, { })
 {
     Q_D(QAbstractButton);
     d->init();
diff --git a/src/widgets/widgets/qabstractslider.cpp b/src/widgets/widgets/qabstractslider.cpp
index dc325ab871..a0611565b8 100644
--- a/src/widgets/widgets/qabstractslider.cpp
+++ b/src/widgets/widgets/qabstractslider.cpp
@@ -273,13 +273,13 @@ void QAbstractSliderPrivate::setSteps(int single, int page)
     \l value of 0.
 */
 QAbstractSlider::QAbstractSlider(QWidget *parent)
-    :QWidget(*new QAbstractSliderPrivate, parent, 0)
+    :QWidget(*new QAbstractSliderPrivate, parent, { })
 {
 }
 
 /*! \internal */
 QAbstractSlider::QAbstractSlider(QAbstractSliderPrivate &dd, QWidget *parent)
-    :QWidget(dd, parent, 0)
+    :QWidget(dd, parent, { })
 {
 }
 
diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp
index fc19e0793e..b1e1c9bc1b 100644
--- a/src/widgets/widgets/qabstractspinbox.cpp
+++ b/src/widgets/widgets/qabstractspinbox.cpp
@@ -147,7 +147,7 @@ QT_BEGIN_NAMESPACE
 */
 
 QAbstractSpinBox::QAbstractSpinBox(QWidget *parent)
-    : QWidget(*new QAbstractSpinBoxPrivate, parent, 0)
+    : QWidget(*new QAbstractSpinBoxPrivate, parent, { })
 {
     Q_D(QAbstractSpinBox);
     d->init();
@@ -157,7 +157,7 @@ QAbstractSpinBox::QAbstractSpinBox(QWidget *parent)
     \internal
 */
 QAbstractSpinBox::QAbstractSpinBox(QAbstractSpinBoxPrivate &dd, QWidget *parent)
-    : QWidget(dd, parent, 0)
+    : QWidget(dd, parent, { })
 {
     Q_D(QAbstractSpinBox);
     d->init();
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp
index 8593001f8b..749ae96df2 100644
--- a/src/widgets/widgets/qcalendarwidget.cpp
+++ b/src/widgets/widgets/qcalendarwidget.cpp
@@ -1207,9 +1207,9 @@ Qt::ItemFlags QCalendarModel::flags(const QModelIndex &index) const
     if (!date.isValid())
         return QAbstractTableModel::flags(index);
     if (date < m_minimumDate)
-        return 0;
+        return { };
     if (date > m_maximumDate)
-        return 0;
+        return { };
     return QAbstractTableModel::flags(index);
 }
 
@@ -2135,7 +2135,7 @@ void QCalendarWidgetPrivate::_q_editingFinished()
     \sa setCurrentPage()
 */
 QCalendarWidget::QCalendarWidget(QWidget *parent)
-    : QWidget(*new QCalendarWidgetPrivate, parent, 0)
+    : QWidget(*new QCalendarWidgetPrivate, parent, { })
 {
     Q_D(QCalendarWidget);
 
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index 9a0e969e1c..03dcde0a58 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -368,6 +368,8 @@ QSize QComboBoxPrivate::recomputeSizeHint(QSize &sh) const
         }
         if (minimumContentsLength > 0)
             sh.setWidth(qMax(sh.width(), minimumContentsLength * fm.horizontalAdvance(QLatin1Char('X')) + (hasIcon ? iconSize.width() + 4 : 0)));
+        if (!placeholderText.isEmpty())
+            sh.setWidth(qMax(sh.width(), fm.boundingRect(placeholderText).width()));
 
 
         // height
@@ -929,7 +931,7 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
     model QStandardItemModel.
 */
 QComboBox::QComboBox(QWidget *parent)
-    : QWidget(*new QComboBoxPrivate(), parent, 0)
+    : QWidget(*new QComboBoxPrivate(), parent, { })
 {
     Q_D(QComboBox);
     d->init();
@@ -939,7 +941,7 @@ QComboBox::QComboBox(QWidget *parent)
   \internal
 */
 QComboBox::QComboBox(QComboBoxPrivate &dd, QWidget *parent)
-    : QWidget(dd, parent, 0)
+    : QWidget(dd, parent, { })
 {
     Q_D(QComboBox);
     d->init();
@@ -1110,8 +1112,9 @@ void QComboBoxPrivate::_q_rowsInserted(const QModelIndex &parent, int start, int
         q->updateGeometry();
     }
 
-    // set current index if combo was previously empty
-    if (start == 0 && (end - start + 1) == q->count() && !currentIndex.isValid()) {
+    // set current index if combo was previously empty and there is no placeholderText
+    if (start == 0 && (end - start + 1) == q->count() && !currentIndex.isValid() &&
+        placeholderText.isEmpty()) {
         q->setCurrentIndex(0);
         // need to emit changed if model updated index "silently"
     } else if (currentIndex.row() != indexBeforeChange) {
@@ -1214,10 +1217,9 @@ void QComboBox::initStyleOption(QStyleOptionComboBox *option) const
     } else {
         option->activeSubControls = d->hoverControl;
     }
-    if (d->currentIndex.isValid()) {
-        option->currentText = currentText();
+    option->currentText = currentText();
+    if (d->currentIndex.isValid())
         option->currentIcon = d->itemIcon(d->currentIndex);
-    }
     option->iconSize = iconSize();
     if (d->container && d->container->isVisible())
         option->state |= QStyle::State_On;
@@ -1772,6 +1774,45 @@ void QComboBox::setIconSize(const QSize &size)
 }
 
 /*!
+    \property QComboBox::placeholderText
+    \brief Sets a \a placeholderText text shown when no valid index is set
+
+    The \a placeholderText will be shown when an invalid index is set. The
+    text is not accessible in the dropdown list. When this function is called
+    before items are added the placeholder text will be shown, otherwise you
+    have to call setCurrentIndex(-1) programmatically if you want to show the
+    placeholder text.
+    Set an empty placeholder text to reset the setting.
+
+    When the QComboBox is editable, use QLineEdit::setPlaceholderText()
+    instead.
+
+    \since 5.15
+*/
+void QComboBox::setPlaceholderText(const QString &placeholderText)
+{
+    Q_D(QComboBox);
+    if (placeholderText == d->placeholderText)
+        return;
+
+    d->placeholderText = placeholderText;
+    if (currentIndex() == -1) {
+      if (d->placeholderText.isEmpty() && currentIndex() == -1)
+        setCurrentIndex(0);
+      else
+        update();
+    } else {
+      updateGeometry();
+    }
+}
+
+QString QComboBox::placeholderText() const
+{
+    Q_D(const QComboBox);
+    return d->placeholderText;
+}
+
+/*!
     \property QComboBox::editable
     \brief whether the combo box can be edited by the user
 
@@ -2249,7 +2290,7 @@ QString QComboBox::currentText() const
     else if (d->currentIndex.isValid())
         return d->itemText(d->currentIndex);
     else
-        return QString();
+        return d->placeholderText;
 }
 
 /*!
@@ -3079,6 +3120,9 @@ void QComboBox::paintEvent(QPaintEvent *)
     initStyleOption(&opt);
     painter.drawComplexControl(QStyle::CC_ComboBox, opt);
 
+    if (currentIndex() < 0)
+        opt.palette.setBrush(QPalette::ButtonText, opt.palette.brush(QPalette::ButtonText).color().lighter());
+
     // draw the icon and text
     painter.drawControl(QStyle::CE_ComboBoxLabel, opt);
 }
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h
index 286772c091..4f89d7f542 100644
--- a/src/widgets/widgets/qcombobox.h
+++ b/src/widgets/widgets/qcombobox.h
@@ -71,6 +71,7 @@ class Q_WIDGETS_EXPORT QComboBox : public QWidget
     Q_PROPERTY(SizeAdjustPolicy sizeAdjustPolicy READ sizeAdjustPolicy WRITE setSizeAdjustPolicy)
     Q_PROPERTY(int minimumContentsLength READ minimumContentsLength WRITE setMinimumContentsLength)
     Q_PROPERTY(QSize iconSize READ iconSize WRITE setIconSize)
+    Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText)
 
 #if QT_CONFIG(completer)
 #if QT_DEPRECATED_SINCE(5, 13)
@@ -148,6 +149,9 @@ public:
     QSize iconSize() const;
     void setIconSize(const QSize &size);
 
+    void setPlaceholderText(const QString &placeholderText);
+    QString placeholderText() const;
+
     bool isEditable() const;
     void setEditable(bool editable);
     void setLineEdit(QLineEdit *edit);
diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h
index 5967776a61..00211d70aa 100644
--- a/src/widgets/widgets/qcombobox_p.h
+++ b/src/widgets/widgets/qcombobox_p.h
@@ -417,6 +417,7 @@ public:
     int maxVisibleItems;
     int maxCount;
     int modelColumn;
+    QString placeholderText;
     bool inserting;
     mutable QSize minimumSizeHint;
     mutable QSize sizeHint;
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp
index f348bbed0e..751e17b717 100644
--- a/src/widgets/widgets/qdatetimeedit.cpp
+++ b/src/widgets/widgets/qdatetimeedit.cpp
@@ -1416,12 +1416,12 @@ QDateTimeEdit::StepEnabled QDateTimeEdit::stepEnabled() const
 {
     Q_D(const QDateTimeEdit);
     if (d->readOnly)
-        return StepEnabled(0);
+        return {};
     if (d->specialValue()) {
-        return (d->minimum == d->maximum ? StepEnabled(0) : StepEnabled(StepUpEnabled));
+        return (d->minimum == d->maximum ? StepEnabled{} : StepEnabled(StepUpEnabled));
     }
 
-    QAbstractSpinBox::StepEnabled ret = 0;
+    QAbstractSpinBox::StepEnabled ret = { };
 
 #ifdef QT_KEYPAD_NAVIGATION
     if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()) {
@@ -1456,7 +1456,7 @@ QDateTimeEdit::StepEnabled QDateTimeEdit::stepEnabled() const
     switch (d->sectionType(d->currentSectionIndex)) {
     case QDateTimeParser::NoSection:
     case QDateTimeParser::FirstSection:
-    case QDateTimeParser::LastSection: return 0;
+    case QDateTimeParser::LastSection: return { };
     default: break;
     }
     if (d->wrapping)
@@ -1659,12 +1659,11 @@ QDateTimeEditPrivate::QDateTimeEditPrivate()
     cacheGuard = false;
     fixday = true;
     type = QVariant::DateTime;
-    sections = 0;
+    sections = { };
     cachedDay = -1;
     currentSectionIndex = FirstSectionIndex;
 
     first.pos = 0;
-    sections = 0;
     calendarPopup = false;
     minimum = QDATETIMEEDIT_COMPAT_DATE_MIN.startOfDay();
     maximum = QDATETIMEEDIT_DATE_MAX.endOfDay();
@@ -2256,7 +2255,7 @@ QDateTimeEdit::Section QDateTimeEditPrivate::convertToPublic(QDateTimeParser::Se
 
 QDateTimeEdit::Sections QDateTimeEditPrivate::convertSections(QDateTimeParser::Sections s)
 {
-    QDateTimeEdit::Sections ret = 0;
+    QDateTimeEdit::Sections ret;
     if (s & QDateTimeParser::MSecSection)
         ret |= QDateTimeEdit::MSecSection;
     if (s & QDateTimeParser::SecondSection)
diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp
index 28f6cdc7bd..9096ee82f6 100644
--- a/src/widgets/widgets/qdialogbuttonbox.cpp
+++ b/src/widgets/widgets/qdialogbuttonbox.cpp
@@ -482,7 +482,7 @@ QDialogButtonBox::QDialogButtonBox(QWidget *parent)
     \sa orientation, addButton()
 */
 QDialogButtonBox::QDialogButtonBox(Qt::Orientation orientation, QWidget *parent)
-    : QWidget(*new QDialogButtonBoxPrivate(orientation), parent, 0)
+    : QWidget(*new QDialogButtonBoxPrivate(orientation), parent, { })
 {
     d_func()->initLayout();
 }
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
index 05ec3aface..687ef8ba29 100644
--- a/src/widgets/widgets/qdockwidget.cpp
+++ b/src/widgets/widgets/qdockwidget.cpp
@@ -238,8 +238,8 @@ void QDockWidgetTitleButton::paintEvent(QPaintEvent *)
     }
 
     opt.icon = icon();
-    opt.subControls = 0;
-    opt.activeSubControls = 0;
+    opt.subControls = { };
+    opt.activeSubControls = { };
     opt.features = QStyleOptionToolButton::None;
     opt.arrowType = Qt::NoArrow;
     opt.iconSize = dockButtonIconSize();
diff --git a/src/widgets/widgets/qeffects.cpp b/src/widgets/widgets/qeffects.cpp
index 7069ef0368..e69366d7c8 100644
--- a/src/widgets/widgets/qeffects.cpp
+++ b/src/widgets/widgets/qeffects.cpp
@@ -65,7 +65,7 @@ class QAlphaWidget: public QWidget, private QEffects
 {
     Q_OBJECT
 public:
-    QAlphaWidget(QWidget* w, Qt::WindowFlags f = 0);
+    QAlphaWidget(QWidget* w, Qt::WindowFlags f = { });
     ~QAlphaWidget();
 
     void run(int time);
diff --git a/src/widgets/widgets/qfocusframe.cpp b/src/widgets/widgets/qfocusframe.cpp
index 0992becdf0..ee24e92c7e 100644
--- a/src/widgets/widgets/qfocusframe.cpp
+++ b/src/widgets/widgets/qfocusframe.cpp
@@ -154,7 +154,7 @@ void QFocusFrame::initStyleOption(QStyleOption *option) const
 */
 
 QFocusFrame::QFocusFrame(QWidget *parent)
-    : QWidget(*new QFocusFramePrivate, parent, 0)
+    : QWidget(*new QFocusFramePrivate, parent, { })
 {
     setAttribute(Qt::WA_TransparentForMouseEvents);
     setFocusPolicy(Qt::NoFocus);
diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp
index eec794562a..f7fe072302 100644
--- a/src/widgets/widgets/qgroupbox.cpp
+++ b/src/widgets/widgets/qgroupbox.cpp
@@ -178,7 +178,7 @@ void QGroupBoxPrivate::click()
 */
 
 QGroupBox::QGroupBox(QWidget *parent)
-    : QWidget(*new QGroupBoxPrivate, parent, 0)
+    : QWidget(*new QGroupBoxPrivate, parent, { })
 {
     Q_D(QGroupBox);
     d->init();
diff --git a/src/widgets/widgets/qkeysequenceedit.cpp b/src/widgets/widgets/qkeysequenceedit.cpp
index 6f2a6b2d5a..b63b0b4d72 100644
--- a/src/widgets/widgets/qkeysequenceedit.cpp
+++ b/src/widgets/widgets/qkeysequenceedit.cpp
@@ -131,7 +131,7 @@ void QKeySequenceEditPrivate::finishEditing()
     Constructs a QKeySequenceEdit widget with the given \a parent.
 */
 QKeySequenceEdit::QKeySequenceEdit(QWidget *parent)
-    : QKeySequenceEdit(*new QKeySequenceEditPrivate, parent, 0)
+    : QKeySequenceEdit(*new QKeySequenceEditPrivate, parent, { })
 {
 }
 
diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp
index 943b30bacc..7bd7283adf 100644
--- a/src/widgets/widgets/qlabel.cpp
+++ b/src/widgets/widgets/qlabel.cpp
@@ -84,6 +84,7 @@ QLabelPrivate::QLabelPrivate()
       shortcutId(0),
 #endif
       textformat(Qt::AutoText),
+      effectiveTextFormat(Qt::PlainText),
       textInteractionFlags(Qt::LinksAccessibleByMouse),
       sizePolicy(),
       margin(0),
@@ -93,7 +94,6 @@ QLabelPrivate::QLabelPrivate()
       scaledcontents(false),
       textLayoutDirty(false),
       textDirty(false),
-      isRichText(false),
       isTextLabel(false),
       hasShortcut(/*???*/),
 #ifndef QT_NO_CURSOR
@@ -293,8 +293,14 @@ void QLabel::setText(const QString &text)
     d->text = text;
     d->isTextLabel = true;
     d->textDirty = true;
-    d->isRichText = d->textformat == Qt::RichText
-                    || (d->textformat == Qt::AutoText && Qt::mightBeRichText(d->text));
+    if (d->textformat == Qt::AutoText) {
+        if (Qt::mightBeRichText(d->text))
+            d->effectiveTextFormat = Qt::RichText;
+        else
+            d->effectiveTextFormat = Qt::PlainText;
+    } else {
+        d->effectiveTextFormat = d->textformat;
+    }
 
     d->control = oldControl;
 
@@ -305,7 +311,7 @@ void QLabel::setText(const QString &text)
         d->control = nullptr;
     }
 
-    if (d->isRichText) {
+    if (d->effectiveTextFormat != Qt::PlainText) {
         setMouseTracking(true);
     } else {
         // Note: mouse tracking not disabled intentionally
@@ -1477,14 +1483,19 @@ void QLabelPrivate::ensureTextPopulated() const
     if (control) {
         QTextDocument *doc = control->document();
         if (textDirty) {
-#ifndef QT_NO_TEXTHTMLPARSER
-            if (isRichText)
-                doc->setHtml(text);
-            else
+            if (effectiveTextFormat == Qt::PlainText) {
                 doc->setPlainText(text);
-#else
-            doc->setPlainText(text);
+#if QT_CONFIG(texthtmlparser)
+            } else if (effectiveTextFormat == Qt::RichText) {
+                doc->setHtml(text);
+#endif
+#if QT_CONFIG(textmarkdownreader)
+            } else if (effectiveTextFormat == Qt::MarkdownText) {
+                doc->setMarkdown(text);
 #endif
+            } else {
+                doc->setPlainText(text);
+            }
             doc->setUndoRedoEnabled(false);
 
 #ifndef QT_NO_SHORTCUT
@@ -1622,7 +1633,7 @@ QMenu *QLabelPrivate::createStandardContextMenu(const QPoint &pos)
 {
     QString linkToCopy;
     QPoint p;
-    if (control && isRichText) {
+    if (control && effectiveTextFormat != Qt::PlainText) {
         p = layoutPoint(pos);
         linkToCopy = control->document()->documentLayout()->anchorAt(p);
     }
diff --git a/src/widgets/widgets/qlabel_p.h b/src/widgets/widgets/qlabel_p.h
index 59188563a9..6b3fbc5f0c 100644
--- a/src/widgets/widgets/qlabel_p.h
+++ b/src/widgets/widgets/qlabel_p.h
@@ -93,8 +93,8 @@ public:
 #endif
     inline bool needTextControl() const {
         return isTextLabel
-               && (isRichText
-                   || (!isRichText && (textInteractionFlags & (Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard))));
+               && (effectiveTextFormat != Qt::PlainText
+                   || (textInteractionFlags & (Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard)));
     }
 
     void ensureTextPopulated() const;
@@ -134,6 +134,7 @@ public:
     int shortcutId;
 #endif
     Qt::TextFormat textformat;
+    Qt::TextFormat effectiveTextFormat;
     Qt::TextInteractionFlags textInteractionFlags;
     mutable QSizePolicy sizePolicy;
     int margin;
@@ -143,7 +144,6 @@ public:
     uint scaledcontents : 1;
     mutable uint textLayoutDirty : 1;
     mutable uint textDirty : 1;
-    mutable uint isRichText : 1;
     mutable uint isTextLabel : 1;
     mutable uint hasShortcut : 1;
 #ifndef QT_NO_CURSOR
diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp
index fe0d87d8c1..37d2211a00 100644
--- a/src/widgets/widgets/qlineedit.cpp
+++ b/src/widgets/widgets/qlineedit.cpp
@@ -276,7 +276,7 @@ QLineEdit::QLineEdit(QWidget* parent)
     \sa text(), setMaxLength()
 */
 QLineEdit::QLineEdit(const QString& contents, QWidget* parent)
-    : QWidget(*new QLineEditPrivate, parent, 0)
+    : QWidget(*new QLineEditPrivate, parent, { })
 {
     Q_D(QLineEdit);
     d->init(contents);
diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h
index 967b713096..ebed47da30 100644
--- a/src/widgets/widgets/qmainwindowlayout_p.h
+++ b/src/widgets/widgets/qmainwindowlayout_p.h
@@ -334,7 +334,7 @@ class QDockWidgetGroupWindow : public QWidget
 {
     Q_OBJECT
 public:
-    explicit QDockWidgetGroupWindow(QWidget* parent = nullptr, Qt::WindowFlags f = nullptr)
+    explicit QDockWidgetGroupWindow(QWidget* parent = nullptr, Qt::WindowFlags f = { })
         : QWidget(parent, f) {}
     QDockAreaLayoutInfo *layoutInfo() const;
 #if QT_CONFIG(tabbar)
diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp
index f4d3367a95..a2254112c2 100644
--- a/src/widgets/widgets/qmdisubwindow.cpp
+++ b/src/widgets/widgets/qmdisubwindow.cpp
@@ -2214,7 +2214,7 @@ void QMdiSubWindowPrivate::updateInternalWindowTitle()
     \sa QMdiArea::addSubWindow()
 */
 QMdiSubWindow::QMdiSubWindow(QWidget *parent, Qt::WindowFlags flags)
-    : QWidget(*new QMdiSubWindowPrivate, parent, 0)
+    : QWidget(*new QMdiSubWindowPrivate, parent, { })
 {
     Q_D(QMdiSubWindow);
 #if QT_CONFIG(menu)
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index 7c08376a2b..97816cc889 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -735,7 +735,7 @@ QAction *QMenuBarPrivate::getNextAction(const int _start, const int increment) c
 /*!
     Constructs a menu bar with parent \a parent.
 */
-QMenuBar::QMenuBar(QWidget *parent) : QWidget(*new QMenuBarPrivate, parent, 0)
+QMenuBar::QMenuBar(QWidget *parent) : QWidget(*new QMenuBarPrivate, parent, { })
 {
     Q_D(QMenuBar);
     d->init();
diff --git a/src/widgets/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp
index 56253b8e44..04241fda09 100644
--- a/src/widgets/widgets/qprogressbar.cpp
+++ b/src/widgets/widgets/qprogressbar.cpp
@@ -234,7 +234,7 @@ bool QProgressBarPrivate::repaintRequired() const
 */
 
 QProgressBar::QProgressBar(QWidget *parent)
-    : QWidget(*(new QProgressBarPrivate), parent, 0)
+    : QWidget(*(new QProgressBarPrivate), parent, { })
 {
     d_func()->init();
 }
diff --git a/src/widgets/widgets/qscrollarea_p.h b/src/widgets/widgets/qscrollarea_p.h
index 2bdf9ed596..26335285a4 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(nullptr){}
+    QScrollAreaPrivate(): resizable(false) {}
     void updateScrollBars();
     void updateWidgetPosition();
     QPointer<QWidget> widget;
diff --git a/src/widgets/widgets/qsizegrip.cpp b/src/widgets/widgets/qsizegrip.cpp
index 835af9c7b8..662d4c9e92 100644
--- a/src/widgets/widgets/qsizegrip.cpp
+++ b/src/widgets/widgets/qsizegrip.cpp
@@ -195,7 +195,7 @@ Qt::Corner QSizeGripPrivate::corner() const
     parent.
 */
 QSizeGrip::QSizeGrip(QWidget * parent)
-    : QWidget(*new QSizeGripPrivate, parent, 0)
+    : QWidget(*new QSizeGripPrivate, parent, { })
 {
     Q_D(QSizeGrip);
     d->init();
diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp
index e7a4889996..1a5fb7f251 100644
--- a/src/widgets/widgets/qsplitter.cpp
+++ b/src/widgets/widgets/qsplitter.cpp
@@ -119,7 +119,7 @@ QSplitterPrivate::~QSplitterPrivate()
     \a parent.
 */
 QSplitterHandle::QSplitterHandle(Qt::Orientation orientation, QSplitter *parent)
-    : QWidget(*new QSplitterHandlePrivate, parent, 0)
+    : QWidget(*new QSplitterHandlePrivate, parent, { })
 {
     Q_D(QSplitterHandle);
     d->s = parent;
diff --git a/src/widgets/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp
index 39f0f11daf..943b576ee3 100644
--- a/src/widgets/widgets/qstatusbar.cpp
+++ b/src/widgets/widgets/qstatusbar.cpp
@@ -226,7 +226,7 @@ QRect QStatusBarPrivate::messageRect() const
     \sa setSizeGripEnabled()
 */
 QStatusBar::QStatusBar(QWidget * parent)
-    : QWidget(*new QStatusBarPrivate, parent, 0)
+    : QWidget(*new QStatusBarPrivate, parent, { })
 {
     Q_D(QStatusBar);
     d->box = 0;
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp
index 7e1794efef..dfe362bdca 100644
--- a/src/widgets/widgets/qtabbar.cpp
+++ b/src/widgets/widgets/qtabbar.cpp
@@ -859,7 +859,7 @@ void QTabBarPrivate::refresh()
     Creates a new tab bar with the given \a parent.
 */
 QTabBar::QTabBar(QWidget* parent)
-    :QWidget(*new QTabBarPrivate, parent, 0)
+    :QWidget(*new QTabBarPrivate, parent, { })
 {
     Q_D(QTabBar);
     d->init();
diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp
index 4d7b39ae01..2b3b8280bb 100644
--- a/src/widgets/widgets/qtabwidget.cpp
+++ b/src/widgets/widgets/qtabwidget.cpp
@@ -359,7 +359,7 @@ void QTabWidget::initStyleOption(QStyleOptionTabWidgetFrame *option) const
     Constructs a tabbed widget with parent \a parent.
 */
 QTabWidget::QTabWidget(QWidget *parent)
-    : QWidget(*new QTabWidgetPrivate, parent, 0)
+    : QWidget(*new QTabWidgetPrivate, parent, { })
 {
     Q_D(QTabWidget);
     d->init();
diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp
index 4b821f7e41..bed5c3ec3e 100644
--- a/src/widgets/widgets/qtoolbar.cpp
+++ b/src/widgets/widgets/qtoolbar.cpp
@@ -503,7 +503,7 @@ void QToolBarPrivate::plug(const QRect &r)
     Constructs a QToolBar with the given \a parent.
 */
 QToolBar::QToolBar(QWidget *parent)
-    : QWidget(*new QToolBarPrivate, parent, 0)
+    : QWidget(*new QToolBarPrivate, parent, { })
 {
     Q_D(QToolBar);
     d->init();
diff --git a/src/widgets/widgets/qtoolbarlayout.cpp b/src/widgets/widgets/qtoolbarlayout.cpp
index 5752e0700a..03368fd5c2 100644
--- a/src/widgets/widgets/qtoolbarlayout.cpp
+++ b/src/widgets/widgets/qtoolbarlayout.cpp
@@ -240,9 +240,9 @@ Qt::Orientations QToolBarLayout::expandingDirections() const
         updateGeomArray();
     QToolBar *tb = qobject_cast<QToolBar*>(parentWidget());
     if (!tb)
-        return Qt::Orientations(0);
+        return {};
     Qt::Orientation o = tb->orientation();
-    return expanding ? Qt::Orientations(o) : Qt::Orientations(0);
+    return expanding ? Qt::Orientations(o) : Qt::Orientations{};
 }
 
 bool QToolBarLayout::movable() const
diff --git a/src/widgets/widgets/qwidgetlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h
index 8ebed25084..a8fffd23dc 100644
--- a/src/widgets/widgets/qwidgetlinecontrol_p.h
+++ b/src/widgets/widgets/qwidgetlinecontrol_p.h
@@ -217,7 +217,7 @@ public:
     void cursorWordBackward(bool mark) { moveCursor(m_textLayout.previousCursorPosition(m_cursor, QTextLayout::SkipWords), mark); }
 
     void home(bool mark) { moveCursor(0, mark); }
-    void end(bool mark) { moveCursor(text().length(), mark); }
+    void end(bool mark) { moveCursor(m_text.length(), mark); }
 
     int xToPos(int x, QTextLine::CursorPosition = QTextLine::CursorBetweenCharacters) const;
     QRect rectForPos(int pos) const;
diff --git a/src/widgets/widgets/qwidgettextcontrol_p.h b/src/widgets/widgets/qwidgettextcontrol_p.h
index 59bf5466e6..1f06aa0b97 100644
--- a/src/widgets/widgets/qwidgettextcontrol_p.h
+++ b/src/widgets/widgets/qwidgettextcontrol_p.h
@@ -116,12 +116,12 @@ public:
     void setCurrentCharFormat(const QTextCharFormat &format);
     QTextCharFormat currentCharFormat() const;
 
-    bool find(const QString &exp, QTextDocument::FindFlags options = nullptr);
+    bool find(const QString &exp, QTextDocument::FindFlags options = { });
 #ifndef QT_NO_REGEXP
-    bool find(const QRegExp &exp, QTextDocument::FindFlags options = nullptr);
+    bool find(const QRegExp &exp, QTextDocument::FindFlags options = { });
 #endif
 #if QT_CONFIG(regularexpression)
-    bool find(const QRegularExpression &exp, QTextDocument::FindFlags options = nullptr);
+    bool find(const QRegularExpression &exp, QTextDocument::FindFlags options = { });
 #endif
 
     QString toPlainText() const;