diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-12-01 13:59:53 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-12-01 13:59:53 +0100 |
| commit | 4ba00f0054ffd183377fd420b35ef7a388c0bcfe (patch) | |
| tree | dde076314b40ce0dd540e5363ff6d9fca98016f4 /src/imports/calendar/qquickcalendar.cpp | |
| parent | 948932c9c6ae535647e69962aad2add516802b9c (diff) | |
| parent | d8c5dea96fb8861089e2166ae574a85d2b69c09e (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/imports/controls/SpinBox.qml
src/imports/controls/material/SpinBox.qml
src/imports/controls/universal/SpinBox.qml
tests/auto/controls/data/tst_swipedelegate.qml
Change-Id: Ie1d1f487890f0a9f80a00df5e813e1d2e8303fe5
Diffstat (limited to 'src/imports/calendar/qquickcalendar.cpp')
| -rw-r--r-- | src/imports/calendar/qquickcalendar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/calendar/qquickcalendar.cpp b/src/imports/calendar/qquickcalendar.cpp index b64759f2..cb543012 100644 --- a/src/imports/calendar/qquickcalendar.cpp +++ b/src/imports/calendar/qquickcalendar.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE The Qt Labs Calendar module uses 0-based month numbers to be consistent with the JavaScript Date type, that is used by the QML language. This means that \c Date::getMonth() can be assigned to MonthGrid::month and - WeekNumberColumn::month as is. When dealing with dealing with month numbers + WeekNumberColumn::month as is. When dealing with month numbers directly, it is highly recommended to use the following enumeration values to avoid confusion. |