Merge "Merge remote-tracking branch 'origin/dev' into wip/cmake" into wip/cmake

10 files changed, 9 insertions, 192 deletions

diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp
index 7c26b8cc42..77ffda10b0 100644
--- a/src/widgets/widgets/qabstractbutton.cpp
+++ b/src/widgets/widgets/qabstractbutton.cpp
@@ -413,16 +413,8 @@ void QAbstractButtonPrivate::emitClicked()
     QPointer<QAbstractButton> guard(q);
     emit q->clicked(checked);
 #if QT_CONFIG(buttongroup)
-    if (guard && group) {
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-        emit group->buttonClicked(group->id(q));
-        if (guard && group)
-QT_WARNING_POP
-#endif
-            emit group->buttonClicked(q);
-    }
+    if (guard && group)
+        emit group->buttonClicked(q);
 #endif
 }
 
@@ -432,16 +424,8 @@ void QAbstractButtonPrivate::emitPressed()
     QPointer<QAbstractButton> guard(q);
     emit q->pressed();
 #if QT_CONFIG(buttongroup)
-    if (guard && group) {
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-        emit group->buttonPressed(group->id(q));
-        if (guard && group)
-QT_WARNING_POP
-#endif
-            emit group->buttonPressed(q);
-    }
+    if (guard && group)
+        emit group->buttonPressed(q);
 #endif
 }
 
@@ -451,16 +435,8 @@ void QAbstractButtonPrivate::emitReleased()
     QPointer<QAbstractButton> guard(q);
     emit q->released();
 #if QT_CONFIG(buttongroup)
-    if (guard && group) {
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-        emit group->buttonReleased(group->id(q));
-        if (guard && group)
-QT_WARNING_POP
-#endif
-            emit group->buttonReleased(q);
-    }
+    if (guard && group)
+        emit group->buttonReleased(q);
 #endif
 }
 
@@ -470,16 +446,8 @@ void QAbstractButtonPrivate::emitToggled(bool checked)
     QPointer<QAbstractButton> guard(q);
     emit q->toggled(checked);
 #if QT_CONFIG(buttongroup)
-    if (guard && group) {
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-        emit group->buttonToggled(group->id(q), checked);
-        if (guard && group)
-QT_WARNING_POP
-#endif
-            emit group->buttonToggled(q, checked);
-    }
+    if (guard && group)
+        emit group->buttonToggled(q, checked);
 #endif
 }
 
diff --git a/src/widgets/widgets/qbuttongroup.cpp b/src/widgets/widgets/qbuttongroup.cpp
index 9162029cdb..1368c721ad 100644
--- a/src/widgets/widgets/qbuttongroup.cpp
+++ b/src/widgets/widgets/qbuttongroup.cpp
@@ -163,16 +163,6 @@ void QButtonGroup::setExclusive(bool exclusive)
 */
 
 /*!
-    \fn void QButtonGroup::buttonClicked(int id)
-    \obsolete
-
-    This signal is emitted when a button with the given \a id is
-    clicked.
-
-    \sa checkedButton(), QAbstractButton::clicked()
-*/
-
-/*!
     \fn void QButtonGroup::buttonPressed(QAbstractButton *button)
     \since 4.2
 
@@ -182,17 +172,6 @@ void QButtonGroup::setExclusive(bool exclusive)
 */
 
 /*!
-    \fn void QButtonGroup::buttonPressed(int id)
-    \since 4.2
-    \obsolete
-
-    This signal is emitted when a button with the given \a id is
-    pressed down.
-
-    \sa QAbstractButton::pressed()
-*/
-
-/*!
     \fn void QButtonGroup::buttonReleased(QAbstractButton *button)
     \since 4.2
 
@@ -202,17 +181,6 @@ void QButtonGroup::setExclusive(bool exclusive)
 */
 
 /*!
-    \fn void QButtonGroup::buttonReleased(int id)
-    \since 4.2
-    \obsolete
-
-    This signal is emitted when a button with the given \a id is
-    released.
-
-    \sa QAbstractButton::released()
-*/
-
-/*!
     \fn void QButtonGroup::buttonToggled(QAbstractButton *button, bool checked)
     \since 5.2
 
@@ -222,17 +190,6 @@ void QButtonGroup::setExclusive(bool exclusive)
     \sa QAbstractButton::toggled()
 */
 
-/*!
-    \fn void QButtonGroup::buttonToggled(int id, bool checked)
-    \since 5.2
-    \obsolete
-
-    This signal is emitted when a button with the given \a id is toggled.
-    \a checked is true if the button is checked, or false if the button is unchecked.
-
-    \sa QAbstractButton::toggled()
-*/
-
 
 /*!
     Adds the given \a button to the button group. If \a id is -1,
diff --git a/src/widgets/widgets/qbuttongroup.h b/src/widgets/widgets/qbuttongroup.h
index 2989dcb4ba..838bf8abce 100644
--- a/src/widgets/widgets/qbuttongroup.h
+++ b/src/widgets/widgets/qbuttongroup.h
@@ -81,16 +81,6 @@ Q_SIGNALS:
     void buttonPressed(QAbstractButton *);
     void buttonReleased(QAbstractButton *);
     void buttonToggled(QAbstractButton *, bool);
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_VERSION_X_5_15("Use QButtonGroup::buttonClicked(QAbstractButton *) instead")
-    void buttonClicked(int);
-    QT_DEPRECATED_VERSION_X_5_15("Use QButtonGroup::buttonPressed(QAbstractButton *) instead")
-    void buttonPressed(int);
-    QT_DEPRECATED_VERSION_X_5_15("Use QButtonGroup::buttonReleased(QAbstractButton *) instead")
-    void buttonReleased(int);
-    QT_DEPRECATED_VERSION_X_5_15("Use QButtonGroup::buttonToggled(QAbstractButton *, bool) instead")
-    void buttonToggled(int, bool);
-#endif
 
 private:
     Q_DISABLE_COPY(QButtonGroup)
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index 9789004473..b249608ccc 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -905,20 +905,9 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
     The item's \a index is passed. Note that this signal is sent even
     when the choice is not changed. If you need to know when the
     choice actually changes, use signal currentIndexChanged().
-
 */
 
 /*!
-    \fn void QComboBox::activated(const QString &text)
-
-    This signal is sent when the user chooses an item in the combobox.
-    The item's \a text is passed. Note that this signal is sent even
-    when the choice is not changed. If you need to know when the
-    choice actually changes, use signal currentIndexChanged().
-
-    \obsolete Use QComboBox::textActivated() instead
-*/
-/*!
     \fn void QComboBox::textActivated(const QString &text)
     \since 5.14
 
@@ -936,14 +925,6 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
 */
 
 /*!
-    \fn void QComboBox::highlighted(const QString &text)
-
-    This signal is sent when an item in the combobox popup list is
-    highlighted by the user. The item's \a text is passed.
-
-    \obsolete Use textHighlighted() instead
-*/
-/*!
     \fn void QComboBox::textHighlighted(const QString &text)
     \since 5.14
 
@@ -1424,12 +1405,6 @@ void QComboBoxPrivate::emitActivated(const QModelIndex &index)
     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)
@@ -1440,12 +1415,6 @@ void QComboBoxPrivate::_q_emitHighlighted(const QModelIndex &index)
     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)
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h
index 1b80f90c74..19bdf39233 100644
--- a/src/widgets/widgets/qcombobox.h
+++ b/src/widgets/widgets/qcombobox.h
@@ -233,12 +233,6 @@ Q_SIGNALS:
     void currentIndexChanged(int index);
     void currentIndexChanged(const QString &);
     void currentTextChanged(const QString &);
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_VERSION_X(5, 15, "Use textActivated() instead")
-    void activated(const QString &);
-    QT_DEPRECATED_VERSION_X(5, 15, "Use textHighlighted() instead")
-    void highlighted(const QString &);
-#endif
 
 protected:
     void focusInEvent(QFocusEvent *e) override;
diff --git a/src/widgets/widgets/qspinbox.cpp b/src/widgets/widgets/qspinbox.cpp
index cbd600ec6c..6ac2e1cec2 100644
--- a/src/widgets/widgets/qspinbox.cpp
+++ b/src/widgets/widgets/qspinbox.cpp
@@ -191,17 +191,6 @@ public:
     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
     step value of 1. The value is initially set to 0. It is parented to \a
@@ -663,17 +652,6 @@ void QSpinBox::fixup(QString &input) const
     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,
     a step value of 1.0 and a precision of 2 decimal places. The value is
@@ -1095,12 +1073,6 @@ 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());
         }
@@ -1252,12 +1224,6 @@ 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 762dd4a46a..be5357b028 100644
--- a/src/widgets/widgets/qspinbox.h
+++ b/src/widgets/widgets/qspinbox.h
@@ -107,10 +107,6 @@ 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)
@@ -173,10 +169,6 @@ 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/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp
index 78fde94fad..dac7a9a608 100644
--- a/src/widgets/widgets/qtextbrowser.cpp
+++ b/src/widgets/widgets/qtextbrowser.cpp
@@ -156,11 +156,6 @@ public:
     {
         Q_Q(QTextBrowser);
         emit q->highlighted(url);
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-        emit q->highlighted(url.toString());
-#endif
     }
 };
 Q_DECLARE_TYPEINFO(QTextBrowserPrivate::HistoryEntry, Q_MOVABLE_TYPE);
@@ -927,16 +922,6 @@ void QTextBrowser::doSetSource(const QUrl &url, QTextDocument::ResourceType type
     anchor is passed in \a link.
 */
 
-/*!  \fn void QTextBrowser::highlighted(const QString &link)
-     \overload
-     \obsolete
-
-     Convenience signal that allows connecting to a slot
-     that takes just a QString, like for example QStatusBar's
-     message().
-*/
-
-
 /*!
     \fn void QTextBrowser::anchorClicked(const QUrl &link)
 
diff --git a/src/widgets/widgets/qtextbrowser.h b/src/widgets/widgets/qtextbrowser.h
index 4b3ec491ee..7f02999b02 100644
--- a/src/widgets/widgets/qtextbrowser.h
+++ b/src/widgets/widgets/qtextbrowser.h
@@ -107,10 +107,6 @@ Q_SIGNALS:
     void historyChanged();
     void sourceChanged(const QUrl &);
     void highlighted(const QUrl &);
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_VERSION_X_5_15("Use QTextBrowser::highlighted(QUrl) instead")
-    void highlighted(const QString &);
-#endif
     void anchorClicked(const QUrl &);
 
 protected:
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
index 3da7e365c8..f8bccfbfa3 100644
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -2512,7 +2512,7 @@ void QWidgetTextControl::setExtraSelections(const QList<QTextEdit::ExtraSelectio
         emit updateRequest(r);
     }
 
-    for (QHash<int, int>::iterator it = hash.begin(); it != hash.end(); ++it) {
+    for (auto it = hash.cbegin(); it != hash.cend(); ++it) {
         const QAbstractTextDocumentLayout::Selection &esel = d->extraSelections.at(it.value());
         QRectF r = selectionRect(esel.cursor);
         if (esel.format.boolProperty(QTextFormat::FullWidthSelection)) {