diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-12 11:33:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-12 11:33:02 +0100 |
| commit | 1e6db9fc4f9cfd52ea96b1b8576ba19a1442638e (patch) | |
| tree | 7b5d5ca5a775eac8a526132301ff8632b5e8d24b /src/controls/Calendar.qml | |
| parent | 84b3cf1c0483af7ad200ab33944d8eaa4d4ffa48 (diff) | |
| parent | fccb5baf490b9a8c561a01f30b4992236e3a2060 (diff) | |
| download | qtquickcontrols-1e6db9fc4f9cfd52ea96b1b8576ba19a1442638e.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.75.7.1
Change-Id: Idef60aa2d7b55600cca618f0f622e8e18e77f3de
Diffstat (limited to 'src/controls/Calendar.qml')
| -rw-r--r-- | src/controls/Calendar.qml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/controls/Calendar.qml b/src/controls/Calendar.qml index bbc562cc..96896480 100644 --- a/src/controls/Calendar.qml +++ b/src/controls/Calendar.qml @@ -218,7 +218,9 @@ Control { */ property CalendarModel __model: CalendarModel { locale: calendar.__locale - visibleDate: new Date(visibleYear, visibleMonth, 1) + + // TODO: don't set the hour when QTBUG-56787 is fixed + visibleDate: new Date(visibleYear, visibleMonth, 1, 12) } style: Settings.styleComponent(Settings.style, "CalendarStyle.qml", calendar) |