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

Change-Id: I379794a01cbf6fb39d94b24cc8c90b1971a212b9

1 files changed, 2 insertions, 2 deletions

diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 0ed92514f9..3c03cf40e4 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -1498,7 +1498,7 @@ void QStateMachinePrivate::setError(QStateMachine::Error errorCode, QAbstractSta
     case QStateMachine::StateMachineChildModeSetToParallelError:
         Q_ASSERT(currentContext != nullptr);
 
-        errorString = QStateMachine::tr("Child mode of state machine '%1' is not 'ExclusiveStates'!")
+        errorString = QStateMachine::tr("Child mode of state machine '%1' is not 'ExclusiveStates'.")
                         .arg(currentContext->objectName());
         break;
 
@@ -2469,7 +2469,7 @@ QStateMachine::QStateMachine(QObject *parent)
   and \a parent.
 
   \warning Do not set the \a childMode to anything else than \l{ExclusiveStates}, otherwise the
-           state machine is invalid, and might work incorrectly!
+           state machine is invalid, and might work incorrectly.
 */
 QStateMachine::QStateMachine(QState::ChildMode childMode, QObject *parent)
     : QState(*new QStateMachinePrivate, /*parentState=*/0)