diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-25 20:00:56 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-25 20:00:56 +0100 |
| commit | ee6c83db18e65e4eec7b7280213b780576b24c03 (patch) | |
| tree | caf049a79f3187962059c7f73181b22b71dc1632 /src/imports/calendar/qquickweeknumbercolumn.cpp | |
| parent | 718f6def0b2c4d84bdc8ebdc9633697885747feb (diff) | |
| parent | db5780507733ef803e963dcef0b5260c4b94acfa (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/templates/qquickrangeslider_p.h
Change-Id: Ibe8ec18a7e22080f69f316d0394af1d03517ce93
Diffstat (limited to 'src/imports/calendar/qquickweeknumbercolumn.cpp')
| -rw-r--r-- | src/imports/calendar/qquickweeknumbercolumn.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/calendar/qquickweeknumbercolumn.cpp b/src/imports/calendar/qquickweeknumbercolumn.cpp index 031b0555..a128b500 100644 --- a/src/imports/calendar/qquickweeknumbercolumn.cpp +++ b/src/imports/calendar/qquickweeknumbercolumn.cpp @@ -116,7 +116,7 @@ QQuickWeekNumberColumn::QQuickWeekNumberColumn(QQuickItem *parent) : 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 this property as is. - When dealing with dealing with month numbers diretly, it is highly + When dealing with dealing with month numbers directly, it is highly recommended to use the following enumeration values to avoid confusion. \value Calendar.January January (0) |