diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-28 14:13:24 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-28 14:13:30 +0100 |
| commit | 35cca2149183db49ad1ca5972f66474c6f36dbe1 (patch) | |
| tree | 88c2bdd71323b0e0bb2c9c207802b5f36a8d0f64 /src/controls | |
| parent | 4e26a18ede1775ae06bef7c272994e84510ebd9a (diff) | |
| parent | 84b48cadc8f68d57d1a750e6aec690f46582e0c5 (diff) | |
| download | qtquickcontrols-35cca2149183db49ad1ca5972f66474c6f36dbe1.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I753e8b4d10714f2b8c3cf0fccfed4dc312adbd9b
Diffstat (limited to 'src/controls')
| -rw-r--r-- | src/controls/Calendar.qml | 4 | ||||
| -rw-r--r-- | src/controls/Private/BasicTableView.qml | 4 | ||||
| -rw-r--r-- | src/controls/doc/src/qtquickcontrols-tableview.qdoc | 4 |
3 files changed, 7 insertions, 5 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/Private/BasicTableView.qml b/src/controls/Private/BasicTableView.qml index 4ec32264..66ad0d36 100644 --- a/src/controls/Private/BasicTableView.qml +++ b/src/controls/Private/BasicTableView.qml @@ -474,8 +474,8 @@ ScrollView { property bool pressed: false } } - property int rowHeight: rowSizeItem.implicitHeight - property int paddedRowCount: height/rowHeight + property int rowHeight: Math.floor(rowSizeItem.implicitHeight) + property int paddedRowCount: rowHeight != 0 ? height/rowHeight : 0 y: listView.contentHeight - listView.contentY + listView.originY width: parent.width 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 |