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

 Conflicts:
	src/corelib/kernel/qvariant.h

Change-Id: I8f3873e74b9795ac889e7c7ec5de2619bca92160

1 files changed, 3 insertions, 4 deletions

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()
 */