diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 01:00:44 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 01:00:45 +0100 |
| commit | 7a13a091161851b7fa38d838d3c6ef3a96e19422 (patch) | |
| tree | f8902e9b8dca7f10c519de9a90919d34fc34240b /src/corelib | |
| parent | 36e277e91732d6d75fb6d9cb691fe9c0f83f6178 (diff) | |
| parent | 37b4c07c705d068d00863ee0373322f8a94cb06e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ic13ef00d76c81295076bb2432576db70ec84fe29
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/statemachine/qstatemachine.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/time/qmilankoviccalendar.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index a97700e5d0..44e4e151cb 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -2599,7 +2599,7 @@ void QStateMachine::setGlobalRestorePolicy(QState::RestorePolicy restorePolicy) /*! Adds the given \a state to this state machine. The state becomes a top-level - state. + state and the state machine takes ownership of the state. If the state is already in a different machine, it will first be removed from its old machine, and then added to this machine. diff --git a/src/corelib/time/qmilankoviccalendar.cpp b/src/corelib/time/qmilankoviccalendar.cpp index 68d74947b9..673713a266 100644 --- a/src/corelib/time/qmilankoviccalendar.cpp +++ b/src/corelib/time/qmilankoviccalendar.cpp @@ -56,8 +56,6 @@ using namespace QRoundingDown; \brief The QMilankovicCalendar class provides Milanković calendar system implementation. - \section1 - The Revised Julian calendar, also known as the Milanković calendar, or, less formally, new calendar, is a calendar, developed and proposed by the Serbian scientist Milutin Milanković in 1923, which effectively discontinued |