aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/calendar
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-04-20 16:06:15 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-04-20 16:23:33 +0200
commite8cd9c045840b4a9db4e20aaaa16ea6f841ed1c1 (patch)
treefc23ddbab837a5d4ae5da00c4a7ebd0ac31e4be8 /src/imports/calendar
parentb772b5e349c48260a1c0458f841b2e6e82daf0b1 (diff)
parent1cb0faf7886d9df99adfb61560e369387691f89c (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Diffstat (limited to 'src/imports/calendar')
-rw-r--r--src/imports/calendar/qquickcalendarmodel.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/calendar/qquickcalendarmodel.cpp b/src/imports/calendar/qquickcalendarmodel.cpp
index 9d214450..473e43a2 100644
--- a/src/imports/calendar/qquickcalendarmodel.cpp
+++ b/src/imports/calendar/qquickcalendarmodel.cpp
@@ -63,8 +63,8 @@ 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 passed to the methods as is. When
- dealing with dealing with month numbers directly, it is highly recommended
- to use the following enumeration values to avoid confusion.
+ dealing with month numbers directly, it is highly recommended to use the
+ following enumeration values to avoid confusion.
\value Calendar.January January (0)
\value Calendar.February February (1)
@@ -183,7 +183,7 @@ void QQuickCalendarModel::setTo(const QDate &to)
if (d->complete)
d->populate(d->from, to);
d->to = to;
- emit fromChanged();
+ emit toChanged();
}
}