diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:07:00 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:07:00 +0100 |
| commit | cf32efbedfae65a9a29a1581096041193a372ed3 (patch) | |
| tree | 6cfd88c252c72fa0516451e726caa2ed5dd1a84b /src/controls | |
| parent | 9b340999c4cb9db1975c4b63f3388899d9023944 (diff) | |
| parent | 9dc39b7f0610990dabf9f8544ca64ff5175e7c77 (diff) | |
| download | qtquickcontrols-cf32efbedfae65a9a29a1581096041193a372ed3.tar.gz | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I2d12dd7b271e17662295007f5cf25ff4b3b78e8e
Diffstat (limited to 'src/controls')
| -rw-r--r-- | src/controls/Styles/Base/CalendarStyle.qml | 8 | ||||
| -rw-r--r-- | src/controls/doc/src/qtquickcontrols-index.qdoc | 9 |
2 files changed, 14 insertions, 3 deletions
diff --git a/src/controls/Styles/Base/CalendarStyle.qml b/src/controls/Styles/Base/CalendarStyle.qml index d1b172e0..9da43ce5 100644 --- a/src/controls/Styles/Base/CalendarStyle.qml +++ b/src/controls/Styles/Base/CalendarStyle.qml @@ -369,6 +369,7 @@ Style { property int hoveredCellIndex: -1 property int pressedCellIndex: -1 property int pressCellIndex: -1 + property var pressDate: null Rectangle { anchors.fill: parent @@ -581,9 +582,11 @@ Style { onPressed: { pressCellIndex = cellIndexAt(mouse.x, mouse.y); + pressDate = null; if (pressCellIndex !== -1) { var date = view.model.dateAt(pressCellIndex); pressedCellIndex = pressCellIndex; + pressDate = date; if (__isValidDate(date)) { control.selectedDate = date; control.pressed(date); @@ -608,9 +611,8 @@ Style { onClicked: { var indexOfCell = cellIndexAt(mouse.x, mouse.y); if (indexOfCell !== -1 && indexOfCell === pressCellIndex) { - var date = view.model.dateAt(indexOfCell); - if (__isValidDate(date)) - control.clicked(date); + if (__isValidDate(pressDate)) + control.clicked(pressDate); } } diff --git a/src/controls/doc/src/qtquickcontrols-index.qdoc b/src/controls/doc/src/qtquickcontrols-index.qdoc index 63753ae1..28bc3644 100644 --- a/src/controls/doc/src/qtquickcontrols-index.qdoc +++ b/src/controls/doc/src/qtquickcontrols-index.qdoc @@ -54,6 +54,15 @@ Types that can be used to build menus. \annotatedlist menus + \section1 Licenses and Attributions + + The Qt Quick Controls module is available under commercial licenses from \l{The Qt Company}. + In addition, it is available under free software licenses. Since Qt 5.4, + these free software licenses are + \l{GNU Lesser General Public License, version 3}, or + the \l{GNU General Public License, version 2}. + See \l{Qt Licensing} for further details. + \section1 Related information \list |