diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-02 01:01:12 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-02 01:01:12 +0100 |
| commit | ab6affac107cb97e7b6decbe55621259cb8a9b92 (patch) | |
| tree | 70e427676c20abcd21b1354b803682b65986b2e5 /src/corelib | |
| parent | 89f1f14c5e9a49f25345a65d81b3518d58ecb91a (diff) | |
| parent | 44a26a0a79ed07b829d55979eaed6f06346ca450 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I256a4b0bac4d2f5eb170967fedc4eccaec8c7f2a
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 3c03cf40e4..009659d998 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 |