Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"

5 files changed, 10 insertions, 8 deletions

diff --git a/src/widgets/kernel/qactiongroup.cpp b/src/widgets/kernel/qactiongroup.cpp
index 5dc12c48a4..d51fb778c4 100644
--- a/src/widgets/kernel/qactiongroup.cpp
+++ b/src/widgets/kernel/qactiongroup.cpp
@@ -292,7 +292,8 @@ QList<QAction*> QActionGroup::actions() const
     \brief Enable or disable the group exclusion checking
 
     This is a convenience method that calls
-    setExclusionPolicy(ExclusionPolicy::Exclusive).
+    setExclusionPolicy(ExclusionPolicy::Exclusive) when \a b is true,
+    else setExclusionPolicy(QActionGroup::ExclusionPolicy::None).
 
     \sa QActionGroup::exclusionPolicy
 */
@@ -303,7 +304,7 @@ void QActionGroup::setExclusive(bool b)
 }
 
 /*!
-    \brief Returs true if the group is exclusive
+    \brief Returns true if the group is exclusive
 
     The group is exclusive if the ExclusionPolicy is either Exclusive
     or ExclusionOptional.
diff --git a/src/widgets/kernel/qshortcut.cpp b/src/widgets/kernel/qshortcut.cpp
index d469279ea5..039699a004 100644
--- a/src/widgets/kernel/qshortcut.cpp
+++ b/src/widgets/kernel/qshortcut.cpp
@@ -545,7 +545,7 @@ QShortcut::QShortcut(QWidget *parent)
     match the \a key sequence. Depending on the ambiguity of the
     event, the shortcut will call the \a member function, or the \a
     ambiguousMember function, if the key press was in the shortcut's
-    \a context.
+    \a shortcutContext.
 */
 QShortcut::QShortcut(const QKeySequence &key, QWidget *parent,
                      const char *member, const char *ambiguousMember,
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
index 7fe46e24b6..2eccb24431 100644
--- a/src/widgets/styles/qstylesheetstyle.cpp
+++ b/src/widgets/styles/qstylesheetstyle.cpp
@@ -3027,6 +3027,7 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC
                     r = positionRect(w, subRule, subRule2, PseudoElement_ComboBoxArrow, r, opt->direction);
                     subRule2.drawRule(p, r);
                 } else {
+                    rule.configurePalette(&cmbOpt.palette, QPalette::ButtonText, QPalette::Button);
                     cmbOpt.subControls = QStyle::SC_ComboBoxArrow;
                     QWindowsStyle::drawComplexControl(cc, &cmbOpt, p, w);
                 }
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp
index 5c123b45a5..e8f057b6e9 100644
--- a/src/widgets/widgets/qdatetimeedit.cpp
+++ b/src/widgets/widgets/qdatetimeedit.cpp
@@ -335,7 +335,6 @@ void QDateTimeEdit::setCalendar(QCalendar calendar)
 /*!
   \since 4.4
   \property QDateTimeEdit::minimumDateTime
-
   \brief the minimum datetime of the date time edit
 
   Changing this property implicitly updates the \l minimumDate and \l
@@ -637,8 +636,8 @@ void QDateTimeEdit::setDateRange(const QDate &min, const QDate &max)
 
   Note that these only constrain the date time edit's value on,
   respectively, the \l minimumDate and \l maximumDate. When these date
-  properties do not coincide, times after \a maximumTime are allowed on dates
-  before \l maximumDate and times before \a minimumTime are allowed on dates
+  properties do not coincide, times after \a max are allowed on dates
+  before \l maximumDate and times before \a min are allowed on dates
   after \l minimumDate.
 
   \snippet code/src_gui_widgets_qdatetimeedit.cpp 5
@@ -649,7 +648,7 @@ void QDateTimeEdit::setDateRange(const QDate &min, const QDate &max)
 
   If either \a min or \a max is invalid, this function does nothing. This
   function preserves the \l minimumDate and \l maximumDate properties. If those
-  properties coincide and max is \a less than \a min, \a min is used as \a max.
+  properties coincide and \a max is less than \a min, \a min is used as \a max.
 
   \sa minimumTime, maximumTime, setDateTimeRange(), QTime::isValid()
 */
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp
index 0bfaa767c6..d54c0d0b20 100644
--- a/src/widgets/widgets/qplaintextedit.cpp
+++ b/src/widgets/widgets/qplaintextedit.cpp
@@ -839,7 +839,8 @@ void QPlainTextEditPrivate::_q_textChanged()
 
     placeholderVisible = !placeholderText.isEmpty()
             && q->document()->isEmpty()
-            && q->firstVisibleBlock().layout()->preeditAreaText().isEmpty();
+            && (!q->firstVisibleBlock().isValid() ||
+                 q->firstVisibleBlock().layout()->preeditAreaText().isEmpty());
 
     if (placeholderCurrentyVisible != placeholderVisible)
         viewport->update();