diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-15 11:24:56 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-15 11:25:03 +0100 |
| commit | 79bd1646a8f317f4c6b5a6342b8aa6056b6c8b79 (patch) | |
| tree | 8600efa91f44e73707b18a07658b63262e789004 /src/controls | |
| parent | 3bc99dd69fb9099a13dd94ebd081dba5c68d6def (diff) | |
| parent | 1e6db9fc4f9cfd52ea96b1b8576ba19a1442638e (diff) | |
| download | qtquickcontrols-79bd1646a8f317f4c6b5a6342b8aa6056b6c8b79.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I67ccb5a6763045a0728d04e804f8a47c37b425f5
Diffstat (limited to 'src/controls')
| -rw-r--r-- | src/controls/Calendar.qml | 4 | ||||
| -rw-r--r-- | src/controls/doc/src/qtquickcontrols-tableview.qdoc | 4 |
2 files changed, 5 insertions, 3 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) diff --git a/src/controls/doc/src/qtquickcontrols-tableview.qdoc b/src/controls/doc/src/qtquickcontrols-tableview.qdoc index ba16b115..9d43c6a6 100644 --- a/src/controls/doc/src/qtquickcontrols-tableview.qdoc +++ b/src/controls/doc/src/qtquickcontrols-tableview.qdoc @@ -223,8 +223,8 @@ \list \li function \b clear() - deselects all rows \li function \b selectAll() - selects all rows - \li function \b select(from, to) - select a range - \li function \b deselect(from, to) - de-selects a range + \li function \b select(from, to) - selects a range + \li function \b deselect(from, to) - deselects a range \li function \b forEach(callback) - iterates over all selected rows \li function \b contains(index) - checks whether the selection includes the given index \li signal \b selectionChanged() - the current row selection changed |